feat: adds user fields to login migration flow (#8)

Author: omar-sr88

examples/javascript/src/lib/jane-service.mjs

@@ -104,6 +104,7 @@ const verifyCredentials = async (data, token) => {
   const result = {
     valid: false,
     errorMessage: '',
+    user: response.body?.user
   }
 
   switch (response.statusCode) {

examples/javascript/src/lib/jane-service.spec.mjs

@@ -158,29 +158,48 @@ describe('jane service', () => {
   describe('#verifyCredentials', () => {
     test('returns valid when the status code is 200', async () => {
       jest.spyOn(apiService, 'post').mockImplementationOnce(() => {
-        return new Promise((resolve) => resolve({ statusCode: 200 }))
+        return new Promise((resolve) =>
+          resolve({
+            statusCode: 200,
+            body: {
+              user: {
+               
+                email: "[email protected]",
+                nickname: "omar816",
+                phone: "1112224444",
+                first_name: "Omar",
+                last_name: "Scher",
+                name: "Omar Scher",
+                birth_date: "",
+                created_at: "2022-06-28T16:28:21.412Z",
+              },
+            },
+          })
+        );
       })
 
-      const { valid } = await Jane.verifyCredentials({
+      const { valid, user } = await Jane.verifyCredentials({
         email: '[email protected]',
         password: 'password',
       })
 
       expect(valid).toBe(true)
+      expect(user).toBeDefined()
     })
 
     test('returns invalid with an error message when the status code is 401', async () => {
       jest.spyOn(apiService, 'post').mockImplementationOnce(() => {
         return new Promise((resolve) => resolve({ statusCode: 401 }))
       })
 
-      const { valid, errorMessage } = await Jane.verifyCredentials({
+      const { valid, errorMessage, user } = await Jane.verifyCredentials({
         email: '[email protected]',
         password: 'password',
       })
 
       expect(valid).toBe(false)
       expect(errorMessage).toBe('Invalid password')
+      expect(user).not.toBeDefined();
     })
 
     test('returns invalid with an error message when the status code not 200, 401 or 404', async () => {
@@ -193,7 +212,7 @@ describe('jane service', () => {
         )
       })
 
-      const { valid, errorMessage } = await Jane.verifyCredentials({
+      const { valid, errorMessage, user } = await Jane.verifyCredentials({
         email: '[email protected]',
         password: 'password',
       })
@@ -202,6 +221,7 @@ describe('jane service', () => {
       expect(errorMessage).toBe(
         'Error verifying user {"status":500,"message":"Something went wrong"}'
       )
+      expect(user).not.toBeDefined();
     })
   })
 

examples/javascript/src/migration-lambda/index.mjs

@@ -1,31 +1,50 @@
-import Jane from '../lib/jane-service.mjs';
-import apiService from '../lib/api-service.mjs';
+import Jane from "../lib/jane-service.mjs";
+import apiService from "../lib/api-service.mjs";
 
-const AUTH_TRIGGER = 'UserMigration_Authentication';
-const FORGOT_PASSWORD_TRIGGER = 'UserMigration_ForgotPassword';
-const EMAIL_VERIFIED = 'true';
-const CONFIRMED_STATUS = 'CONFIRMED';
-const SUPPRESS_ACTION = 'SUPPRESS';
+const AUTH_TRIGGER = "UserMigration_Authentication";
+const FORGOT_PASSWORD_TRIGGER = "UserMigration_ForgotPassword";
+const EMAIL_VERIFIED = "true";
+const CONFIRMED_STATUS = "CONFIRMED";
+const SUPPRESS_ACTION = "SUPPRESS";
 
 const authHandler = async (event, token) => {
-  const userExists = await Jane.userExists({
-    email: event.userName,
-    app_client_id: event.callerContext.clientId,
-  }, token);
+  const userExists = await Jane.userExists(
+    {
+      email: event.userName,
+      app_client_id: event.callerContext.clientId,
+    },
+    token
+  );
 
   if (!userExists) {
-    throw new Error('User not found');
+    throw new Error("User not found");
   }
 
-  const { valid, errorMessage } = await Jane.verifyCredentials({
-    email: event.userName,
-    password: event.request.password,
-  }, token);
+  const { valid, errorMessage, user } = await Jane.verifyCredentials(
+    {
+      email: event.userName,
+      password: event.request.password,
+      user: response.body?.user,
+    },
+    token
+  );
+
+  const attributes = {};
+
+  if (user) {
+    const { first_name, last_name, phone, birth_date } = user;
+
+    first_name && (attributes.given_name = first_name);
+    last_name && (attributes.family_name = last_name);
+    phone && (attributes.phone_number = addAreaCodeToPhone(phone));
+    birth_date && (attributes.birthdate = birth_date);
+  }
 
   if (valid) {
     event.response.userAttributes = {
       email: event.userName,
       email_verified: EMAIL_VERIFIED,
+      ...attributes,
     };
     event.response.finalUserStatus = CONFIRMED_STATUS;
     event.response.messageAction = SUPPRESS_ACTION;
@@ -37,10 +56,13 @@ const authHandler = async (event, token) => {
 };
 
 const forgotPasswordHandler = async (event, token) => {
-  const { valid, errorMessage } = await Jane.userCanResetPassword({
-    email: event.userName,
-    app_client_id: event.callerContext.clientId,
-  }, token);
+  const { valid, errorMessage } = await Jane.userCanResetPassword(
+    {
+      email: event.userName,
+      app_client_id: event.callerContext.clientId,
+    },
+    token
+  );
 
   if (!valid) {
     throw new Error(errorMessage);
@@ -62,7 +84,7 @@ export const handler = async (event) => {
     ...event,
     request: {
       ...event.request,
-      password: 'REDACTED',
+      password: "REDACTED",
     },
   };
   console.log(sanitizedEvent);
@@ -75,3 +97,15 @@ export const handler = async (event) => {
 
   return event;
 };
+
+const addAreaCodeToPhone = (phone) => {
+  let partial = phone.startsWith("+") ? phone.substring(1) : phone;
+
+  // Missing + and country code, 2223334444
+  if (phone.length === 10) {
+    return `+1${partial}`;
+  }
+
+  // If was already correct, just return the +
+  return `+${partial}`;
+};