Merge branch 'master' of github.com:neroniaky/angular-token

Author: arjenbrandenburgh

projects/angular-token/src/lib/angular-token.service.spec.ts

@@ -72,16 +72,36 @@ describe('AngularTokenService', () => {
     passwordConfirmation: 'password'
   };
 
+  // Register test data
+  const registerCustomFieldsData: RegisterData = {
+    login: 'test@test.de',
+    first_name: 'John',
+    last_name: 'Doe',
+    password: 'password',
+    passwordConfirmation: 'password'
+  };
+
+  const registerCustomFieldsDataOutput = {
+    email: 'test@test.de',
+    first_name: 'John',
+    last_name: 'Doe',
+    password: 'password',
+    password_confirmation: 'password',
+    confirm_success_url: 	window.location.href
+  };
+
   const registerDataOutput = {
     email: 'test@test.de',
     password: 'password',
-    password_confirmation: 'password'
+    password_confirmation: 'password',
+    confirm_success_url: 	window.location.href
   };
 
   const registerCustomDataOutput = {
     username: 'test@test.de',
     password: 'password',
-    password_confirmation: 'password'
+    password_confirmation: 'password',
+    confirm_success_url: 	window.location.href
   };
 
   // Update password data
@@ -236,16 +256,31 @@ describe('AngularTokenService', () => {
       });
     });
 
-    it('registerAccount should POST data', () => {
+    describe('registerAccount should POST data', () => {
+      it('with standard fields', () => {
 
-      service.registerAccount(registerData).subscribe();
+        service.registerAccount(registerData).subscribe();
 
-      const req = backend.expectOne({
-        url: 'auth',
-        method: 'POST'
+        const req = backend.expectOne({
+          url: 'auth',
+          method: 'POST'
+        });
+
+        expect(req.request.body).toEqual(registerDataOutput);
+      });
+
+      it('with custom fields', () => {
+
+        service.registerAccount(registerCustomFieldsData).subscribe();
+
+        const req = backend.expectOne({
+          url: 'auth',
+          method: 'POST'
+        });
+
+        expect(req.request.body).toEqual(registerCustomFieldsDataOutput);
       });
 
-      expect(req.request.body).toEqual(registerDataOutput);
     });
 
     it('validateToken should GET', () => {

projects/angular-token/src/lib/angular-token.service.ts

@@ -135,6 +135,8 @@ export class AngularTokenService implements CanActivate {
   // Register request
   registerAccount(registerData: RegisterData): Observable<any> {
 
+    registerData = Object.assign({}, registerData);
+
     if (registerData.userType == null) {
       this.userType = null;
     } else {
@@ -146,19 +148,17 @@ export class AngularTokenService implements CanActivate {
       registerData.password_confirmation == null &&
       registerData.passwordConfirmation != null
     ) {
-      registerData.password_confirmation  = registerData.passwordConfirmation;
+      registerData.password_confirmation = registerData.passwordConfirmation;
       delete registerData.passwordConfirmation;
     }
 
-    const body = {
-      [this.options.loginField]: registerData.login,
-      password: registerData.password,
-      password_confirmation: registerData.password_confirmation,
-    };
+    const login = registerData.login;
+    delete registerData.login;
+    registerData[this.options.loginField] = login;
 
     registerData.confirm_success_url = this.options.registerAccountCallback;
 
-    return this.http.post(this.getServerPath() + this.options.registerAccountPath, body);
+    return this.http.post(this.getServerPath() + this.options.registerAccountPath, registerData);
   }
 
   // Delete Account