Merge branch 'auth-services' into remove-email-server

Author: pradel

packages/client/tmp_tests_/accounts-client.ts renamed to packages/client/__tests__/accounts-client.ts

@@ -17,7 +17,6 @@ import config, { TokenStorage, AccountsClientConfiguration } from './config';
 import createStore from './create-store';
 import reducer, {
   loggingIn,
-  setUser,
   clearUser,
   setTokens,
   clearTokens as clearStoreTokens,
@@ -154,7 +153,6 @@ export class AccountsClient {
       }
 
       this.store.dispatch(setTokens(res.tokens));
-      this.store.dispatch(setUser(res.user));
       return res;
     }
   }
@@ -278,7 +276,6 @@ export class AccountsClient {
 
           await this.storeTokens(refreshedSession.tokens);
           this.store.dispatch(setTokens(refreshedSession.tokens));
-          this.store.dispatch(setUser(refreshedSession.user));
         }
       } catch (err) {
         this.store.dispatch(loggingIn(false));
@@ -293,10 +290,7 @@ export class AccountsClient {
     }
   }
 
-  public async createUser(
-    user: CreateUserType,
-    callback?: (err?: Error) => void
-  ): Promise<void> {
+  public async createUser(user: CreateUserType): Promise<void> {
     if (!user) {
       throw new AccountsError(
         'Unrecognized options for create user request',
@@ -323,9 +317,7 @@ export class AccountsClient {
     try {
       const userId = await this.transport.createUser(userToCreate);
       const { onUserCreated } = this.options;
-      if (callback && isFunction(callback)) {
-        callback();
-      }
+
       if (isFunction(onUserCreated)) {
         try {
           await onUserCreated({ id: userId });
@@ -335,9 +327,45 @@ export class AccountsClient {
         }
       }
     } catch (err) {
-      if (callback && isFunction(callback)) {
-        callback(err);
+      throw new AccountsError(err.message);
+    }
+  }
+
+  public async loginWithService(
+    service: string,
+    credentials: { [key: string]: string | object }
+  ): Promise<LoginReturnType> {
+    if (!isString(service)) {
+      throw new AccountsError('Unrecognized options for login request');
+    }
+
+    try {
+      this.store.dispatch(loggingIn(true));
+
+      const response = await this.transport.loginWithService(
+        service,
+        credentials
+      );
+
+      this.store.dispatch(loggingIn(false));
+      await this.storeTokens(response.tokens);
+      this.store.dispatch(setTokens(response.tokens));
+
+      const { onSignedInHook } = this.options;
+
+      if (isFunction(onSignedInHook)) {
+        try {
+          await onSignedInHook(response);
+        } catch (err) {
+          // tslint:disable-next-line no-console
+          console.error(err);
+        }
       }
+      return response;
+    } catch (err) {
+      this.clearTokens();
+      this.store.dispatch(clearUser());
+      this.store.dispatch(loggingIn(false));
       throw new AccountsError(err.message);
     }
   }
@@ -419,12 +447,11 @@ const Accounts = {
   ): Promise<void> {
     return this.instance.createUser(user, callback);
   },
-  loginWithPassword(
-    user: LoginUserIdentityType,
-    password: string,
-    callback?: (err?: Error, res?: LoginReturnType) => void
-  ): Promise<void> {
-    return this.instance.loginWithPassword(user, password, callback);
+  loginWithService(
+    service: string,
+    credentials: { [key: string]: string | object }
+  ): Promise<LoginReturnType> {
+    return this.instance.loginWithService(service, credentials);
   },
   loggingIn(): boolean {
     return this.instance.loggingIn();

packages/client/src/accounts-client.ts

@@ -6,17 +6,18 @@ import {
 
 export interface TransportInterface {
   createUser(user: CreateUserType): Promise<string>;
-  // loginWithPassword(
-  //   user: PasswordLoginUserType,
-  //   password: PasswordType
-  // ): Promise<LoginReturnType>;
+  loginWithService(
+    service: string,
+    authenticateParams: {
+      [key: string]: string | object;
+    }
+  ): Promise<LoginReturnType>;
   logout(accessToken: string): Promise<void>;
   refreshTokens(
     accessToken: string,
     refreshToken: string
   ): Promise<LoginReturnType>;
   verifyEmail(token: string): Promise<void>;
-  // resetPassword(token: string, newPassword: PasswordType): Promise<void>;
   sendResetPasswordEmail(email: string): Promise<void>;
   sendVerificationEmail(email: string): Promise<void>;
   impersonate(token: string, username: string): Promise<ImpersonateReturnType>;

packages/client/src/transport-interface.ts

@@ -3,5 +3,5 @@ import { AccountsError } from '../src';
 describe('common', () => {
   it('should have named export AccountsError', () => {
     expect(typeof AccountsError).toBe('function');
-  })
-})
+  });
+});

packages/common/__tests__/index.ts

@@ -23,6 +23,7 @@ export interface CreateUserType {
   username?: string;
   email?: string;
   profile?: object;
+  [additionalKey: string]: any;
 }
 
 export interface LoginUserIdentityType {
@@ -38,7 +39,6 @@ export interface TokensType {
 
 export interface LoginReturnType {
   sessionId: string;
-  user: UserObjectType;
   tokens: TokensType;
 }
 

packages/common/src/types.ts

@@ -3,5 +3,5 @@ import AccountsOAuthInstagram from '../src';
 describe('AccountsOAuthInstagram', () => {
   it('should have default export AccountsOAuthInstagram', () => {
     expect(typeof AccountsOAuthInstagram).toBe('function');
-  })
-})
+  });
+});

packages/oauth-instagram/__tests__/index.ts

@@ -2,7 +2,11 @@ import * as rp from 'request-promise';
 
 export class AccountsOAuthInstagram {
   public async authenticate(params) {
-    let data = await rp(`https://api.instagram.com/v1/users/self/?access_token=${params.access_token}`);
+    let data = await rp(
+      `https://api.instagram.com/v1/users/self/?access_token=${
+        params.access_token
+      }`
+    );
     data = JSON.parse(data).data;
     return {
       id: data.id,

packages/oauth-instagram/src/accounts-oauth-instagram.ts

@@ -1,2 +1,2 @@
 import { AccountsOAuthInstagram } from './accounts-oauth-instagram';
-export default AccountsOAuthInstagram;
+export default AccountsOAuthInstagram;

packages/oauth-instagram/src/index.ts

@@ -3,5 +3,5 @@ import AccountsOAuthTwitter from '../src';
 describe('AccountsOAuthTwitter', () => {
   it('should have default export AccountsOAuthTwitter', () => {
     expect(typeof AccountsOAuthTwitter).toBe('function');
-  })
-})
+  });
+});

packages/oauth-twitter/__tests__/index.ts

@@ -18,7 +18,7 @@ export class AccountsOAuthTwitter {
       this.options.secret,
       '1.0A',
       null,
-      'HMAC-SHA1',
+      'HMAC-SHA1'
     );
   }
 
@@ -43,9 +43,8 @@ export class AccountsOAuthTwitter {
             };
             resolve(user);
           }
-        },
+        }
       );
     });
-
   }
 }