feat: #1848 filter app lists when using the marketplace in Developer Edition

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

@@ -38,6 +38,7 @@ export const mockLoginSession: LoginSession = {
     userCode: 'SOME_USER_CODE',
     isAdmin: false,
     userTel: '123',
+    groups: [],
   },
 }
 

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

@@ -52,6 +52,7 @@ export interface LoginIdentity {
   userCode: string | null
   isAdmin?: boolean
   userTel: string
+  groups: string[]
 }
 
 export interface LoginSession {

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

@@ -180,6 +180,7 @@ describe('Session utils', () => {
         name: 'SOME_NAME',
         userCode: 'SOME_USER_CODE',
         isAdmin: true,
+        groups: ['CustomerAdministrators'],
       })
     })
 
@@ -192,6 +193,7 @@ describe('Session utils', () => {
         name: undefined,
         userCode: null,
         isAdmin: false,
+        groups: [],
       })
     })
   })

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

@@ -116,6 +116,7 @@ export const deserializeIdToken = (loginSession: Partial<LoginSession> | undefin
     userCode: decoded['custom:reapit:userCode'] || null,
     isAdmin: Boolean(decoded['cognito:groups']?.includes('CustomerAdministrators')),
     userTel: decoded['phone_number'],
+    groups: decoded['cognito:groups'] || [],
   }
 }
 

packages/geo-diary-v2/src/context/__mocks__/mock-context.tsx

@@ -16,6 +16,7 @@ export const mockContext = {
       adminId: 'mockAdminID',
       userCode: 'mockUserCode',
       userTel: 'mockTel',
+      groups: [],
     },
     loginType: 'CLIENT',
     cognitoClientId: '123',

packages/marketplace/src/components/ui/developer-app-revision-modal/__test__/developer-app-revision-modal.test.tsx

@@ -101,6 +101,7 @@ describe('DeveloperAppRevisionModal', () => {
         userCode: 'mockUserCode',
         isAdmin: false,
         userTel: '123',
+        groups: [],
       }
       const fn = handleCancelPendingRevisionsButtonClick(spyDispatch, appId, appRevisionId, loginIdentity)
       fn()

packages/marketplace/src/constants/api.ts

@@ -8,3 +8,5 @@ export const COGNITO_HEADERS = {
 } as StringMap
 
 export const SANDBOX_CLIENT_ID = 'SBOX'
+
+export const COGNITO_GROUP_DEVELOPER_EDITION = 'AgencyCloudDeveloperEdition'

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

@@ -19,6 +19,7 @@ export const mockLoginSession: LoginSession = {
     userCode: 'SOME_USER_CODE',
     isAdmin: false,
     userTel: '123',
+    groups: ['AgencyCloudDeveloperEdition'],
   },
 }
 

packages/marketplace/src/reducers/__stubs__/app-state.ts

@@ -66,6 +66,7 @@ const appState: ReduxState = {
         adminId: null,
         userCode: 'testUserCode',
         userTel: '123',
+        groups: ['AgencyCloudDeveloperEdition'],
       },
     },
     isTermAccepted: false,

packages/marketplace/src/sagas/__tests__/client.ts

@@ -9,7 +9,7 @@ import { APPS_PER_PAGE } from '@/constants/paginator'
 import { Action } from '@/types/core'
 import { errorThrownServer } from '@/actions/error'
 import errorMessages from '@/constants/error-messages'
