[#175461739] Enable correct response by UpdateUser (#99)

pagopa · Oct 27, 2020 · a3ef2a9 · a3ef2a9
1 parent 7703f15
commit a3ef2a9
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 26 deletions.
diff --git a/UpdateUser/__tests__/handler.ts b/UpdateUser/__tests__/handler.ts
@@ -4,8 +4,8 @@ import { GraphRbacManagementClient } from "@azure/graph";
 import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
 import { NonEmptyString } from "italia-ts-commons/lib/strings";
 import { EmailAddress } from "../../generated/definitions/EmailAddress";
-import { UserCreated } from "../../generated/definitions/UserCreated";
 import { UserStateEnum } from "../../generated/definitions/UserState";
+import { UserUpdated } from "../../generated/definitions/UserUpdated";
 import { UserUpdatePayload } from "../../generated/definitions/UserUpdatePayload";
 import { IServicePrincipalCreds } from "../../utils/apim";
 import { UpdateUserHandler } from "../handler";
@@ -46,16 +46,19 @@ mockGetToken.mockImplementation(() => {
   return Promise.resolve(undefined);
 });
 const mockUsersUpdate = jest.fn();
+const mockListUsers = jest.fn();
+mockListUsers.mockImplementation(() =>
+  Promise.resolve([
+    {
+      email: aUserEmail,
+      objectId: fakeObjectId
+    }
+  ])
+);
 
 mockGraphRbacManagementClient.mockImplementation(() => ({
   users: {
-    list: jest.fn(() =>
-      Promise.resolve([
-        {
-          email: "user@example.com"
-        }
-      ])
-    ),
+    list: mockListUsers,
     update: mockUsersUpdate
   }
 }));
@@ -126,7 +129,7 @@ describe("UpdateUser", () => {
       state: UserStateEnum.active,
       type: "Microsoft.ApiManagement/service/users"
     };
-    const expectedUpdatedUser: UserCreated = {
+    const expectedUpdatedUser: UserUpdated = {
       email: fakeApimUser.email,
       first_name: fakeApimUser.firstName,
       id: fakeApimUser.name,

diff --git a/UpdateUser/handler.ts b/UpdateUser/handler.ts
@@ -70,17 +70,21 @@ const updateUser = (
         })
       ),
     toError
-  ).chain(updateUserResponse =>
-    fromEither(
-      UserUpdated.decode({
-        email,
-        first_name: userPayload.first_name,
-        id: updateUserResponse.objectId,
-        last_name: userPayload.last_name,
-        token_name: userPayload.token_name
-      }).mapLeft(
-        errs =>
-          new Error(`Error decoding UserUpdated ERROR=${readableReport(errs)}`)
+  ).chain(() =>
+    getUserFromList(client, email).chain(userResponse =>
+      fromEither(
+        UserUpdated.decode({
+          email,
+          first_name: userPayload.first_name,
+          id: userResponse.objectId,
+          last_name: userPayload.last_name,
+          token_name: userPayload.token_name
+        }).mapLeft(
+          errs =>
+            new Error(
+              `Error decoding UserUpdated ERROR=${readableReport(errs)}`
+            )
+        )
       )
     )
   );
@@ -103,19 +107,24 @@ export function UpdateUserHandler(
       )
       .chain(graphRbacManagementClient =>
         getUserFromList(graphRbacManagementClient, email)
+          .mapLeft(userFromListError =>
+            internalErrorHandler(
+              "Could not retrieve user from list on the ADB2C",
+              userFromListError
+            )
+          )
           .chain(user =>
             updateUser(
               graphRbacManagementClient,
               email,
               user,
               adb2cTokenAttributeName,
               userPayload
-            )
-          )
-          .mapLeft(error =>
-            internalErrorHandler(
-              "Could not update the user on the ADB2C",
-              new Error(JSON.stringify(error))
+            ).mapLeft(updateUserError =>
+              internalErrorHandler(
+                "Could not update the user on the ADB2C",
+                new Error(JSON.stringify(updateUserError))
+              )
             )
           )
       )