feat: #1013 update prod auth flow (#2472)

reapit · Aug 25, 2020 · e04da4e · e04da4e
1 parent 978039a
commit e04da4e
Show file tree

Hide file tree

Showing 35 changed files with 166 additions and 126 deletions.
diff --git a/...rc/components/pages/apps-management/__tests__/__snapshots__/apps-management.test.tsx.snap b/...rc/components/pages/apps-management/__tests__/__snapshots__/apps-management.test.tsx.snap
@@ -379,7 +379,7 @@ exports[`admin-apps AdminApprovals should match a snapshot 1`] = `
                               validate={null}
                             >
                               <div
-                                className="field"
+                                className=""
                               >
                                 <div
                                   className="control"
@@ -562,7 +562,7 @@ exports[`admin-apps AdminApprovals should match a snapshot 1`] = `
                               validate={null}
                             >
                               <div
-                                className="field"
+                                className=""
                               >
                                 <div
                                   className="control"

diff --git a/...s/admin-portal/src/components/pages/billing/__tests__/__snapshots__/billing.test.tsx.snap b/...s/admin-portal/src/components/pages/billing/__tests__/__snapshots__/billing.test.tsx.snap
@@ -119,7 +119,7 @@ exports[`AdminBilling should match a snapshot 1`] = `
                           validate={null}
                         >
                           <div
-                            className="field pb-2"
+                            className=""
                           >
                             <div
                               className="control"
@@ -240,7 +240,7 @@ exports[`AdminBilling should match a snapshot 1`] = `
                           validate={null}
                         >
                           <div
-                            className="field pb-2"
+                            className=""
                           >
                             <div
                               className="control"

