From 7aeddf4740346f6e022b748559027de5bede6dd9 Mon Sep 17 00:00:00 2001
From: Kamil Sobol <sobkamil@amazon.com>
Date: Mon, 10 Jul 2023 12:23:26 -0700
Subject: [PATCH] chore: more changes

---
 .../auth-stack-transform.test.ts.snap         | 40 -------------------
 .../auth-cognito-stack-builder.ts             |  6 ++-
 .../auth-stack-transform.ts                   | 17 --------
 3 files changed, 4 insertions(+), 59 deletions(-)

diff --git a/packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/auth-stack-builder/__snapshots__/auth-stack-transform.test.ts.snap b/packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/auth-stack-builder/__snapshots__/auth-stack-transform.test.ts.snap
index 284bb96835..ff5f58a8ae 100644
--- a/packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/auth-stack-builder/__snapshots__/auth-stack-transform.test.ts.snap
+++ b/packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/auth-stack-builder/__snapshots__/auth-stack-transform.test.ts.snap
@@ -12,14 +12,6 @@ exports[`Check Auth Template Generated authstack template in default flow 1`] =
         "NONE",
       ],
     },
-    "ShouldOutputAppClientSecrets": {
-      "Fn::Equals": [
-        {
-          "Ref": "userpoolClientGenerateSecret",
-        },
-        true,
-      ],
-    },
   },
   "Description": "Amplify Cognito Stack for AWS Amplify CLI",
   "Outputs": {
@@ -35,15 +27,6 @@ exports[`Check Auth Template Generated authstack template in default flow 1`] =
         "Ref": "UserPoolClientWeb",
       },
     },
-    "AppClientSecret": {
-      "Condition": "ShouldOutputAppClientSecrets",
-      "Value": {
-        "Fn::GetAtt": [
-          "UserPoolClientInputs",
-          "appSecret",
-        ],
-      },
-    },
     "IdentityPoolId": {
       "Description": "Id for the identity pool",
       "Value": {
@@ -359,9 +342,6 @@ exports[`Check Auth Template Generated authstack template in default flow 1`] =
       "Type": "AWS::Cognito::UserPoolClient",
     },
     "UserPoolClientRole": {
-      "DependsOn": [
-        "UserPoolClient",
-      ],
       "Properties": {
         "AssumeRolePolicyDocument": {
           "Statement": [
@@ -445,14 +425,6 @@ exports[`Check Auth Template Generated authstack template in manual flow 1`] = `
         "NONE",
       ],
     },
-    "ShouldOutputAppClientSecrets": {
-      "Fn::Equals": [
-        {
-          "Ref": "userpoolClientGenerateSecret",
-        },
-        true,
-      ],
-    },
   },
   "Description": "Amplify Cognito Stack for AWS Amplify CLI",
   "Outputs": {
@@ -473,15 +445,6 @@ exports[`Check Auth Template Generated authstack template in manual flow 1`] = `
         "Ref": "UserPoolClientWeb",
       },
     },
-    "AppClientSecret": {
-      "Condition": "ShouldOutputAppClientSecrets",
-      "Value": {
-        "Fn::GetAtt": [
-          "UserPoolClientInputs",
-          "appSecret",
-        ],
-      },
-    },
     "AppleWebClient": {
       "Value": {
         "Ref": "appleAppId",
@@ -1702,9 +1665,6 @@ exports.handler = (event, context, callback) => {
       "Type": "AWS::Cognito::UserPoolClient",
     },
     "UserPoolClientRole": {
-      "DependsOn": [
-        "UserPoolClient",
-      ],
       "Properties": {
         "AssumeRolePolicyDocument": {
           "Statement": [
diff --git a/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.ts b/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.ts
index 7badf5b4fa..f0810446ae 100644
--- a/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.ts
+++ b/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-cognito-stack-builder.ts
@@ -587,7 +587,6 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
         ],
       },
     });
-    this.userPoolClientRole.addDependency(this.userPoolClient!);
   }
 
   /**
@@ -634,7 +633,10 @@ export class AmplifyAuthCognitoStack extends cdk.Stack implements AmplifyAuthCog
       runtime: 'nodejs16.x',
       timeout: 300,
     });
-    this.hostedUICustomResource.addDependency(this.userPoolClientRole!);
+
+    if (this.userPoolClientRole) {
+      this.hostedUICustomResource.addDependency(this.userPoolClientRole);
+    }
 
     // userPool client lambda policy
     /**
diff --git a/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-stack-transform.ts b/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-stack-transform.ts
index 05de42e931..50e9809b32 100644
--- a/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-stack-transform.ts
+++ b/packages/amplify-category-auth/src/provider-utils/awscloudformation/auth-stack-builder/auth-stack-transform.ts
@@ -399,14 +399,6 @@ export class AmplifyAuthTransform extends AmplifyCategoryTransform {
         'AppClientID',
       );
 
-      this._authTemplateObj.addCfnOutput(
-        {
-          value: cdk.Fn.getAtt('UserPoolClientInputs', 'appSecret').toString(),
-          condition: this._authTemplateObj.getCfnCondition('ShouldOutputAppClientSecrets'),
-        },
-        'AppClientSecret',
-      );
-
       if (!props.useEnabledMfas || configureSMS) {
         this._authTemplateObj.addCfnOutput(
           {
@@ -576,14 +568,5 @@ export class AmplifyAuthTransform extends AmplifyCategoryTransform {
       },
       'ShouldNotCreateEnvResources',
     );
-
-    if (props.authSelections !== 'identityPoolOnly') {
-      this._authTemplateObj.addCfnCondition(
-        {
-          expression: cdk.Fn.conditionEquals(cdk.Fn.ref('userpoolClientGenerateSecret'), true),
-        },
-        'ShouldOutputAppClientSecrets',
-      );
-    }
   };
 }