feat: Auth refactor to use cdk, eliminate EJS, overrides functionality (

aws-amplify#8355) * feat: add auth override * fix: auth state unit tests working * feat: auth e2e fixes and migration e2e included * fix: fixes package name * fix: unit tests fix * fix: unit tests * fix: fixing overwritten files * fix: added vm2 and addressed comments * fix: minor fixes and e2e test for overrides * fix: cli-core unit test * fix: userPool group unit test * fix: minor refractor and comments * chore: lgtm warnings * fix: minor fixes * fix: unit tests
jhockett · Nov 3, 2021 · b38a127 · b38a127
1 parent 3a7dfe9
commit b38a127
Show file tree

Hide file tree

Showing 136 changed files with 8,877 additions and 2,665 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -324,6 +324,7 @@ module.exports = {
     '/packages/amplify-provider-awscloudformation/lib',
     '/packages/amplify-console-integration-tests/lib',
     '/packages/amplify-cli-overrides-helper/lib',
+    '/packages/amplify-category-auth/resources/auth-custom-resource',
 
     // Ignore CHANGELOG.md files
     '/packages/*/CHANGELOG.md',

diff --git a/packages/amplify-category-auth/CHANGELOG.md b/packages/amplify-category-auth/CHANGELOG.md
diff --git a/packages/amplify-category-auth/Readme.md b/packages/amplify-category-auth/Readme.md
@@ -4,8 +4,8 @@
 
 The current set of commands supported by the Amplify Auth Category Plugin
 
-| Command              | Description |
-| --- | --- |
-| amplify auth add | Takes you through steps in the CLI to add an Auth resource to your backend.   |
-| amplify auth push | Provisions only Auth cloud resources with the latest local developments.  |
+| Command             | Description                                                                                                     |
+| ------------------- | --------------------------------------------------------------------------------------------------------------- |
+| amplify auth add    | Takes you through steps in the CLI to add an Auth resource to your backend.                                     |
+| amplify auth push   | Provisions only Auth cloud resources with the latest local developments.                                        |
 | amplify auth remove | Removes Auth resource from your local backend. The resource is removed from the cloud on the next push command. |
diff --git a/packages/amplify-category-auth/amplify-plugin.json b/packages/amplify-category-auth/amplify-plugin.json
@@ -1,6 +1,6 @@
 {
   "name": "auth",
   "type": "category",
-  "commands": ["add", "console", "enable", "import", "push", "remove", "update", "help"],
+  "commands": ["add", "console", "enable", "import", "push", "remove", "update", "help", "override"],
   "eventHandlers": []
 }
diff --git a/packages/amplify-category-auth/package.json b/packages/amplify-category-auth/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "amplify-category-auth",
-  "version": "2.38.4",
+  "name": "@aws-amplify/amplify-category-auth",
+  "version": "1.0.0",
   "description": "amplify-cli authentication plugin",
   "repository": {
     "type": "git",
@@ -20,7 +20,8 @@
     "watch": "tsc -w",
     "clean": "rimraf lib tsconfig.tsbuildinfo",
     "test": "jest",
-    "test-watch": "jest --watch"
+    "test-watch": "jest --watch",
+    "generateSchemas": "ts-node ./scripts/generateAuthSchemas.ts"
   },
   "dependencies": {
     "amplify-cli-core": "1.31.1",
@@ -38,7 +39,8 @@
     "mime-types": "^2.1.26",
     "ora": "^4.0.3",
     "promise-sequential": "^1.1.1",
-    "uuid": "^3.4.0"
+    "uuid": "^3.4.0",
+    "vm2": "^3.9.3"
   },
   "devDependencies": {
     "rimraf": "^3.0.2"

diff --git a/...der-utils/awscloudformation/triggers/CreateAuthChallenge/function-template-dir/event.json b/...der-utils/awscloudformation/triggers/CreateAuthChallenge/function-template-dir/event.json
@@ -1,5 +1,5 @@
 {
-    "key1": "value1",
-    "key2": "value2",
-    "key3": "value3"
-}
+  "key1": "value1",
+  "key2": "value2",
+  "key3": "value3"
+}
diff --git a/...egory-auth/provider-utils/awscloudformation/triggers/CustomMessage/CustomMessage.map.json b/...egory-auth/provider-utils/awscloudformation/triggers/CustomMessage/CustomMessage.map.json
@@ -11,7 +11,7 @@
         "key": "REDIRECTURL",
         "value": "askUser",
         "question": {
-          "name" : "REDIRECTURL",
+          "name": "REDIRECTURL",
           "type": "input",
           "message": "Enter the URL that your users will be redirected to upon account confirmation:"
         }
@@ -20,7 +20,7 @@
         "key": "EMAILSUBJECT",
         "value": "askUser",
         "question": {
-          "name" : "EMAILSUBJECT",
+          "name": "EMAILSUBJECT",
           "type": "input",
           "message": "Enter the subject for your custom account confirmation email:"
         }
@@ -29,7 +29,7 @@
         "key": "EMAILMESSAGE",
         "value": "askUser",
         "question": {
-          "name" : "EMAILMESSAGE",
+          "name": "EMAILMESSAGE",
           "type": "input",
           "message": "Enter the body text for your custom account confirmation email (this will appear before the link URL):"
         }

diff --git a/...y-category-auth/provider-utils/awscloudformation/triggers/CustomMessage/assets/index.html b/...y-category-auth/provider-utils/awscloudformation/triggers/CustomMessage/assets/index.html
@@ -1,12 +1,10 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="UTF-8">
+    <meta charset="UTF-8" />
     <title>AWS SDK for JavaScript - Browser Getting Started Application</title>
-    <link rel="stylesheet" type="text/css" href="style.css">
-
+    <link rel="stylesheet" type="text/css" href="style.css" />
   </head>
-
 
   <body>
     <div>
@@ -16,9 +14,9 @@
     <script src="./spinner.js" type="text/javascript"></script>
     <script src="./verify.js" type="text/javascript"></script>
     <script type="text/javascript">
-        window.onload = function() {
-            confirm();
-        };
+      window.onload = function () {
+        confirm();
+      };
     </script>
   </body>
 </html>
diff --git a/...y-category-auth/provider-utils/awscloudformation/triggers/CustomMessage/assets/spinner.js b/...y-category-auth/provider-utils/awscloudformation/triggers/CustomMessage/assets/spinner.js
@@ -1,10 +1,10 @@
 /* eslint-disable */
 var __assign =
   (this && this.__assign) ||
-  function() {
+  function () {
     __assign =
       Object.assign ||
-      function(t) {
+      function (t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
           s = arguments[i];
           for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
@@ -33,7 +33,7 @@ var defaults = {
   shadow: '0 0 1px transparent',
   position: 'absolute',
 };
-var Spinner = /** @class */ (function() {
+var Spinner = /** @class */ (function () {
   function Spinner(opts) {
     if (opts === void 0) {
       opts = {};
@@ -45,7 +45,7 @@ var Spinner = /** @class */ (function() {
    * spinning, it is automatically removed from its previous target by calling
    * stop() internally.
    */
-  Spinner.prototype.spin = function(target) {
+  Spinner.prototype.spin = function (target) {
     this.stop();
     this.el = document.createElement('div');
     this.el.className = this.opts.className;
@@ -68,7 +68,7 @@ var Spinner = /** @class */ (function() {
    * Stops and removes the Spinner.
    * Stopped spinners may be reused by calling spin() again.
    */
-  Spinner.prototype.stop = function() {
+  Spinner.prototype.stop = function () {
     if (this.el) {
       if (typeof requestAnimationFrame !== 'undefined') {
         cancelAnimationFrame(this.animateId);

diff --git a/...fy-category-auth/provider-utils/awscloudformation/triggers/CustomMessage/assets/style.css b/...fy-category-auth/provider-utils/awscloudformation/triggers/CustomMessage/assets/style.css
@@ -1,24 +1,28 @@
 @keyframes spinner-line-fade-more {
-  0%, 100% {
+  0%,
+  100% {
     opacity: 0; /* minimum opacity */
   }
   1% {
     opacity: 1;
   }
 }
 @keyframes spinner-line-fade-quick {
-  0%, 39%, 100% {
+  0%,
+  39%,
+  100% {
     opacity: 0.25; /* minimum opacity */
   }
   40% {
     opacity: 1;
   }
 }
 @keyframes spinner-line-fade-default {
-  0%, 100% {
+  0%,
+  100% {
     opacity: 0.22; /* minimum opacity */
   }
   1% {
     opacity: 1;
   }
-}
+}
diff --git a/...fy-category-auth/provider-utils/awscloudformation/triggers/CustomMessage/assets/verify.js b/...fy-category-auth/provider-utils/awscloudformation/triggers/CustomMessage/assets/verify.js
@@ -41,7 +41,7 @@ function confirm() {
 
   var cognitoidentityserviceprovider = new AWS.CognitoIdentityServiceProvider();
 
-  cognitoidentityserviceprovider.confirmSignUp(params, function(err, data) {
+  cognitoidentityserviceprovider.confirmSignUp(params, function (err, data) {
     if (err) {
       if (err.message === 'User cannot be confirm. Current status is CONFIRMED') {
         window.location.replace(redirectUrl);

diff --git a/.../provider-utils/awscloudformation/triggers/CustomMessage/function-template-dir/event.json b/.../provider-utils/awscloudformation/triggers/CustomMessage/function-template-dir/event.json
@@ -1,12 +1,12 @@
 {
-    "region": "us-west-2",
-    "callerContext": {
+  "region": "us-west-2",
+  "callerContext": {
     "clientId": "dummyId"
-    },
-    "userName": "testUser",
-    "triggerSource": "CustomMessage_SignUp",
-    "request": {
+  },
+  "userName": "testUser",
+  "triggerSource": "CustomMessage_SignUp",
+  "request": {
     "codeParameter": "0000"
-    },
-    "response": {}
-  }
+  },
+  "response": {}
+}
diff --git a/...rovider-utils/awscloudformation/triggers/DefineAuthChallenge/DefineAuthChallenge.map.json b/...rovider-utils/awscloudformation/triggers/DefineAuthChallenge/DefineAuthChallenge.map.json
@@ -7,4 +7,4 @@
     "name": "Custom Auth Challenge Scaffolding (Definition)",
     "description": "1 of 3 triggers needed to set-up the basic scaffolding for a custom authentication flow.  Please note that this scaffolding should be built out using your desired functionality before being used in production."
   }
-}
+}
diff --git a/...der-utils/awscloudformation/triggers/DefineAuthChallenge/function-template-dir/event.json b/...der-utils/awscloudformation/triggers/DefineAuthChallenge/function-template-dir/event.json
@@ -1,5 +1,5 @@
 {
-    "key1": "value1",
-    "key2": "value2",
-    "key3": "value3"
-}
+  "key1": "value1",
+  "key2": "value2",
+  "key3": "value3"
+}
diff --git a/.../provider-utils/awscloudformation/triggers/PostAuthentication/PostAuthentication.map.json b/.../provider-utils/awscloudformation/triggers/PostAuthentication/PostAuthentication.map.json
@@ -1,3 +1 @@
-{
-
-}
+{}
diff --git a/...ider-utils/awscloudformation/triggers/PostAuthentication/function-template-dir/event.json b/...ider-utils/awscloudformation/triggers/PostAuthentication/function-template-dir/event.json
@@ -1,5 +1,5 @@
 {
-    "key1": "value1",
-    "key2": "value2",
-    "key3": "value3"
-}
+  "key1": "value1",
+  "key2": "value2",
+  "key3": "value3"
+}
diff --git a/...auth/provider-utils/awscloudformation/triggers/PostConfirmation/PostConfirmation.map.json b/...auth/provider-utils/awscloudformation/triggers/PostConfirmation/PostConfirmation.map.json
@@ -19,11 +19,11 @@
         "key": "GROUP",
         "value": "askUser",
         "question": {
-          "name" : "GROUP",
+          "name": "GROUP",
           "type": "input",
           "message": "Enter the name of the group to which users will be added."
         }
       }
     ]
   }
-}
+}
diff --git a/...ovider-utils/awscloudformation/triggers/PostConfirmation/function-template-dir/event.json b/...ovider-utils/awscloudformation/triggers/PostConfirmation/function-template-dir/event.json
@@ -1,7 +1,7 @@
 {
-    "request": {
-        "userPoolId": "testID",
-        "userName": "testUser"
-    },
-    "response": {}
-}
+  "request": {
+    "userPoolId": "testID",
+    "userName": "testUser"
+  },
+  "response": {}
+}
diff --git a/...th/provider-utils/awscloudformation/triggers/PreAuthentication/PreAuthentication.map.json b/...th/provider-utils/awscloudformation/triggers/PreAuthentication/PreAuthentication.map.json
@@ -1,3 +1 @@
-{
-
-}
+{}
diff --git a/...auth/provider-utils/awscloudformation/triggers/PreSignup/function-template-dir/event.json b/...auth/provider-utils/awscloudformation/triggers/PreSignup/function-template-dir/event.json
@@ -1,8 +1,8 @@
 {
-    "request": {
-      "userAttributes": {
-        "email": "testEmail@domain.com"
-      }
-    },
-    "response": {}
-}
+  "request": {
+    "userAttributes": {
+      "email": "testEmail@domain.com"
+    }
+  },
+  "response": {}
+}
diff --git a/...scloudformation/triggers/VerifyAuthChallengeResponse/VerifyAuthChallengeResponse.map.json b/...scloudformation/triggers/VerifyAuthChallengeResponse/VerifyAuthChallengeResponse.map.json
@@ -8,7 +8,7 @@
         "value": "askUser",
         "private": true,
         "question": {
-          "name" : "RECAPTCHASECRET",
+          "name": "RECAPTCHASECRET",
           "type": "input",
           "message": "Enter the Google reCaptcha secret key:"
         }
@@ -19,4 +19,4 @@
     "name": "Custom Auth Challenge Scaffolding (Verification)",
     "description": "1 of 3 triggers needed to set-up the basic scaffolding for a custom authentication flow.  Please note that this scaffolding should be built out using your desired functionality before being used in production."
   }
-}
+}
diff --git a/...s/awscloudformation/triggers/VerifyAuthChallengeResponse/function-template-dir/event.json b/...s/awscloudformation/triggers/VerifyAuthChallengeResponse/function-template-dir/event.json
@@ -1,5 +1,5 @@
 {
-    "key1": "value1",
-    "key2": "value2",
-    "key3": "value3"
-}
+  "key1": "value1",
+  "key2": "value2",
+  "key3": "value3"
+}
diff --git a/packages/amplify-category-auth/provider-utils/awscloudformation/triggers/cognito.map.json b/packages/amplify-category-auth/provider-utils/awscloudformation/triggers/cognito.map.json
@@ -27,4 +27,4 @@
     "name": "Pre Token Generation"
   },
   "URL": "https://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-identity-pools-working-with-aws-lambda-triggers.html"
-}
+}
diff --git a/packages/amplify-category-auth/resources/adminAuth/admin-auth-app.js b/packages/amplify-category-auth/resources/adminAuth/admin-auth-app.js
@@ -44,7 +44,7 @@ app.use((req, res, next) => {
 // Only perform tasks if the user is in a specific group
 const allowedGroup = process.env.GROUP;
 
-const checkGroup = function(req, res, next) {
+const checkGroup = function (req, res, next) {
   if (req.path == '/signUserOut') {
     return next();
   }
@@ -264,10 +264,7 @@ app.post('/signUserOut', async (req, res, next) => {
 app.use((err, req, res, next) => {
   console.error(err.message);
   if (!err.statusCode) err.statusCode = 500; // If err has no specified error code, set error code to 'Internal Server Error (500)'
-  res
-    .status(err.statusCode)
-    .json({ message: err.message })
-    .end();
+  res.status(err.statusCode).json({ message: err.message }).end();
 });
 
 app.listen(3000, () => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ @@
         "name": "Custom Auth Challenge Scaffolding (Definition)",
         "description": "1 of 3 triggers needed to set-up the basic scaffolding for a custom authentication flow.  Please note that this scaffolding should be built out using your desired functionality before being used in production."
       }
-    }
+    }