Merge pull request #518 from firebase/jw-change-email

Added $changeEmail() method

Author: katowulf

README.md

@@ -18,10 +18,10 @@ In order to use AngularFire in your project, you need to include the following f
 
 ```html
 <!-- AngularJS -->
-<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.7/angular.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js"></script>
 
 <!-- Firebase -->
-<script src="https://cdn.firebase.com/js/client/2.0.6/firebase.js"></script>
+<script src="https://cdn.firebase.com/js/client/2.1.0/firebase.js"></script>
 
 <!-- AngularFire -->
 <script src="https://cdn.firebase.com/libs/angularfire/0.9.0/angularfire.min.js"></script>

bower.json

@@ -31,7 +31,7 @@
   ],
   "dependencies": {
     "angular": "1.2.x || 1.3.x",
-    "firebase": "2.0.x"
+    "firebase": "2.1.x"
   },
   "devDependencies": {
     "lodash": "~2.4.1",

changelog.txt

@@ -1,3 +1,4 @@
+feature - Added `$firebaseAuth.$changeEmail()` to change the email address associated with an existing account.
 feature - `$firebaseAuth.$createUser()` is now fulfilled with a user object which contains the created user's `uid`.
 feature - Added several minor performance improvements implemented by @jamestalmage.
 fixed - `$firebaseAuth.$onAuth()` now properly fires a digest loop upon changes in authentication state.

package.json

@@ -32,7 +32,7 @@
   ],
   "dependencies": {
     "angular": "1.3.x",
-    "firebase": "2.0.x"
+    "firebase": "2.1.x"
   },
   "devDependencies": {
     "coveralls": "^2.11.1",

src/FirebaseAuth.js

@@ -51,6 +51,7 @@
         // User management methods
         $createUser: this.createUser.bind(this),
         $changePassword: this.changePassword.bind(this),
+        $changeEmail: this.changeEmail.bind(this),
         $removeUser: this.removeUser.bind(this),
         $resetPassword: this.resetPassword.bind(this),
         $sendPasswordResetEmail: this.sendPasswordResetEmail.bind(this)
@@ -331,7 +332,7 @@
      * Changes the password for an email/password user.
      *
      * @param {Object|string} emailOrCredentials The email of the user whose password is to change
-     * or an objet containing the email, old password, and new password of the user whose password
+     * or an object containing the email, old password, and new password of the user whose password
      * is to change.
      * @param {string} [oldPassword] The current password for the user.
      * @param {string} [newPassword] The new password for the user.
@@ -361,6 +362,29 @@
       return deferred.promise;
     },
 
+    /**
+     * Changes the email for an email/password user.
+     *
+     * @param {Object} credentials An object containing the old email, new email, and password of
+     * the user whose email is to change.
+     * @return {Promise<>} An empty promise fulfilled once the email change is complete.
+     */
+    changeEmail: function(credentials) {
+      if (typeof this._ref.changeEmail !== 'function') {
+        throw new Error('$firebaseAuth.$changeEmail() requires Firebase version 2.1.0 or greater.');
+      }
+
+      var deferred = this._q.defer();
+
+      try {
+        this._ref.changeEmail(credentials, this._utils.makeNodeResolver(deferred));
+      } catch (error) {
+        deferred.reject(error);
+      }
+
+      return deferred.promise;
+    },
+
     /**
      * Removes an email/password user.
      *

tests/unit/FirebaseAuth.spec.js

@@ -26,7 +26,7 @@ describe('FirebaseAuth',function(){
       ['authWithCustomToken','authAnonymously','authWithPassword',
         'authWithOAuthPopup','authWithOAuthRedirect','authWithOAuthToken',
         'unauth','getAuth','onAuth','offAuth',
-        'createUser','changePassword','removeUser','resetPassword'
+        'createUser','changePassword','changeEmail','removeUser','resetPassword'
       ]);
 
     inject(function(_$firebaseAuth_,_$timeout_){
@@ -196,7 +196,7 @@ describe('FirebaseAuth',function(){
       expect(result).toEqual('myResult');
     });
   });
-  
+
   describe('$authWithOAuthToken',function(){
     it('passes provider, token, and options object to underlying method',function(){
       var provider = 'facebook';
@@ -360,42 +360,95 @@ describe('FirebaseAuth',function(){
       expect(result).toEqual({uid:'1234'});
     });
   });
-  
-  describe('$changePassword()',function(){
-    it('passes email/password to method on backing ref (string args)',function(){
-      auth.$changePassword('[email protected]','54321','12345');
-      expect(ref.changePassword).toHaveBeenCalledWith(
-        {email:'[email protected]',oldPassword:'54321',newPassword:'12345'},
-        jasmine.any(Function));
-    });
 
-    it('passes email/password to method on backing ref (object arg)',function(){
-      auth.$changePassword({email:'[email protected]',oldPassword:'54321',newPassword:'12345'});
-      expect(ref.changePassword).toHaveBeenCalledWith(
-        {email:'[email protected]',oldPassword:'54321',newPassword:'12345'},
-        jasmine.any(Function));
-    });
-
-    it('will log a warning if deprecated string args are used',function(){
+  describe('$changePassword()',function() {
+    it('passes credentials to method on backing ref (string args)',function() {
+      auth.$changePassword('[email protected]','54321','12345');
+      expect(ref.changePassword).toHaveBeenCalledWith({
+        email: '[email protected]',
+        oldPassword: '54321',
+        newPassword: '12345'
+      }, jasmine.any(Function));
+    });
+
+    it('passes credentials to method on backing ref (object arg)',function() {
+      auth.$changePassword({
+        email: '[email protected]',
+        oldPassword: '54321',
+        newPassword: '12345'
+      });
+      expect(ref.changePassword).toHaveBeenCalledWith({
+        email:'[email protected]',
+        oldPassword: '54321',
+        newPassword: '12345'
+      }, jasmine.any(Function));
+    });
+
+    it('will log a warning if deprecated string args are used',function() {
       auth.$changePassword('[email protected]','54321','12345');
       expect(log.warn).toHaveLength(1);
     });
 
-    it('will reject the promise if authentication fails',function(){
-      wrapPromise(auth.$changePassword({email:'[email protected]',oldPassword:'54321',newPassword:'12345'}));
+    it('will reject the promise if the password change fails',function() {
+      wrapPromise(auth.$changePassword({
+        email:'[email protected]',
+        oldPassword: '54321',
+        newPassword: '12345'
+      }));
       callback('changePassword')("bad password");
       $timeout.flush();
       expect(failure).toEqual("bad password");
     });
 
-    it('will resolve the promise upon authentication',function(){
-      wrapPromise(auth.$changePassword('[email protected]','54321','12345'));
+    it('will resolve the promise upon the password change',function() {
+      wrapPromise(auth.$changePassword({
+        email: '[email protected]',
+        oldPassword: '54321',
+        newPassword: '12345'
+      }));
       callback('changePassword')(null);
       $timeout.flush();
       expect(status).toEqual('resolved');
     });
   });
-  
+
+  describe('$changeEmail()',function() {
+    it('passes credentials to method on backing reference', function() {
+      auth.$changeEmail({
+        oldEmail: '[email protected]',
+        newEmail: '[email protected]',
+        password: '12345'
+      });
+      expect(ref.changeEmail).toHaveBeenCalledWith({
+        oldEmail: '[email protected]',
+        newEmail: '[email protected]',
+        password: '12345'
+      }, jasmine.any(Function));
+    });
+
+    it('will reject the promise if the email change fails',function() {
+      wrapPromise(auth.$changeEmail({
+        oldEmail: '[email protected]',
+        newEmail: '[email protected]',
+        password: '12345'
+      }));
+      callback('changeEmail')("bad password");
+      $timeout.flush();
+      expect(failure).toEqual("bad password");
+    });
+
+    it('will resolve the promise upon the email change',function() {
+      wrapPromise(auth.$changeEmail({
+        oldEmail: '[email protected]',
+        newEmail: '[email protected]',
+        password: '12345'
+      }));
+      callback('changeEmail')(null);
+      $timeout.flush();
+      expect(status).toEqual('resolved');
+    });
+  });
+
   describe('$removeUser()',function(){
     it('passes email/password to method on backing ref (string args)',function(){
       auth.$removeUser('[email protected]','12345');
@@ -430,7 +483,7 @@ describe('FirebaseAuth',function(){
       expect(status).toEqual('resolved');
     });
   });
-  
+
   describe('$sendPasswordResetEmail()',function(){
     it('passes email to method on backing ref (string args)',function(){
       auth.$sendPasswordResetEmail('[email protected]');
@@ -450,7 +503,7 @@ describe('FirebaseAuth',function(){
       auth.$sendPasswordResetEmail({email:'[email protected]'});
       expect(log.warn).toHaveLength(1);
     });
-    
+
     it('will log two deprecation warnings if string arg is used',function(){
       auth.$sendPasswordResetEmail('[email protected]');
       expect(log.warn).toHaveLength(2);
@@ -470,7 +523,7 @@ describe('FirebaseAuth',function(){
       expect(status).toEqual('resolved');
     });
   });
-  
+
   describe('$resetPassword()',function(){
     it('passes email to method on backing ref (string args)',function(){
       auth.$resetPassword('[email protected]');