Fix/deploy fixes

.circleci/config.yml

@@ -8,14 +8,14 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - v1-dependencies-{{ checksum "package.json" }}
+            - v1-dependencies-{{ checksum "package-lock.json" }}
             # fallback to using the latest cache if no exact match is found
             - v1-dependencies-
       - run: npm i
       - save_cache:
           paths:
             - node_modules
-          key: v1-dependencies-{{ checksum "package.json" }}
+          key: v1-dependencies-{{ checksum "package-lock.json" }}
       - run: npm run test
       - persist_to_workspace:
           root: .
@@ -30,7 +30,7 @@ jobs:
           at: .
       - restore_cache:
           keys:
-            - npm-circleci-{{ checksum "package.lock" }}
+            - npm-circleci-{{ checksum "package-lock.json" }}
             - npm-circleci-
       - run:
           name: Install Serverless CLI and dependencies
@@ -41,8 +41,7 @@ jobs:
             - node_modules
       - run:
           name: Build and deploy lambda package
-          command: |
-            node .circlecli/bin/node_modules/serverless/bin/serverless deploy
+          command: npm run ci-deploy
 
 workflows:
   version: 2.1

.gitignore

@@ -36,3 +36,6 @@ jspm_packages
 # Optional REPL history
 .node_repl_history
 *.zip
+
+#Serverless
+.serverless

lib/auth0tools.js

@@ -1,8 +1,10 @@
-var auth0 = require('auth0');
+const auth0 = require('auth0');
 const ManagementClient = auth0.ManagementClient;
+const isurl = require('isurl');
 
 module.exports = {
   async addAuth0Url(credentials, url) {
+
     if (typeof credentials.Auth0ClientDomain === 'undefined') {
       throw new Error('Auth0ClientDomain is required in the credentials parameter');
     }
@@ -18,6 +20,15 @@ module.exports = {
     if (typeof url === 'undefined') {
       throw new Error('url is required');
     }
+
+    const protoRegex = /^((http|https):\/\/)/;
+    if (!protoRegex.test(url)) {
+      url = `https://${ url }`;
+    }
+    if (!isurl(new URL(url))) {
+      throw new Error(`${ url } is not a valid url`);
+    }
+
     const mgmt = new ManagementClient({
       domain: credentials.Auth0ClientDomain,
       clientId: credentials.Auth0MgmtApiClientId,
@@ -26,14 +37,18 @@ module.exports = {
     const client = await mgmt.getClient({
       client_id: credentials.Auth0ClientID,
     });
+    // Array <--> Set swapparoo to remove duplicates :tophat:
+    const callbacks = [...new Set(client.callbacks.concat([`${ url }/authenticated`]))];
+    const web_origins = [...new Set(client.web_origins.concat([url]))];
+    const allowed_logout_urls = [...new Set(client.allowed_logout_urls.concat([url]))];
     return mgmt.updateClient(
       {
         client_id: credentials.Auth0ClientID,
       },
       {
-        callbacks: client.callbacks.concat([`${ url }/authenticated`]),
-        web_origins: client.web_origins.concat([url]),
-        allowed_logout_urls: client.allowed_logout_urls.concat([url]),
+        callbacks,
+        web_origins,
+        allowed_logout_urls,
       },
     ).then(result => {
       return result;

lib/handler.js

@@ -1,9 +1,11 @@
-var secrets = require('./secrets');
 // Known bug with rewire. Need to cast as var 
-var  auth0tools = require('./auth0tools');
+// eslint-disable-next-line no-var
+var secrets = require('./secrets');
+// eslint-disable-next-line no-var
+var auth0tools = require('./auth0tools');
 const Promise = require('bluebird');
 
-const handler = async (event, context) => {
+const handler = async(event, context) => {
   if (typeof event.secretEnv === 'undefined') {
     throw new Error('secretEnv is required');
   }
@@ -16,14 +18,13 @@ const handler = async (event, context) => {
   return await auth0tools.addAuth0Url(secret, url);
 };
 
-module.exports = function(event, context, cb) {
-  return Promise.try(() => handler(event, context))
-    .then(result => {
-      cb(null);
-      return result;
-    })
-    .catch(err => {
-      cb(err);
-      throw err;
-    });
+module.exports = async(event, context, cb) => {
+  try {
+    const result = await Promise.try(() => handler(event, context));
+    cb(null);
+    return result;
+  } catch (err) {
+    cb(err);
+    throw err;
+  }
 };