fix(getUser&adminGetUser): username field now returns sub...

integration-tests/aws-sdk/adminDeleteUser.test.ts

@@ -2,6 +2,7 @@ import { ClockFake } from "../../src/__tests__/clockFake";
 import { UUID } from "../../src/__tests__/patterns";
 import { UserNotFoundError } from "../../src/errors";
 import { withCognitoSdk } from "./setup";
+import { attributeValue } from "../../src/services/userPoolService";
 
 const currentDate = new Date();
 const roundedDate = new Date(currentDate.getTime());
@@ -38,7 +39,7 @@ describe(
           UserAttributes: createUserResult.User?.Attributes,
           UserCreateDate: createUserResult.User?.UserCreateDate,
           UserLastModifiedDate: createUserResult.User?.UserLastModifiedDate,
-          Username: createUserResult.User?.Username,
+          Username: attributeValue("sub", createUserResult.User?.Attributes),
           UserStatus: createUserResult.User?.UserStatus,
         });
 
@@ -89,7 +90,7 @@ describe(
           UserAttributes: createUserResult.User?.Attributes,
           UserCreateDate: createUserResult.User?.UserCreateDate,
           UserLastModifiedDate: createUserResult.User?.UserLastModifiedDate,
-          Username: createUserResult.User?.Username,
+          Username: attributeValue("sub", createUserResult.User?.Attributes),
           UserStatus: createUserResult.User?.UserStatus,
         });
 

integration-tests/aws-sdk/adminGetUser.test.ts

@@ -1,5 +1,6 @@
 import { ClockFake } from "../../src/__tests__/clockFake";
 import { withCognitoSdk } from "./setup";
+import { attributeValue } from "../../src/services/userPoolService";
 
 const currentDate = new Date();
 const roundedDate = new Date(currentDate.getTime());
@@ -36,7 +37,7 @@ describe(
           UserAttributes: createUserResult.User?.Attributes,
           UserCreateDate: createUserResult.User?.UserCreateDate,
           UserLastModifiedDate: createUserResult.User?.UserLastModifiedDate,
-          Username: createUserResult.User?.Username,
+          Username: attributeValue("sub", createUserResult.User?.Attributes),
           UserStatus: createUserResult.User?.UserStatus,
         });
       });

integration-tests/aws-sdk/adminSetUserPassword.test.ts

@@ -1,5 +1,6 @@
 import { ClockFake } from "../../src/__tests__/clockFake";
 import { withCognitoSdk } from "./setup";
+import { attributeValue } from "../../src/services/userPoolService";
 
 const currentDate = new Date();
 const roundedDate = new Date(currentDate.getTime());
@@ -45,7 +46,7 @@ describe(
           UserAttributes: createUserResult.User?.Attributes,
           UserCreateDate: createUserResult.User?.UserCreateDate,
           UserLastModifiedDate: createUserResult.User?.UserLastModifiedDate,
-          Username: createUserResult.User?.Username,
+          Username: attributeValue("sub", createUserResult.User?.Attributes),
           UserStatus: "CONFIRMED",
         });
       });

src/targets/addCustomAttributes.test.ts

@@ -3,12 +3,8 @@ import { newMockCognitoService } from "../__tests__/mockCognitoService";
 import { newMockUserPoolService } from "../__tests__/mockUserPoolService";
 import { TestContext } from "../__tests__/testContext";
 import * as TDB from "../__tests__/testDataBuilder";
-import {
-  GroupNotFoundError,
-  InvalidParameterError,
-  UserNotFoundError,
-} from "../errors";
-import { CognitoService, UserPoolService } from "../services";
+import { InvalidParameterError } from "../errors";
+import { CognitoService } from "../services";
 import {
   AddCustomAttributes,
   AddCustomAttributesTarget,

src/targets/adminGetUser.test.ts

@@ -5,6 +5,7 @@ import * as TDB from "../__tests__/testDataBuilder";
 import { UserNotFoundError } from "../errors";
 import { UserPoolService } from "../services";
 import { AdminGetUser, AdminGetUserTarget } from "./adminGetUser";
+import { attributeValue } from "../services/userPoolService";
 
 describe("AdminGetUser target", () => {
   let adminGetUser: AdminGetUserTarget;
@@ -32,7 +33,7 @@ describe("AdminGetUser target", () => {
       UserAttributes: existingUser.Attributes,
       UserCreateDate: new Date(existingUser.UserCreateDate),
       UserLastModifiedDate: new Date(existingUser.UserLastModifiedDate),
-      Username: existingUser.Username,
+      Username: attributeValue("sub", existingUser.Attributes),
       UserStatus: existingUser.UserStatus,
     });
   });

src/targets/adminGetUser.ts

@@ -5,6 +5,7 @@ import {
 import { UserNotFoundError } from "../errors";
 import { Services } from "../services";
 import { Target } from "./Target";
+import { attributeValue } from "../services/userPoolService";
 
 export type AdminGetUserTarget = Target<
   AdminGetUserRequest,
@@ -30,7 +31,7 @@ export const AdminGetUser =
       UserCreateDate: user.UserCreateDate,
       UserLastModifiedDate: user.UserLastModifiedDate,
       UserMFASettingList: undefined,
-      Username: user.Username,
+      Username: attributeValue("sub", user.Attributes)!,
       UserStatus: user.UserStatus,
     };
   };

src/targets/getUser.test.ts

@@ -36,7 +36,7 @@ describe("GetUser target", () => {
           auth_time: new Date(),
           jti: uuid.v4(),
           client_id: "test",
-          username: user.Username,
+          username: attributeValue("sub", user.Attributes),
         },
         PrivateKey.pem,
         {
@@ -51,7 +51,7 @@ describe("GetUser target", () => {
     expect(output).toBeDefined();
     expect(output).toEqual({
       UserAttributes: user.Attributes,
-      Username: user.Username,
+      Username: attributeValue("sub", user.Attributes),
     });
   });
 

src/targets/getUser.ts

@@ -7,6 +7,7 @@ import { InvalidParameterError, UserNotFoundError } from "../errors";
 import { Services } from "../services";
 import { Token } from "../services/tokenGenerator";
 import { Target } from "./Target";
+import { attributeValue } from "../services/userPoolService";
 
 export type GetUserTarget = Target<GetUserRequest, GetUserResponse>;
 
@@ -33,6 +34,6 @@ export const GetUser =
       PreferredMfaSetting: user.PreferredMfaSetting,
       UserAttributes: user.Attributes,
       UserMFASettingList: user.UserMFASettingList,
-      Username: user.Username,
+      Username: attributeValue("sub", user.Attributes)!,
     };
   };