[#17482372] Add token name to GetUser from Azure ADB2C (#85)

pagopa · Sep 18, 2020 · 618aff4 · 618aff4
1 parent 419bc30
commit 618aff4
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 16 deletions.
diff --git a/GetUser/__tests__/handler.test.ts b/GetUser/__tests__/handler.test.ts
@@ -7,6 +7,7 @@ import {
 import { GraphRbacManagementClient } from "@azure/graph";
 import { isRight, left, right } from "fp-ts/lib/Either";
 import { fromEither, fromLeft } from "fp-ts/lib/TaskEither";
+import { NonEmptyString } from "italia-ts-commons/lib/strings";
 import { UserInfo } from "../../generated/definitions/UserInfo";
 import * as ApimUtils from "../../utils/apim";
 import { IAzureApimConfig, IServicePrincipalCreds } from "../../utils/apim";
@@ -83,6 +84,8 @@ spyOnGetAdb2cClient.mockImplementation(() =>
 const mockLog = jest.fn();
 const mockedContext = { log: { error: mockLog } };
 
+const fakeAdb2cExtensionAppClientId = "extension-client-id" as NonEmptyString;
+
 // tslint:disable-next-line:no-big-function
 describe("GetUser", () => {
   it("should return an internal error response if the API management client can not be got", async () => {
@@ -93,7 +96,8 @@ describe("GetUser", () => {
     const getUserHandler = GetUserHandler(
       fakeAdb2cCreds,
       fakeServicePrincipalCredentials,
-      fakeApimConfig
+      fakeApimConfig,
+      fakeAdb2cExtensionAppClientId
     );
 
     const response = await getUserHandler(
@@ -112,7 +116,8 @@ describe("GetUser", () => {
     const getUserHandler = GetUserHandler(
       fakeAdb2cCreds,
       fakeServicePrincipalCredentials,
-      fakeApimConfig
+      fakeApimConfig,
+      fakeAdb2cExtensionAppClientId
     );
 
     const response = await getUserHandler(
@@ -129,7 +134,8 @@ describe("GetUser", () => {
     const getUserHandler = GetUserHandler(
       fakeAdb2cCreds,
       fakeServicePrincipalCredentials,
-      fakeApimConfig
+      fakeApimConfig,
+      fakeAdb2cExtensionAppClientId
     );
 
     const response = await getUserHandler(
@@ -148,7 +154,8 @@ describe("GetUser", () => {
     const getUserHandler = GetUserHandler(
       fakeAdb2cCreds,
       fakeServicePrincipalCredentials,
-      fakeApimConfig
+      fakeApimConfig,
+      fakeAdb2cExtensionAppClientId
     );
 
     const response = await getUserHandler(
@@ -171,7 +178,8 @@ describe("GetUser", () => {
     const getUserHandler = GetUserHandler(
       fakeAdb2cCreds,
       fakeServicePrincipalCredentials,
-      fakeApimConfig
+      fakeApimConfig,
+      fakeAdb2cExtensionAppClientId
     );
 
     const response = await getUserHandler(
@@ -194,7 +202,8 @@ describe("GetUser", () => {
     const getUserHandler = GetUserHandler(
       fakeAdb2cCreds,
       fakeServicePrincipalCredentials,
-      fakeApimConfig
+      fakeApimConfig,
+      fakeAdb2cExtensionAppClientId
     );
 
     const response = await getUserHandler(
@@ -217,7 +226,8 @@ describe("GetUser", () => {
     const getUserHandler = GetUserHandler(
       fakeAdb2cCreds,
       fakeServicePrincipalCredentials,
-      fakeApimConfig
+      fakeApimConfig,
+      fakeAdb2cExtensionAppClientId
     );
 
     const response = await getUserHandler(
@@ -240,7 +250,8 @@ describe("GetUser", () => {
     const getUserHandler = GetUserHandler(
       fakeAdb2cCreds,
       fakeServicePrincipalCredentials,
-      fakeApimConfig
+      fakeApimConfig,
+      fakeAdb2cExtensionAppClientId
     );
 
     const response = await getUserHandler(
@@ -340,7 +351,8 @@ describe("GetUser", () => {
     const getUserHandler = GetUserHandler(
       fakeAdb2cCreds,
       fakeServicePrincipalCredentials,
-      fakeApimConfig
+      fakeApimConfig,
+      fakeAdb2cExtensionAppClientId
     );
 
     const response = await getUserHandler(

diff --git a/GetUser/handler.ts b/GetUser/handler.ts
@@ -90,7 +90,8 @@ function getUserSubscriptions(
 export function GetUserHandler(
   adb2cCredentials: IServicePrincipalCreds,
   servicePrincipalCreds: IServicePrincipalCreds,
-  azureApimConfig: IAzureApimConfig
+  azureApimConfig: IAzureApimConfig,
+  adb2cExtensionAppClientId: NonEmptyString
 ): IGetSubscriptionKeysHandler {
   return async (context, _, email) => {
     const internalErrorHandler = (errorMessage: string, error: Error) =>
@@ -217,9 +218,7 @@ export function GetUserHandler(
             return {
               ...taskResults,
               token_name:
-                adb2User[
-                  `adb2User.extension_${adb2cCredentials.clientId}_token_name`
-                ]
+                adb2User[`extension_${adb2cExtensionAppClientId}_token_name`]
             };
           })
       )
@@ -270,12 +269,14 @@ export function GetUserHandler(
 export function GetUser(
   adb2cCredentials: IServicePrincipalCreds,
   servicePrincipalCreds: IServicePrincipalCreds,
-  azureApimConfig: IAzureApimConfig
+  azureApimConfig: IAzureApimConfig,
+  adb2cExtensionAppClientId: NonEmptyString
 ): express.RequestHandler {
   const handler = GetUserHandler(
     adb2cCredentials,
     servicePrincipalCreds,
-    azureApimConfig
+    azureApimConfig,
+    adb2cExtensionAppClientId
   );
 
   const middlewaresWrap = withRequestMiddlewares(

diff --git a/GetUser/index.ts b/GetUser/index.ts
@@ -28,6 +28,10 @@ const azureApimConfig = {
   subscriptionId: getRequiredStringEnv("AZURE_SUBSCRIPTION_ID")
 };
 
+const adb2cExtensionAppClientId = getRequiredStringEnv(
+  "ADB2C_EXTENSION_APP_CLIENT_ID"
+);
+
 // tslint:disable-next-line: no-let
 let logger: Context["log"] | undefined;
 const contextTransport = new AzureContextTransport(() => logger, {
@@ -42,7 +46,12 @@ secureExpressApp(app);
 // Add express route
 app.get(
   "/adm/users/:email",
-  GetUser(adb2cCreds, servicePrincipalCreds, azureApimConfig)
+  GetUser(
+    adb2cCreds,
+    servicePrincipalCreds,
+    azureApimConfig,
+    adb2cExtensionAppClientId
+  )
 );
 
 const azureFunctionHandler = createAzureFunctionHandler(app);

diff --git a/env.example b/env.example
@@ -36,6 +36,7 @@ COSMOSDB_NAME=<COSMOSDB_NAME>
 ADB2C_CLIENT_ID=1
 ADB2C_CLIENT_KEY=1
 ADB2C_TENANT_ID=1
+ADB2C_EXTENSION_APP_CLIENT_ID=1
 SERVICE_PRINCIPAL_CLIENT_ID=1
 SERVICE_PRINCIPAL_SECRET=1
 SERVICE_PRINCIPAL_TENANT_ID=1