Merge pull request #109 from amazon-ospo/AddTargetType

feat: Adding TargetType field to installations table

Author: RBose-amzn

src/packages/app-framework/src/credential-manager/installation-tracker/index.handler.ts

@@ -103,6 +103,7 @@ export const handlerImpl: Handler = async ({
             installationId: installation.id,
             appId: appId,
             nodeId: installation.account ? installation.account.node_id : '',
+            targetType: installation.target_type,
           };
         }),
       );

src/packages/app-framework/src/credential-manager/refresh/refreshCachedData.ts

@@ -86,6 +86,7 @@ export const refreshCachedDataImpl: RefreshCachedData = async ({
               installationId: installation.id,
               appId: appId,
               nodeId: installation.account ? installation.account.node_id : '',
+              targetType: installation.target_type,
             };
           }),
         );

src/packages/app-framework/src/data.ts

@@ -13,6 +13,7 @@ export type InstallationRecord = {
   appId: number;
   installationId: number;
   nodeId: string;
+  targetType: string;
 };
 
 type AppInstallations = {
@@ -115,12 +116,14 @@ export type PutInstallation = ({
   appId,
   nodeId,
   installationId,
+  targetType,
   lastRefreshed,
 }: {
   tableName: string;
   appId: number;
   nodeId: string;
   installationId: number;
+  targetType: string;
   lastRefreshed?: string;
 }) => Promise<void>;
 
@@ -129,6 +132,7 @@ export const putInstallationImpl: PutInstallation = async ({
   appId,
   nodeId,
   installationId,
+  targetType,
   lastRefreshed,
 }): Promise<void> => {
   const tableOperations = new TableOperations({
@@ -139,6 +143,7 @@ export const putInstallationImpl: PutInstallation = async ({
     AppId: { N: appId.toString() },
     NodeId: { S: nodeId },
     InstallationId: { N: installationId.toString() },
+    TargetType: { S: targetType },
     LastRefreshed: { S: lastRefreshed || '' },
   };
 
@@ -241,11 +246,13 @@ export const getInstallationsImpl: GetInstallations = async ({ tableName }) => {
   itemList.map((item) => {
     const appId: number = item.AppId;
     const installationId: number = item.InstallationId;
+    const targetType: string = item.targetType;
     const nodeId: string = item.NodeId ?? '';
     result.push({
       appId,
       nodeId,
       installationId,
+      targetType,
     });
   });
   return result;
@@ -278,10 +285,12 @@ export const getInstallationsDataByNodeId: GetInstallationsByNodeId = async ({
     const appId: number = item.AppId;
     const itemNodeId: string = item.NodeId;
     const installationId: number = item.InstallationId;
+    const targetType: string = item.targetType;
     result.push({
       appId,
       nodeId: itemNodeId,
       installationId,
+      targetType,
     });
   });
 

src/packages/app-framework/test/data.test.ts

@@ -24,6 +24,7 @@ const mockAppId = 12345;
 const mockTableName = 'validAppTableName';
 const mockNodeId = 'foo';
 const mockInstallationId = 123456;
+const mockTargetType = 'Organization';
 const mockArn = 'arn:aws:kms:region:account:key/mock-key-id';
 describe('getKeyArnByID', () => {
   it('should successfully retrieve KMS ARN from DynamoDB', async () => {
@@ -224,6 +225,7 @@ describe('getInstallationId', () => {
         appId: mockAppId,
         installationId: mockInstallationId,
         nodeId: mockNodeId,
+        targetType: mockTargetType,
       });
 
       expect(TableOperations).toHaveBeenCalledWith({
@@ -234,6 +236,7 @@ describe('getInstallationId', () => {
         InstallationId: { N: mockInstallationId.toString() },
         LastRefreshed: { S: '' },
         NodeId: { S: mockNodeId },
+        TargetType: { S: mockTargetType },
       });
     });
 
@@ -248,6 +251,7 @@ describe('getInstallationId', () => {
           lastRefreshed: '',
           installationId: mockInstallationId,
           nodeId: mockNodeId,
+          targetType: mockTargetType,
         }),
       ).rejects.toThrow('DynamoDB service error');
     });

src/packages/app-framework/test/get-installation-data/getInstallationData.test.ts

@@ -14,11 +14,13 @@ describe('getInstallationsDataImpl', () => {
       appId: 12345,
       installationId: 67890,
       nodeId: mockNodeId,
+      targetType: 'Organization',
     },
     {
       appId: 54321,
       installationId: 98765,
       nodeId: mockNodeId,
+      targetType: 'Organization',
     },
   ];
 
@@ -94,16 +96,19 @@ describe('getInstallationsDataImpl', () => {
         appId: 12345,
         installationId: 67890,
         nodeId: mockNodeId,
+        targetType: 'Organization',
       },
       {
         appId: 54321,
         installationId: 98765,
         nodeId: mockNodeId,
+        targetType: 'Organization',
       },
       {
         appId: 11111,
         installationId: 22222,
         nodeId: mockNodeId,
+        targetType: 'Organization',
       },
     ];
     const mockGetInstallationsDataByNodeId = jest