Revert "feat(cognito): verify SSO users and migrate"

This reverts commit 1b2e606, 96e30ad, 921b001, 0693cd5, 9afaa9a

Author: samueljamesbliss

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

@@ -35,14 +35,6 @@ const makeRequest = async (options) => {
 
   const url = new URL(options.path, apiUrl);
 
-  console.log("@@url: ", url)
-  console.log("@@request: ", {
-    url: url.toString(),
-    method: options.method || 'get',
-    headers: {...headers, 'Authorization': `Bearer ${options.token}`},
-    data: options.body
-  })
-
   try {
     const response = await request({
       validateStatus: validStatus,

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

@@ -124,46 +124,6 @@ const verifyCredentials = async (data, token) => {
   return result
 }
 
-/** ----- GET SSO USER ATTRIBUTES ----- */
-
-const verifySSOUser = async (data, token) => {
-  console.log("token: ", token)
-  console.log("data: ", data)
-  const parsedData = {
-    ...data,
-    user_attributes: {
-    ...data.user_attributes,
-      identities: JSON.parse(data.user_attributes.identities)
-     }
- }
-  const response = await apiService.post(
-    `${COGNITO_API}/verify_sso_user`,
-    parsedData,
-    token
-  )
-
-  console.log("response: ", response)
-  const result = {
-    errorMessage: "",
-    user: response.body?.user,
-  }
-
-  switch (response.statusCode) {
-    case 200:
-      break
-    case 404:
-      result.errorMessage = "User not found"
-      break
-    default:
-      result.errorMessage = buildErrorMessage(
-        "Error verifying SSO user",
-        response
-      )
-  }
-
-  return result
-}
-
 /** ----- VALIDATE USER ----- */
 
 
@@ -211,6 +171,5 @@ export default {
   userExists,
   ensureExternalUserExists,
   verifyCredentials,
-  verifySSOUser,
   validateUser
 }

examples/javascript/src/lib/utils.mjs

@@ -44,15 +44,3 @@ export const mapUserAttributes = (userAttributes) => {
 
   return userData
 }
-
-export 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}`
-}

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

@@ -1,4 +1,3 @@
-import { addAreaCodeToPhone } from '../lib/utils.mjs';
 import Jane from "../lib/jane-service.mjs";
 import apiService from "../lib/api-service.mjs";
 
@@ -97,3 +96,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}`;
+};

examples/javascript/src/post-confirmation-lambda/index.mjs

@@ -1,10 +1,6 @@
-import { addAreaCodeToPhone, mapUserAttributes } from "../lib/utils.mjs"
-import Jane from "../lib/jane-service.mjs"
-import apiService from "../lib/api-service.mjs"
-import {
-  AdminUpdateUserAttributesCommand,
-  CognitoIdentityProviderClient,
-} from "@aws-sdk/client-cognito-identity-provider"
+import { mapUserAttributes } from '../lib/utils.mjs';
+import Jane from '../lib/jane-service.mjs';
+import apiService from '../lib/api-service.mjs';
 
 /**
  * Possible trigger sources:
@@ -29,8 +25,6 @@ export const handler = async (event) => {
     );
     return event;
   }
-  
-  event = await handleUserMigration(event, token);
 
   const { success, errorMessage } = await Jane.createUser({
     pool_id: event.userPoolId,
@@ -47,85 +41,3 @@ export const handler = async (event) => {
 
   return event;
 };
-/* Cognito SSO flows do not go through our migration handler
-  instead we handle those migrations here, after signup.
-  If a user is signing up via sso, we check for a Jane SSO user
-  associated with this client and use that users data for the migration */
-  const handleUserMigration = async (event, token) => {
-    let userIdentities;
-    try {
-      userIdentities = JSON.parse(event.request.userAttributes.identities);
-    } catch (err) {
-      console.error("userIdentities unable to parse", err);
-      return event;
-    }
-
-    const userGoogleIdentity = userIdentities.find(
-      (i) => i.providerType === "Google"
-    );
-    if (!userGoogleIdentity) {
-      return event;
-    }
-
-    const { errorMessage, user } = await Jane.verifySSOUser({
-      email: event.request.userAttributes.email,
-      user_attributes: event.request.userAttributes,
-      app_client_id: event.callerContext.clientId,
-    }, token);
-    if (errorMessage === "User not found") {
-      // Jane user for this client was not found, continue normal sign up
-      return event;
-    } else if (errorMessage || !user) {
-      // something went wrong, continue normal sign up and log error
-      console.error(`failed to retrieve data for migration: ${errorMessage}`);
-      return event;
-    }
-    const attributes = {};
-    const { first_name, last_name, phone, birth_date } = user;
-
-    const attributesToUpdate = [];
-    first_name &&
-      (attributes.given_name = first_name) &&
-      attributesToUpdate.push({
-        Name: "given_name",
-        Value: first_name,
-      });
-    last_name &&
-      (attributes.family_name = last_name) &&
-      attributesToUpdate.push({
-        Name: "family_name",
-        Value: last_name,
-      });
-    phone &&
-      (attributes.phone_number = addAreaCodeToPhone(phone)) &&
-      attributesToUpdate.push({
-        Name: "phone_number",
-        Value: addAreaCodeToPhone(phone),
-      });
-    birth_date &&
-      (attributes.birthdate = birth_date) &&
-      attributesToUpdate.push({
-        Name: "birthdate",
-        Value: birth_date,
-      });
-    const cognitoIdServiceProvider = new CognitoIdentityProviderClient({
-      region: "us-east-1",
-    });
-    const command = new AdminUpdateUserAttributesCommand({
-      UserAttributes: attributesToUpdate,
-      UserPoolId: event.userPoolId,
-      Username: event.userName,
-    });
-    await cognitoIdServiceProvider
-      .send(command)
-      .then((data) => console.log("Cognito user updated!", data))
-      .catch((err) => {
-        console.error("Cognito Attribute Update Unsuccessful", err);
-      });
-
-    event.request.userAttributes = {
-      ...event.request.userAttributes,
-      ...attributes,
-    };
-    return event;
-  };

examples/javascript/src/pre-signup-lambda/index.mjs

@@ -60,20 +60,6 @@ export const handler = async (event) => {
     }
 
     if (userExists) {
-      // Caveat, flow is "wrong" because SSO is sinup/sign in is the same thing, so it calls signup when
-      // we actually want is signin
-
-      // Eg:
-      // Here we should check event.triggerSource === 'PreSignUp_ExternalProvider'
-      //  User should be confirmed (just like a migration)
-      //  No message to user since it already had an account before (just like a migration)
-      //  And move flow along to Post-Confirmation, where it can finish the migration
-      if (event.triggerSource === 'PreSignUp_ExternalProvider') {
-        event.response.autoConfirmUser = true
-        event.response.autoVerifyEmail = true
-
-        return event
-      }
       throw Error('User already exists, please log in')
     }