added missing reauthenticate method for currentUser and renamed sendPasswordResetWithEmail to sendPasswordResetEmail

Author: Salakar

lib/modules/auth.js

@@ -95,6 +95,7 @@ export default class Auth extends Base {
     return promisify('signInWithEmail', FirestackAuth)(email, password);
   }
 
+  // TODO move user methods to User class
 
   /**
    * Update the current user's email
@@ -139,30 +140,23 @@ export default class Auth extends Base {
     return promisify('signInWithCustomToken', FirestackAuth)(customToken);
   }
 
-  // TODO - below methods are not in web api / i think the're signInWithCredential
+  // TODO credential type definition
   /**
    * Sign the user in with a third-party authentication provider
-   * @param  {string} provider   The name of the provider to use for login
-   * @param  {string} authToken  The authToken granted by the provider
-   * @param  {string} authSecret The authToken secret granted by the provider
    * @return {Promise}           A promise resolved upon completion
    */
-  signInWithProvider(provider: string, authToken: string, authSecret: string): Promise<Object> {
-    return promisify('signInWithProvider', FirestackAuth)(provider, authToken, authSecret);
+  signInWithCredential(credential): Promise<Object> {
+    return promisify('signInWithProvider', FirestackAuth)(credential.provider, credential.token, credential.secret);
   }
 
   /**
    * Re-authenticate a user with a third-party authentication provider
-   * @param  {string} provider The provider name
-   * @param  {string} token    The authToken granted by the provider
-   * @param  {string} secret   The authTokenSecret granted by the provider
    * @return {Promise}         A promise resolved upon completion
    */
-  reauthenticateWithCredentialForProvider(provider: string, token: string, secret: string): Promise<Object> {
-    return promisify('reauthenticateWithCredentialForProvider', FirestackAuth)(provider, token, secret);
+  reauthenticateUser(credential): Promise<Object> {
+    return promisify('reauthenticateWithCredentialForProvider', FirestackAuth)(credential.provider, credential.token, credential.secret);
   }
 
-
   /**
    * Sign a user in anonymously
    * @return {Promise}            A promise resolved upon completion
@@ -175,7 +169,7 @@ export default class Auth extends Base {
    * Send reset password instructions via email
    * @param {string} email The email to send password reset instructions
    */
-  sendPasswordResetWithEmail(email: string): Promise<Object> {
+  sendPasswordResetEmail(email: string): Promise<Object> {
     return promisify('sendPasswordResetWithEmail', FirestackAuth)(email);
   }
 

lib/modules/user.js

@@ -1,7 +1,5 @@
-import promisify from '../utils/promisify';
-import { Base } from './base';
-
-
+// TODO refreshToken property
+// TODO reload() method
 export default class User {
   constructor(authClass, authObj) {
     this._auth = authClass;
@@ -33,7 +31,7 @@ export default class User {
    * @returns {*}
    * @private
    */
-  _getOrNull(prop) {
+  _valueOrNull(prop) {
     if (!this._user) return null;
     if (!Object.hasOwnProperty.call(this._user, prop)) return null;
     return this._user[prop];
@@ -44,47 +42,48 @@ export default class User {
    */
 
   get displayName() {
-    return this._getOrNull('displayName');
+    return this._valueOrNull('displayName');
   }
 
   get email() {
-    return this._getOrNull('email');
+    return this._valueOrNull('email');
   }
 
   get emailVerified() {
-    return this._getOrNull('emailVerified');
+    return this._valueOrNull('emailVerified');
   }
 
   get isAnonymous() {
-    return !this._getOrNull('email') && this._getOrNull('providerId') === 'firebase';
+    return !this._valueOrNull('email') && this._valueOrNull('providerId') === 'firebase';
   }
 
   get photoURL() {
-    return this._getOrNull('photoURL');
+    return this._valueOrNull('photoURL');
   }
 
   get photoUrl() {
-    return this._getOrNull('photoURL');
+    return this._valueOrNull('photoURL');
   }
 
   // TODO no android method yet, the SDK does have .getProviderData but returns as a List.
   // get providerData() {
-  //   return this._getOrNull('providerData');
+  //   return this._valueOrNull('providerData');
   // }
 
   get providerId() {
-    return this._getOrNull('providerId');
+    return this._valueOrNull('providerId');
   }
 
-  // TODO no
+  // TODO no android method?
   // get refreshToken() {
-  //   return this._getOrNull('refreshToken');
+  //   return this._valueOrNull('refreshToken');
   // }
 
   get uid() {
-    return this._getOrNull('uid');
+    return this._valueOrNull('uid');
   }
 
+  // noinspection ReservedWordAsName
   /**
    * METHODS
    */
@@ -97,8 +96,13 @@ export default class User {
     return this._auth.getToken(...args);
   }
 
+  get reauthenticate() {
+    return this._auth.reauthenticateUser;
+  }
+
+  // TODO match errors to auth/something errors from firebase web api
   get updateEmail() {
-    if (this.isAnonymous) return () => Promise.reject(new Error('Can not update email on an annonymous user.'));
+    if (this.isAnonymous) return () => Promise.reject(new Error('Can not update email on an anonymous user.'));
     return this._auth.updateEmail;
   }
 
@@ -107,12 +111,12 @@ export default class User {
   }
 
   get updatePassword() {
-    if (this.isAnonymous) return () => Promise.reject(new Error('Can not update password on an annonymous user.'));
+    if (this.isAnonymous) return () => Promise.reject(new Error('Can not update password on an anonymous user.'));
     return this._auth.updatePassword;
   }
 
   get sendEmailVerification() {
-    if (this.isAnonymous) return () => Promise.reject(new Error('Can not verify email on an annonymous user.'));
+    if (this.isAnonymous) return () => Promise.reject(new Error('Can not verify email on an anonymous user.'));
     return this._auth.sendEmailVerification;
   }
 }