Consolidate login code on Vue side to one location

Author: Austin Johnson

build/Makefile

@@ -37,16 +37,8 @@ upload-templates: $(TEMPLATES) | $(OUT)
 	aws s3 sync --acl public-read --exclude "*" --include "*.yaml" \
 		"$(TEMPLATES_DIR)" "s3://$(BOOTSTRAP_BUCKET_PATH)/templates/" \
 		| tee "$(OUT)/$(@)"
-	aws s3 cp "$(TEMPLATES_DIR)"/layers.zip \
-		"s3://${BOOTSTRAP_BUCKET_PATH}/layers.zip"
 	@echo "[INFO] master template: https://s3.amazonaws.com/$(BOOTSTRAP_BUCKET_PATH)/templates/master.yaml"
 
-LAMBDA_LAYER_ZIP := $(TEMPLATES_DIR)/layers.zip
-
-upload-layers:
-	@echo "[INFO] Uploading lambda layer"
-	aws s3 cp --acl public-read "$(LAMBDA_LAYER_ZIP)" "s3://${BOOTSTRAP_BUCKET_PATH}/layers.zip"
-
 # cfn custom resource lambda files are found under this directory
 CUSTOM_RESOURCES_DIR := $(TEMPLATES_DIR)/custom-resources
 

lex-web-ui/src/lex-web-ui.js

@@ -18,8 +18,6 @@ License for the specific language governing permissions and limitations under th
  * Exports Loader as the plugin constructor
  * and Store as store that can be used with Vuex.Store()
  */
-import { fromCognitoIdentityPool } from '@aws-sdk/credential-providers';
-import { CognitoIdentityClient, GetIdCommand, GetCredentialsForIdentityCommand } from '@aws-sdk/client-cognito-identity';
 import { LexRuntimeServiceClient } from '@aws-sdk/client-lex-runtime-service';
 import { LexRuntimeV2Client } from '@aws-sdk/client-lex-runtime-v2';
 import { PollyClient } from '@aws-sdk/client-polly';
@@ -161,7 +159,8 @@ export class Loader {
     const mergedConfig = mergeConfig(defaultConfig, config);
     let credentials;
     if (mergedConfig.cognito.poolId != '' || localStorage.getItem('poolId')) {
-      credentials = this.getCredentials(mergedConfig).then((creds) => {
+      credentials = this.store.dispatch('getCredentials', mergeConfig).then((creds) => {
+      //credentials = this.getCredentials(mergedConfig).then((creds) => {
         return creds;
       });
     }
@@ -185,56 +184,6 @@ export class Loader {
     });
     this.app = app;
   }
-
-  async getCredentials(context) {
-    const region = context.region || context.cognito.poolId.split(':')[0] || 'us-east-1';
-    const poolId = context.cognito.poolId || localStorage.getItem('poolId');
-    const appUserPoolName = context.cognito.appUserPoolName || localStorage.getItem('appUserPoolName');
-    const poolName = `cognito-idp.${region}.amazonaws.com/${appUserPoolName}`;
-    const appUserPoolClientId = context.cognito.appUserPoolClientId || localStorage.getItem('appUserPoolClientId')
-    const idtoken = localStorage.getItem(`${appUserPoolClientId}idtokenjwt`);
-    let logins;
-    if (idtoken) {
-      logins = {};
-      logins[poolName] = idtoken;
-      const client = new CognitoIdentityClient({ region });
-      const getIdentityId = new GetIdCommand({
-        IdentityPoolId: poolId,
-        Logins: logins ? logins : {}
-      })
-      let identityId, getCreds;
-      
-      try {
-        await client.send(getIdentityId)
-          .then((res) => {
-            identityId = res.IdentityId;
-            getCreds = new GetCredentialsForIdentityCommand({
-              IdentityId: identityId,
-              Logins: logins ? logins : {}
-            })
-          })
-        const res = await client.send(getCreds);
-        const creds = res.Credentials;
-        const credentials = {
-          accessKeyId: creds.AccessKeyId,
-          identityId,
-          secretAccessKey: creds.SecretKey,
-          sessionToken: creds.SessionToken,
-          expiration: creds.Expiration,
-        };
-        return credentials;
-      } catch (err) {
-        console.log(err)
-      }
-    } else {
-      const credentialProvider = fromCognitoIdentityPool({
-        identityPoolId: poolId,
-        clientConfig: { region },
-      })
-      const credentials = credentialProvider()
-      return credentials
-    }   
-  }
 }
 
 // comment out for prod build

src/lex-web-ui-loader/js/defaults/dependencies.js

@@ -24,11 +24,6 @@ export const dependenciesFullPage = {
       name: 'Loader',
       url: './initiate-loader.js',
     },
-    {
-      name: 'AWS',
-      url: './aws-sdk-2.903.0.js',
-      canUseMin: true,
-    },
     {
       name: 'Vue',
       url: './3.3.10_dist_vue.global.prod.js',
@@ -79,4 +74,5 @@ export const dependenciesIframe = {
       url: './lex-web-ui-loader.css',
     },
   ],
+  script: []
 };