diff --git a/packages/admin-portal/src/services/approvals.ts b/packages/admin-portal/src/services/approvals.ts
@@ -13,7 +13,7 @@ export const fetchApprovalsList = async (params: FetchApprovalsListParams): Prom
       url: `${URLS.approvals}?${setQueryParams(params)}`,
       api: window.reapit.config.marketplaceApiUrl,
       method: 'GET',
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {

diff --git a/packages/admin-portal/src/services/apps.ts b/packages/admin-portal/src/services/apps.ts
@@ -51,7 +51,7 @@ export const fetchAppsList = async (params: FetchAppsListParams): Promise<PagedR
       url: `${URLS.apps}?${setQueryParams(params)}`,
       api: window.reapit.config.marketplaceApiUrl,
       method: 'GET',
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {
@@ -67,7 +67,7 @@ export const fetchAppById = async (params: FetchAppByIdParams): Promise<AppDetai
       url: `${URLS.apps}/${id}?${setQueryParams({ clientId })}`,
       api: window.reapit.config.marketplaceApiUrl,
       method: 'GET',
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {
@@ -83,7 +83,7 @@ export const deleteAppById = async (params: DeleteAppByIdParams) => {
       url: `${URLS.apps}/${id}`,
       api: window.reapit.config.marketplaceApiUrl,
       method: 'DELETE',
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {
@@ -99,7 +99,7 @@ export const featureAppById = async (params: FeatureAppByIdParams) => {
       url: `${URLS.apps}/${id}/feature`,
       api: window.reapit.config.marketplaceApiUrl,
       method: 'PUT',
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {
@@ -115,7 +115,7 @@ export const unfeatureAppById = async (params: UnfeatureAppByIdParams) => {
       url: `${URLS.apps}/${id}/feature`,
       api: window.reapit.config.marketplaceApiUrl,
       method: 'DELETE',
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {
@@ -131,7 +131,7 @@ export const fetchAppRevisionsById = async (params: FetchAppRevisionsByIdParams)
       url: `${URLS.apps}/${id}/revisions/${revisionId}`,
       api: window.reapit.config.marketplaceApiUrl,
       method: 'GET',
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {
@@ -148,7 +148,7 @@ export const approveAppRevisionById = async (params: ApproveAppRevisionByIdParam
       api: window.reapit.config.marketplaceApiUrl,
       method: 'POST',
       body: rest,
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {
@@ -165,7 +165,7 @@ export const rejectAppRevisionById = async (params: RejectAppRevisionByIdParams)
       api: window.reapit.config.marketplaceApiUrl,
       method: 'POST',
       body: rest,
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {
@@ -179,7 +179,7 @@ export const fetchDesktopIntegrationTypes = async () => {
     url: URLS.desktopIntegrationTypes,
     method: 'GET',
     api: window.reapit.config.marketplaceApiUrl,
-    headers: generateHeader(window.reapit.config.marketplaceApiKey),
+    headers: await generateHeader(window.reapit.config.marketplaceApiKey),
   })
   return response
 }
diff --git a/packages/admin-portal/src/services/customers.ts b/packages/admin-portal/src/services/customers.ts
@@ -33,7 +33,7 @@ export const fetchCustomersList = async (params: FetchCustomersListParams): Prom
       url: `${URLS.customers}/?${setQueryParams(params)}`,
       api: window.reapit.config.marketplaceApiUrl,
       method: 'GET',
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {

diff --git a/packages/admin-portal/src/services/desktop-integration-types.ts b/packages/admin-portal/src/services/desktop-integration-types.ts
@@ -48,7 +48,7 @@ export const fetchDesktopIntegrationTypesList = async (
       url: `${URLS.desktopIntegrationTypes}?${setQueryParams(params)}`,
       api: window.reapit.config.marketplaceApiUrl,
       method: 'GET',
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {
@@ -64,7 +64,7 @@ export const createDesktopIntegrationTypes = async (params: CreateDesktopIntegra
       api: window.reapit.config.marketplaceApiUrl,
       method: 'POST',
       body: params,
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {
@@ -82,7 +82,7 @@ export const fetchDesktopIntegrationTypesById = async (
       url: `${URLS.desktopIntegrationTypes}/${id}`,
       api: window.reapit.config.marketplaceApiUrl,
       method: 'GET',
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {
@@ -99,7 +99,7 @@ export const updateDesktopIntegrationTypesById = async (params: UpdateDesktopInt
       api: window.reapit.config.marketplaceApiUrl,
       method: 'PUT',
       body: rest,
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {

diff --git a/packages/admin-portal/src/services/developers.ts b/packages/admin-portal/src/services/developers.ts
@@ -25,7 +25,7 @@ export const fetchDevelopersList = async (params: FetchDevelopersListParams): Pr
       url: `${URLS.developers}/?${setQueryParams(params)}`,
       api: window.reapit.config.marketplaceApiUrl,
       method: 'GET',
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {
@@ -42,7 +42,7 @@ export const updateDeveloperById = async (params: UpdateDeveloperByIdParams) =>
       api: window.reapit.config.marketplaceApiUrl,
       method: 'PUT',
       body: rest,
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {
@@ -58,7 +58,7 @@ export const fetchDeveloperBillingPeriod = async (params: FetchDeveloperBillingP
       url: `${URLS.developers}/costs/${period}`,
       api: window.reapit.config.marketplaceApiUrl,
       method: 'GET',
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {

diff --git a/packages/admin-portal/src/services/installations.ts b/packages/admin-portal/src/services/installations.ts
@@ -29,7 +29,7 @@ export const fetchInstallationsList = async (
       url: `${URLS.installations}?${setQueryParams(params)}`,
       api: window.reapit.config.marketplaceApiUrl,
       method: 'GET',
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {
@@ -45,7 +45,7 @@ export const fetchApiKeyInstallationById = async (params: FetchApiKeyInstallatio
       url: `${URLS.installations}/${installationId}/apiKey`,
       api: window.reapit.config.marketplaceApiUrl,
       method: 'GET',
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {

diff --git a/packages/admin-portal/src/services/scopes.ts b/packages/admin-portal/src/services/scopes.ts
@@ -10,7 +10,7 @@ export const fetchScopesList = async (): Promise<ScopeModel[]> => {
       url: `${URLS.scopes}`,
       api: window.reapit.config.marketplaceApiUrl,
       method: 'GET',
-      headers: generateHeader(window.reapit.config.marketplaceApiKey),
+      headers: await generateHeader(window.reapit.config.marketplaceApiKey),
     })
     return response
   } catch (error) {

diff --git a/packages/admin-portal/src/services/utils.ts b/packages/admin-portal/src/services/utils.ts
@@ -2,23 +2,38 @@ import { StringMap } from '@/types/core'
 import { API_VERSION } from './constants'
 import { reapitConnectBrowserSession } from '@/core/connect-session'
 
-export const generateHeader = (marketplaceApiKey): StringMap => ({
-  'Content-Type': 'application/json',
-  'X-Api-Key': marketplaceApiKey,
-})
+export const generateHeader = async (marketplaceApiKey: string): Promise<StringMap> => {
+  return window.reapit.config.appEnv === 'production'
+    ? await initAuthorizedRequestHeaders()
+    : {
+        'Content-Type': 'application/json',
+        'X-Api-Key': marketplaceApiKey,
+      }
+}
 
-export const generateHeaderWithApiV2 = (marketplaceApiKey): StringMap => ({
-  ...generateHeader(marketplaceApiKey),
-  'api-version': '2',
-})
+export const generateHeaderWithApiV2 = async (marketplaceApiKey: string): Promise<StringMap> => {
+  const headers =
+    window.reapit.config.appEnv === 'production'
+      ? await initAuthorizedRequestHeaders()
+      : {
+          'Content-Type': 'application/json',
+          'X-Api-Key': marketplaceApiKey,
+        }
+  return {
+    ...headers,
+    'api-version': '2',
+  }
+}
 
 export const initAuthorizedRequestHeaders = async () => {
   const session = await reapitConnectBrowserSession.connectSession()
-  const bearerToken = session ? session.accessToken : ''
-
-  return {
-    Authorization: `Bearer ${bearerToken}`,
-    'api-version': API_VERSION,
-    'Content-Type': 'application/json',
+  if (session && session.accessToken) {
+    return {
+      Authorization: `Bearer ${session.accessToken}`,
+      'api-version': API_VERSION,
+      'Content-Type': 'application/json',
+    }
   }
+
+  throw new Error('Cant get access token')
 }
diff --git a/packages/connect-session/jest.config.js b/packages/connect-session/jest.config.js
@@ -20,8 +20,8 @@ module.exports = {
     global: {
       branches: 78,
       functions: 100,
-      lines: 100,
-      statements: 99
+      lines: 99,
+      statements: 98
     },
   },
 }
diff --git a/packages/connect-session/package.json b/packages/connect-session/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reapit/connect-session",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "OAuth Flow for Reapit Connect",
   "keywords": [],
   "homepage": "https://github.com/reapit/foundations#readme",

diff --git a/packages/connect-session/src/browser/__tests__/index.test.ts b/packages/connect-session/src/browser/__tests__/index.test.ts
@@ -153,7 +153,7 @@ describe('ReapitConnectBrowserSession', () => {
 
     await session.connectSession()
 
-    expect(mockedAuthEndpoint).toHaveBeenCalled()
+    expect(mockedAuthEndpoint).toHaveBeenCalledTimes(1)
   })
 
   it('should redirect to login page if token endpoint fails', async () => {
@@ -168,7 +168,7 @@ describe('ReapitConnectBrowserSession', () => {
     await session.connectSession()
 
     expect(window.fetch).toHaveBeenCalledTimes(1)
-    expect(mockedAuthEndpoint).toHaveBeenCalled()
+    expect(mockedAuthEndpoint).toHaveBeenCalledTimes(1)
   })
 
   it('should redirect to login if the method is called on session', async () => {

diff --git a/packages/connect-session/src/browser/index.ts b/packages/connect-session/src/browser/index.ts
@@ -165,7 +165,6 @@ export class ReapitConnectBrowserSession {
 
   private handleError(error: string) {
     console.error('Reapit Connect Error:', error)
-    this.connectAuthorizeRedirect()
   }
 
   // set a redirect URI to my page where I instantiated the flow, by decoding the state object
@@ -254,7 +253,7 @@ export class ReapitConnectBrowserSession {
       }
 
       // The token endpoint failed to get a session so send me to login to get a new session
-      throw new Error('Failed to fetch session, redirecting to authorize to re-start OAuth Flow')
+      this.connectAuthorizeRedirect()
     } catch (err) {
       return this.handleError(`Reapit Connect Session error ${err.message}`)
     }

diff --git a/...s/pages/analytics/cost-explorer/transaction-history/__test__/transaction-history.test.tsx b/...s/pages/analytics/cost-explorer/transaction-history/__test__/transaction-history.test.tsx
@@ -69,7 +69,7 @@ describe('TransactionHistory', () => {
         url: `${URLS.trafficEventBilling}/2020-01/download?applicationId=1&applicationId=2`,
         api: window.reapit.config.marketplaceApiUrl,
         method: 'GET',
-        headers: generateHeader(window.reapit.config.marketplaceApiKey),
+        headers: await generateHeader(window.reapit.config.marketplaceApiKey),
       })
       expect(mockEvent.preventDefault).toHaveBeenCalled()
       expect(mockEvent.preventDefault).toHaveBeenCalled()

diff --git a/.../src/components/pages/analytics/cost-explorer/transaction-history/transaction-history.tsx b/.../src/components/pages/analytics/cost-explorer/transaction-history/transaction-history.tsx
@@ -51,7 +51,7 @@ export const createHandleDownLoadButtonOnClickFn = ({
     url: `${URLS.trafficEventBilling}/${month}/download?${params.toString()}`,
     api: window.reapit.config.marketplaceApiUrl,
     method: 'GET',
-    headers: generateHeader(window.reapit.config.marketplaceApiKey),
+    headers: await generateHeader(window.reapit.config.marketplaceApiKey),
   })
   const fileName = `reapit-billing-data-${month}.csv`
   FileSaver.saveAs(blob, fileName)