update root and ui-auth service

Enterprise-CMCS · Jan 11, 2024 · a61a803 · a61a803
1 parent a900abe
commit a61a803
Show file tree

Hide file tree

Showing 6 changed files with 684 additions and 637 deletions.
diff --git a/package.json b/package.json
@@ -32,7 +32,6 @@
     "@types/yargs": "^15.0.10",
     "@typescript-eslint/eslint-plugin": "5.18.0",
     "@typescript-eslint/parser": "5.18.0",
-    "aws-sdk": "^2.1310.0",
     "dotenv": "^8.2.0",
     "eslint": "^8.33.0",
     "eslint-config-airbnb": "^19.0.4",
@@ -56,7 +55,7 @@
     "serverless-plugin-warmup": "^8.2.1",
     "serverless-s3-bucket-helper": "github:Enterprise-CMCS/serverless-s3-bucket-helper#master",
     "serverless-s3-sync": "2.0.0",
-    "serverless-stack-termination-protection": "^1.0.4",
+    "serverless-stack-termination-protection": "^2.0.2",
     "typescript": "^4.6.3",
     "util": "^0.12.4",
     "yargs": "^16.1.1"

diff --git a/services/ui-auth/handlers/createUsers.js b/services/ui-auth/handlers/createUsers.js
@@ -22,11 +22,26 @@ async function myHandler(_event, _context, _callback) {
       UserAttributes: users[i].attributes,
     };
 
-    await cognitolib.createUser(poolData);
-    //userCreate must set a temp password first, calling setPassword to set the password configured in SSM for consistent dev login
-    await cognitolib.setPassword(passwordData);
-    //if user exists and attributes are updated in this file updateUserAttributes is needed to update the attributes
-    await cognitolib.updateUserAttributes(attributeData);
+    try {
+      // This may error if the user already exists
+      await cognitolib.createUser(poolData);
+    } catch {
+      /* swallow this exception and continue */
+    }
+
+    try {
+      //userCreate must set a temp password first, calling setPassword to set the password configured in SSM for consistent dev login
+      await cognitolib.setPassword(passwordData);
+    } catch {
+      /* swallow this exception and continue */
+    }
+
+    try {
+      //if user exists and attributes are updated in this file updateUserAttributes is needed to update the attributes
+      await cognitolib.updateUserAttributes(attributeData);
+    } catch {
+      /* swallow this exception and continue */
+    }
   }
 }
 

diff --git a/services/ui-auth/libs/cognito-lib.js b/services/ui-auth/libs/cognito-lib.js
@@ -1,57 +1,29 @@
-var {
-  CognitoIdentityProvider: CognitoIdentityServiceProvider,
-} = require("@aws-sdk/client-cognito-identity-provider");
-const COGNITO_CLIENT = new CognitoIdentityServiceProvider({
+import {
+  CognitoIdentityProviderClient,
+  AdminCreateUserCommand,
+  AdminSetUserPasswordCommand,
+  AdminUpdateUserAttributesCommand,
+} from "@aws-sdk/client-cognito-identity-provider";
+
+const COGNITO_CLIENT = new CognitoIdentityProviderClient({
   apiVersion: "2016-04-19",
   region: "us-east-1",
+  logger: {
+    debug: console.debug, // eslint-disable-line no-console
+    info: console.info, // eslint-disable-line no-console
+    warn: console.warn, // eslint-disable-line no-console
+    error: console.error, // eslint-disable-line no-console
+  },
 });
 
 export async function createUser(params) {
-  await new Promise((resolve, _reject) => {
-    COGNITO_CLIENT.adminCreateUser(params, function (err, _data) {
-      var response;
-      if (err) {
-        console.log("FAILED ", err, err.stack); // eslint-disable-line no-console
-        response = { statusCode: 500, body: { message: "FAILED", error: err } };
-        resolve(response); //if user already exists, we still continue and ignore
-      } else {
-        response = { statusCode: 200, body: { message: "SUCCESS" } };
-        resolve(response);
-      }
-    });
-  });
+  await COGNITO_CLIENT.send(new AdminCreateUserCommand(params));
 }
 
 export async function setPassword(params) {
-  await new Promise((resolve, reject) => {
-    COGNITO_CLIENT.adminSetUserPassword(params, function (err, _data) {
-      if (err) {
-        console.log("FAILED to update password", err, err.stack); // eslint-disable-line no-console
-        var response = {
-          statusCode: 500,
-          body: { message: "FAILED", error: err },
-        };
-        reject(response);
-      } else {
-        resolve();
-      }
-    });
-  });
+  await COGNITO_CLIENT.send(new AdminSetUserPasswordCommand(params));
 }
 
 export async function updateUserAttributes(params) {
-  await new Promise((resolve, reject) => {
-    COGNITO_CLIENT.adminUpdateUserAttributes(params, function (err, _data) {
-      if (err) {
-        console.log("FAILED to update user attributes", err, err.stack); // eslint-disable-line no-console
-        var response = {
-          statusCode: 500,
-          body: { message: "FAILED", error: err },
-        };
-        reject(response);
-      } else {
-        resolve();
-      }
-    });
-  });
+  await COGNITO_CLIENT.send(new AdminUpdateUserAttributesCommand(params));
 }
diff --git a/services/ui-auth/package.json b/services/ui-auth/package.json
@@ -9,9 +9,7 @@
   "author": "",
   "license": "CC0-1.0",
   "dependencies": {
-    "@aws-sdk/client-cognito-identity-provider": "3.362.0",
-    "@aws-sdk/client-sts": "3.362.0",
-    "fast-xml-parser": "^4.2.5"
+    "@aws-sdk/client-cognito-identity-provider": "^3.485.0"
   },
   "devDependencies": {
     "serverless-plugin-common-excludes": "^4.0.0",