fix: oauth auth flow

packages/cognito-auth/src/__mocks__/cognito-session.ts

@@ -16,7 +16,7 @@ export const mockCognitoUserSession = {
       getJwtToken: () => 'MOCK_ID_TOKEN',
       getExpiration: () => 1
     } as any),
-  isValid: () => true
+  isValid: () => true,
 } as CognitoUserSession
 
 export const mockLoginSession: LoginSession = {
@@ -28,6 +28,7 @@ export const mockLoginSession: LoginSession = {
   idToken: 'MOCK_ID_TOKEN',
   idTokenExpiry: 2,
   mode: 'WEB',
+  cognitoClientId: 'SOME_CLIENT_ID',
   loginIdentity: {
     email: 'bob@acme.com',
     developerId: 'SOME_DEV_ID',

packages/cognito-auth/src/core/types.ts

@@ -60,6 +60,7 @@ export interface LoginSession {
   loginType: LoginType
   loginIdentity: LoginIdentity
   mode: LoginMode
+  cognitoClientId: string
 }
 
 export interface ChangePasswordParams {

packages/cognito-auth/src/services/session/refresh-user-session.test.ts

@@ -14,9 +14,10 @@ jest.mock('@reapit/elements', () => ({
 
 describe('tokenRefreshUserSessionService', () => {
   it('should return a LoginSession', async () => {
-    expect(await tokenRefreshUserSessionService('bob@acme.com', 'MOCK_REFRESH_TOKEN', 'someCognitoClientId')).toEqual(
-      getLoginSession(mockCognitoUserSession),
-    )
+    expect(await tokenRefreshUserSessionService('bob@acme.com', 'MOCK_REFRESH_TOKEN', 'someCognitoClientId')).toEqual({
+      ...getLoginSession(mockCognitoUserSession),
+      cognitoClientId: 'someCognitoClientId',
+    })
   })
 })
 
@@ -28,6 +29,7 @@ describe('codeRefreshUserSessionService', () => {
       idToken: 'SOME_TOKEN',
       idTokenExpiry: 1570750731,
       refreshToken: 'SOME_TOKEN',
+      cognitoClientId: 'someCognitoClientId',
     })
   })
 })

packages/cognito-auth/src/services/session/refresh-user-session.ts

@@ -9,17 +9,17 @@ const ONE_MINUTE_SECS = 60
 export const tokenRefreshUserSessionService = async (
   userName: string,
   refreshToken: string,
-  congitoClientId: string,
+  cognitoClientId: string,
 ): Promise<Partial<LoginSession>> => {
   return new Promise((resolve, reject) => {
     const refreshTokenObject = {
       getToken: () => refreshToken,
     }
-    const cognitoUser = getNewUser(userName, congitoClientId)
+    const cognitoUser = getNewUser(userName, cognitoClientId)
 
     cognitoUser.refreshSession(refreshTokenObject, (err, session) => {
       if (!err && session) {
-        return resolve(getLoginSession(session))
+        return resolve({ ...getLoginSession(session), cognitoClientId })
       }
       return reject(`${errorStrings.TOKEN_REFRESH_SESSION_SERVICE_ERROR} ${JSON.stringify(err)}`)
     })
@@ -29,14 +29,14 @@ export const tokenRefreshUserSessionService = async (
 export const codeRefreshUserSessionService = async (
   authorizationCode: string,
   redirectUri: string,
-  congitoClientId: string,
+  cognitoClientId: string,
   loginType: LoginType = 'CLIENT',
 ): Promise<Partial<LoginSession>> => {
   const session = await fetcher({
     method: 'POST',
     api: process.env.COGNITO_OAUTH_URL as string,
     url:
-      `/token?grant_type=authorization_code&client_id=${congitoClientId}` +
+      `/token?grant_type=authorization_code&client_id=${cognitoClientId}` +
       `&code=${authorizationCode}&redirect_uri=${redirectUri}&state=${loginType}`,
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',
@@ -53,6 +53,7 @@ export const codeRefreshUserSessionService = async (
       idToken: id_token,
       idTokenExpiry: tokenExpiry,
       refreshToken: refresh_token,
+      cognitoClientId,
     }
   }
 

packages/cognito-auth/src/utils/cognito.test.ts

@@ -69,6 +69,7 @@ describe('Session utils', () => {
           loginType: mockLoginSession.loginType,
           userName: mockLoginSession.userName,
           mode: 'WEB',
+          cognitoClientId: 'SOME_CLIENT_ID',
         }),
         {
           path: '/',

packages/cognito-auth/src/utils/cognito.ts

@@ -32,14 +32,15 @@ export const getNewUser = (userName: string, cognitoClientId: string) => {
 }
 
 export const setSessionCookie = (session: LoginSession, identifier: string = COOKIE_SESSION_KEY): void => {
-  const { userName, refreshToken, loginType, mode } = session
+  const { userName, refreshToken, loginType, mode, cognitoClientId } = session
   hardtack.set(
     identifier,
     JSON.stringify({
       refreshToken,
       loginType,
       userName,
       mode,
+      cognitoClientId,
     }),
     {
       path: '/',

packages/marketplace/src/core/__mocks__/store.ts

@@ -8,6 +8,7 @@ export const mockLoginSession: LoginSession = {
   accessToken: 'MOCK_ACCESS_TOKEN',
   idToken: 'MOCK_ID_TOKEN',
   idTokenExpiry: 2,
+  cognitoClientId: 'SOME_CLIENT_ID',
   mode: 'WEB',
   loginIdentity: {
     email: 'bob@acme.com',

packages/marketplace/src/reducers/auth.ts

@@ -26,7 +26,7 @@ export const defaultState = (): AuthState => {
     error: false,
     loginSession: null,
     firstLogin: false,
-    loginType: 'CLIENT',
+    loginType: refreshSession ? refreshSession.loginType : 'CLIENT',
     refreshSession,
   }
 }