Merge pull request #42 from armand1m/8-add-signin-with-phone-number

#8 Feat: signinWithPhoneNumber

Author: armand1m

src/index.tsx

@@ -10,6 +10,7 @@ export type WrappedComponentProps = {
   signInWithFacebook: () => void;
   signInWithGithub: () => void;
   signInWithTwitter: () => void;
+  signInWithPhoneNumber:  (phoneNumber: string, applicationVerifier: firebase.auth.ApplicationVerifier) => Promise<any>;
   signInAnonymously: () => void;
   signOut: () => void;
   setError: (error: any) => void;
@@ -68,16 +69,17 @@ const withFirebaseAuth = ({
 
       setError = (error: any) => this.setState({ error });
 
-      tryTo = async (operation: () => any) => {
+      async tryTo <T> (operation: () => Promise<T>): Promise<T> {
         try {
-          return await operation();
+          return operation();
         } catch(error) {
           this.setError(error.message);
+          return error;
         }
       };
 
-      tryToSignInWithProvider = (provider: PossibleProviders) =>
-        this.tryTo(() => {
+      tryToSignInWithProvider = (provider: PossibleProviders): Promise<firebase.auth.UserCredential> =>
+        this.tryTo<firebase.auth.UserCredential>(() => {
           const providerInstance = providers[provider];
 
           if (!providerInstance) {
@@ -88,10 +90,10 @@ const withFirebaseAuth = ({
         });
 
       signOut = () =>
-        this.tryTo(() => firebaseAppAuth.signOut());
+        this.tryTo<void>(() => firebaseAppAuth.signOut());
 
       signInAnonymously = () =>
-        this.tryTo(() => firebaseAppAuth.signInAnonymously());
+        this.tryTo<firebase.auth.UserCredential>(() => firebaseAppAuth.signInAnonymously());
 
       signInWithGithub = () =>
         this.tryToSignInWithProvider('githubProvider');
@@ -106,10 +108,13 @@ const withFirebaseAuth = ({
         this.tryToSignInWithProvider('facebookProvider');
 
       signInWithEmailAndPassword = (email: string, password: string) =>
-        this.tryTo(() => firebaseAppAuth.signInWithEmailAndPassword(email, password));
+        this.tryTo<firebase.auth.UserCredential>(() => firebaseAppAuth.signInWithEmailAndPassword(email, password));
+
+      signInWithPhoneNumber = (phoneNumber: string, applicationVerifier: firebase.auth.ApplicationVerifier) =>
+        this.tryTo<firebase.auth.ConfirmationResult>(() => firebaseAppAuth.signInWithPhoneNumber(phoneNumber, applicationVerifier))
 
       createUserWithEmailAndPassword = (email: string, password: string) =>
-        this.tryTo(() => firebaseAppAuth.createUserWithEmailAndPassword(email, password));
+        this.tryTo<firebase.auth.UserCredential>(() => firebaseAppAuth.createUserWithEmailAndPassword(email, password));
 
       sharedHandlers = {
         signInWithEmailAndPassword: this.signInWithEmailAndPassword,
@@ -118,6 +123,7 @@ const withFirebaseAuth = ({
         signInWithTwitter: this.signInWithTwitter,
         signInWithGoogle: this.signInWithGoogle,
         signInWithFacebook: this.signInWithFacebook,
+        signInWithPhoneNumber: this.signInWithPhoneNumber,
         setError: this.setError,
         signInAnonymously: this.signInAnonymously,
         signOut: this.signOut,

src/test.tsx

@@ -19,7 +19,7 @@ const fakeUser = {
 };
 
 describe('withFirebaseAuth', () => {
-  let currentAuthStateObserver = (_user: firebase.User) => {};
+  let currentAuthStateObserver: any = (_user: firebase.User) => {};
   let unsubcribeAuthStateChangeMock = jest.fn();
 
   beforeEach(() => {
@@ -30,6 +30,7 @@ describe('withFirebaseAuth', () => {
     testAppAuth.signInAnonymously = jest.fn();
     testAppAuth.signOut = jest.fn();
     testAppAuth.signInWithPopup = jest.fn();
+    testAppAuth.signInWithPhoneNumber = jest.fn();
     testAppAuth.onAuthStateChanged = jest.fn(observer => {
       currentAuthStateObserver = observer;
       return unsubcribeAuthStateChangeMock;
@@ -204,8 +205,31 @@ describe('withFirebaseAuth', () => {
   });
 
   it('should call createUserWithEmailAndPassword when prop is invoked', () => {
+    const email = 'test';
+    const password = 'test';
+
     const WrappedComponent = ({ createUserWithEmailAndPassword }: WrappedComponentProps) =>
-      <button onClick={() => createUserWithEmailAndPassword('test', 'test')}>createUserWithEmailAndPassword</button>;
+      <button onClick={() => createUserWithEmailAndPassword(email, password)}>createUserWithEmailAndPassword</button>;
+
+    const EnhancedComponent = withFirebaseAuth({
+      firebaseAppAuth: testAppAuth,
+    })(WrappedComponent);
+
+    const wrapped = mount(<EnhancedComponent />);
+
+    wrapped.find('button').simulate('click');
+
+    expect(testAppAuth.createUserWithEmailAndPassword).toHaveBeenCalledWith(email, password);
+  });
+
+  it('should call signInWithPhoneNumber when prop is invoked', () => {
+    const phoneNumber = "666999666";
+    const applicationVerifier = { type: '', verify: () => Promise.resolve('') };
+
+    const WrappedComponent = ({ signInWithPhoneNumber }: WrappedComponentProps) =>
+      <button onClick={() => signInWithPhoneNumber(phoneNumber, applicationVerifier)}>
+        signInWithPhoneNumber
+      </button>;
 
     const EnhancedComponent = withFirebaseAuth({
       firebaseAppAuth: testAppAuth,
@@ -215,7 +239,7 @@ describe('withFirebaseAuth', () => {
 
     wrapped.find('button').simulate('click');
 
-    expect(testAppAuth.createUserWithEmailAndPassword).toHaveBeenCalled();
+    expect(testAppAuth.signInWithPhoneNumber).toHaveBeenCalledWith(phoneNumber, applicationVerifier);
   });
 
   it('should set an error when setError is invoked', () => {