-import { selectClientId, selectFeaturedApps } from '@/selector/client'
+import { selectClientId, selectFeaturedApps, selectDeveloperId } from '@/selector/client'
 import { selectCategories } from '@/selector/app-categories'
 import {
   PagedResultCategoryModel_,
@@ -25,6 +25,7 @@ jest.mock('@reapit/elements')
 
 const params = { data: { page: 1, search: 'app1', category: 'category1', searchBy: 'appName' } }
 const clientId = 'DXX'
+const developerId = '1234'
 
 describe('clientDataFetch', () => {
   const gen = cloneableGenerator(clientDataFetch as any)(params)
@@ -34,11 +35,14 @@ describe('clientDataFetch', () => {
     expect(clone.next().value).toEqual(select(selectClientId))
     expect(clone.next(clientId).value).toEqual(select(selectCategories))
     expect(clone.next(appCategorieStub.data).value).toEqual(select(selectFeaturedApps))
+    expect(clone.next(featuredAppsDataStub.data).value).toEqual(select(selectDeveloperId))
+
     const response = [appsDataStub.data, featuredAppsDataStub.data, appCategorieStub]
-    expect(clone.next(featuredAppsDataStub.data).value).toEqual(
+    expect(clone.next(developerId).value).toEqual(
       all([
         call(fetchAppsList, {
           clientId,
+          developerId: [developerId],
           category: params.data.category as any,
           appName: params.data.search,
           pageNumber: params.data.page,

packages/marketplace/src/sagas/__tests__/installed-apps.ts

@@ -11,7 +11,7 @@ import { Action } from '@/types/core'
 import { cloneableGenerator } from '@redux-saga/testing-utils'
 import { errorThrownServer } from '@/actions/error'
 import errorMessages from '@/constants/error-messages'
-import { selectClientId } from '@/selector/client'
+import { selectClientId, selectDeveloperId } from '@/selector/client'
 import { fetchAppsList } from '@/services/apps'
 import { INSTALLED_APPS_PERPAGE } from '@/constants/paginator'
 
@@ -23,12 +23,15 @@ const params = { data: 1 }
 describe('installed-apps fetch data', () => {
   const gen = cloneableGenerator(installedAppsDataFetch)(params)
   const clientId = 'DAC'
+  const developerId = '1234'
 
   expect(gen.next().value).toEqual(put(installedAppsLoading(true)))
   expect(gen.next().value).toEqual(select(selectClientId))
-  expect(gen.next(clientId).value).toEqual(
+  expect(gen.next(clientId).value).toEqual(select(selectDeveloperId))
+  expect(gen.next(developerId).value).toEqual(
     call(fetchAppsList, {
       clientId,
+      developerId: [developerId],
       pageNumber: params.data,
       pageSize: INSTALLED_APPS_PERPAGE,
       onlyInstalled: true,

packages/marketplace/src/sagas/__tests__/my-apps.ts

@@ -7,7 +7,7 @@ import { Action } from '@/types/core'
 import { cloneableGenerator } from '@redux-saga/testing-utils'
 import { APPS_PER_PAGE } from '@/constants/paginator'
 import errorMessages from '@/constants/error-messages'
-import { selectClientId } from '@/selector/client'
+import { selectClientId, selectDeveloperId } from '@/selector/client'
 import { errorThrownServer } from '@/actions/error'
 import { fetchAppsList } from '@/services/apps'
 
@@ -18,11 +18,19 @@ const params = { data: 1 }
 describe('my-apps fetch data', () => {
   const gen = cloneableGenerator(myAppsDataFetch)(params)
   const clientId = 'DAC'
+  const developerId = '1234'
 
   expect(gen.next().value).toEqual(put(myAppsLoading(true)))
   expect(gen.next().value).toEqual(select(selectClientId))
-  expect(gen.next(clientId).value).toEqual(
-    call(fetchAppsList, { clientId, onlyInstalled: true, pageNumber: params.data, pageSize: APPS_PER_PAGE }),
+  expect(gen.next(clientId).value).toEqual(select(selectDeveloperId))
+  expect(gen.next(developerId).value).toEqual(
+    call(fetchAppsList, {
+      clientId,
+      developerId: [developerId],
+      onlyInstalled: true,
+      pageNumber: params.data,
+      pageSize: APPS_PER_PAGE,
+    }),
   )
 
   test('api call success', () => {

packages/marketplace/src/sagas/client.ts

@@ -6,7 +6,7 @@ import { errorThrownServer } from '../actions/error'
 import errorMessages from '../constants/error-messages'
 import { APPS_PER_PAGE, FEATURED_APPS } from '@/constants/paginator'
 import { Action } from '@/types/core'
-import { selectClientId, selectFeaturedApps } from '@/selector/client'
+import { selectClientId, selectFeaturedApps, selectDeveloperId } from '@/selector/client'
 import { selectCategories } from '@/selector/app-categories'
 import { ClientAppSummary, ClientAppSummaryParams } from '@/reducers/client/app-summary'
 import { logger } from '@reapit/utils'
@@ -24,6 +24,7 @@ export const clientDataFetch = function*({ data }) {
     }
     const currentCategories = yield select(selectCategories)
     const currentFeaturedApps = yield select(selectFeaturedApps)
+    const developerId = yield select(selectDeveloperId)
 
     // because the https://dev.platformmarketplace.reapit.net/categories endpoint does not return a filter for Direct API so
     // we will have to manually check it here
@@ -33,6 +34,7 @@ export const clientDataFetch = function*({ data }) {
     const [apps, featuredApps, categories] = yield all([
       call(fetchAppsList, {
         clientId,
+        developerId: developerId ? [developerId] : [],
         category: isFilteringForDirectApiApps ? undefined : category,
         [searchBy]: search,
         pageNumber: page,

packages/marketplace/src/sagas/installed-apps.ts

@@ -9,7 +9,7 @@ import { errorThrownServer } from '../actions/error'
 import errorMessages from '../constants/error-messages'
 import { Action } from '@/types/core'
 import { INSTALLED_APPS_PERPAGE } from '@/constants/paginator'
-import { selectClientId } from '@/selector/client'
+import { selectClientId, selectDeveloperId } from '@/selector/client'
 import { logger } from '@reapit/utils'
 import { fetchAppsList } from '@/services/apps'
 
@@ -21,9 +21,10 @@ export const installedAppsDataFetch = function*({ data: page }) {
     if (!clientId) {
       return
     }
-
+    const developerId = yield select(selectDeveloperId)
     const response = yield call(fetchAppsList, {
       clientId,
+      developerId: developerId ? [developerId] : [],
       pageNumber: page,
       pageSize: INSTALLED_APPS_PERPAGE,
       onlyInstalled: true,

packages/marketplace/src/sagas/my-apps.ts

@@ -5,7 +5,7 @@ import { errorThrownServer } from '../actions/error'
 import errorMessages from '../constants/error-messages'
 import { Action } from '@/types/core'
 import { APPS_PER_PAGE } from '@/constants/paginator'
-import { selectClientId } from '@/selector/client'
+import { selectClientId, selectDeveloperId } from '@/selector/client'
 import { logger } from '@reapit/utils'
 import { fetchAppsList } from '@/services/apps'
 
@@ -17,9 +17,10 @@ export const myAppsDataFetch = function*({ data: page }) {
     if (!clientId) {
       return
     }
-
+    const developerId = yield select(selectDeveloperId)
     const response = yield call(fetchAppsList, {
       clientId,
+      developerId: developerId ? [developerId] : [],
       onlyInstalled: true,
       pageNumber: page,
       pageSize: APPS_PER_PAGE,

packages/marketplace/src/selector/__tests__/client.ts

@@ -1,6 +1,7 @@
 import { ReduxState } from '@/types/core'
 import {
   selectClientId,
+  selectDeveloperId,
   selectLoggedUserEmail,
   selectFeaturedApps,
   selectWebComponentOpen,
@@ -37,6 +38,42 @@ describe('selectClientId', () => {
   })
 })
 
+describe('selectDeveloperId', () => {
+  it('should run correctly when user in AgencyCloudDeveloperEdition group', () => {
+    const input = {
+      auth: {
+        loginSession: {
+          loginIdentity: {
+            clientId: '123',
+            email: '[email protected]',
+            developerId: '1234',
+            groups: ['AgencyCloudDeveloperEdition'],
+          },
+        },
+      },
+    } as ReduxState
+    const result = selectDeveloperId(input)
+    expect(result).toEqual('1234')
+  })
+
+  it('should run correctly when user NOT in AgencyCloudDeveloperEdition group', () => {
+    const input = {
+      auth: {
+        loginSession: {
+          loginIdentity: {
+            clientId: '123',
+            email: '[email protected]',
+            developerId: '1234',
+            groups: [''],
+          },
+        },
+      },
+    } as ReduxState
+    const result = selectDeveloperId(input)
+    expect(result).toEqual(null)
+  })
+})
+
 describe('selectLoggedUserEmail', () => {
   it('should run correctly', () => {
     const input = {

packages/marketplace/src/selector/client.ts

@@ -6,11 +6,26 @@ import { WebComponentConfigResult } from '@/services/web-component'
 import { InstalledAppsState } from '@/reducers/installed-apps'
 import { AppSummaryModel } from '@reapit/foundations-ts-definitions'
 import { ClientAppSummaryState } from '@/reducers/client/app-summary'
+import { selectLoginIdentity } from '@/selector/auth'
+import { COGNITO_GROUP_DEVELOPER_EDITION } from '@/constants/api'
 
 export const selectClientId = (state: ReduxState) => {
   return state?.auth?.loginSession?.loginIdentity?.clientId || ''
 }
 
+/**
+ * Need get developer id to filter apps list if this user belong to
+ * AgencyCloudDeveloperEdition group, if not just return null
+ * refer to this ticket https://github.com/reapit/foundations/issues/1848
+ */
+export const selectDeveloperId = (state: ReduxState) => {
+  const loginIdentity = selectLoginIdentity(state)
+  if (loginIdentity?.groups.includes(COGNITO_GROUP_DEVELOPER_EDITION)) {
+    return state?.auth?.loginSession?.loginIdentity?.developerId || ''
+  }
+  return null
+}
+
 export const selectLoggedUserEmail = (state: ReduxState): string => {
   return state?.auth?.loginSession?.loginIdentity?.email || ''
 }

packages/react-app-scaffolder/app/templates/apollo/src/context/__mocks__/mock-context.tsx

@@ -16,6 +16,7 @@ export const mockContext = {
       adminId: 'mockAdminID',
       userCode: 'mockUserCode',
       userTel: 'mockUserTel',
+      groups: [],
     },
     loginType: 'CLIENT',
     cognitoClientId: 'mockCognitoClientId',

packages/site-builder/src/context/__mocks__/mock-context.tsx

@@ -16,6 +16,7 @@ export const mockContext = {
       adminId: 'mockAdminID',
       userCode: 'mockUserCode',
       userTel: '0799999999',
+      groups: [],
     },
     loginType: 'CLIENT',
     cognitoClientId: '123',

packages/smb-onboarder/src/context/__mocks__/mock-context.ts

@@ -16,6 +16,7 @@ export const mockContext = {
       adminId: 'mockAdminID',
       userCode: 'mockUserCode',
       userTel: 'mockTel',
+      groups: [],
     },
     loginType: 'CLIENT',
     cognitoClientId: 'mockCognitoClientId',