Merge branch 'master' of https://github.com/auth0/auth0-deploy-cli into applying-prettier-existing-code

Author: Will Vedder

src/args.ts

@@ -1,6 +1,31 @@
 import yargs from 'yargs';
+import { Config } from './types'
 
-function getParams() {
+type SharedParams = {
+  _: ['export' | 'import' | 'deploy' | 'dump']
+  proxy_url?: string
+  debug: boolean
+  config_file?: string
+  env: boolean
+  format: 'yaml' | 'directory'
+  secret?: string
+  base_path?: string // Necessary when package imported as Node module
+  config?: Partial<Config>,
+}
+
+type ImportSpecificParams = {
+  input_file: string
+}
+
+type ExportSpecificParams = {
+  output_folder: string
+  export_ids: boolean
+}
+
+export type ExportParams = ExportSpecificParams & SharedParams
+export type ImportParams = ImportSpecificParams & SharedParams
+
+function getParams(): ExportParams | ImportParams {
   const args = yargs
     .demandCommand(1, 'A command is required')
     .usage('Auth0 Deploy CLI')
@@ -15,7 +40,7 @@ function getParams() {
       describe: 'A url for proxying requests, only set this if you are behind a proxy.',
       type: 'string'
     })
-    .command([ 'import', 'deploy' ], 'Deploy Configuration', {
+    .command(['import', 'deploy'], 'Deploy Configuration', {
       input_file: {
         alias: 'i',
         describe: 'The updates to deploy. Either a JSON file, or directory that contains the correct file layout. See README and online for more info.',
@@ -38,7 +63,7 @@ function getParams() {
         type: 'string'
       }
     })
-    .command([ 'export', 'dump' ], 'Export Auth0 Tenant Configuration', {
+    .command(['export', 'dump'], 'Export Auth0 Tenant Configuration', {
       output_folder: {
         alias: 'o',
         describe: 'The output directory.',
@@ -49,7 +74,7 @@ function getParams() {
         alias: 'f',
         describe: 'The output format.',
         type: 'string',
-        choices: [ 'yaml', 'directory' ],
+        choices: ['yaml', 'directory'],
         demandOption: true
       },
       config_file: {
@@ -84,6 +109,7 @@ function getParams() {
     .example('$0 deploy -c config.json -i path/to/files', 'Deploy Auth0 via Path')
     .epilogue('See README (https://github.com/auth0/auth0-deploy-cli) for more in-depth information on configuration and setup.')
     .wrap(null);
+  //@ts-ignore because we know these types are either ExportParams or ImportParams. TODO: fix more native way of inferring types from yargs
   return args.argv;
 }
 

src/commands/export.ts

@@ -6,18 +6,7 @@ import log from '../logger';
 import { isDirectory } from '../utils';
 import { setupContext } from '../context/index';
 import { Config } from '../types'
-
-type ExportParams = {
-  output_folder: string,
-  base_path?: string,
-  config_file: string,
-  config?: Partial<Config>,
-  export_ids: boolean,
-  secret?: string
-  format: 'yaml' | 'directory'
-  debug: boolean
-  env: boolean
-}
+import { ExportParams } from '../args'
 
 export default async function exportCMD(params: ExportParams) {
   const {
@@ -38,7 +27,7 @@ export default async function exportCMD(params: ExportParams) {
     nconf.file(configFile);
   }
 
-  const overrides: Partial<Config>  = {
+  const overrides: Partial<Config> = {
     AUTH0_INPUT_FILE: outputFolder,
     AUTH0_BASE_PATH: basePath,
     ...configObj || {}

src/commands/import.ts

@@ -3,16 +3,7 @@ import { configFactory } from '../configFactory';
 import { deploy as toolsDeploy } from '../tools';
 import log from '../logger';
 import { setupContext } from '../context';
-import { Config } from '../types'
-
-type ImportParams = {
-  input_file: string,
-  base_path: string,
-  config_file: string,
-  env: boolean,
-  secret: string,
-  config?: Partial<Config>,
-}
+import { ImportParams } from '../args'
 
 export default async function importCMD(params: ImportParams) {
   const {

src/context/directory/handlers/tenant.ts

@@ -1,7 +1,8 @@
 import path from 'path';
 import {
-  existsMustBeDir, isFile, dumpJSON, loadJSON, hoursAsInteger, clearTenantFlags
+  existsMustBeDir, isFile, dumpJSON, loadJSON, clearTenantFlags
 } from '../../../utils';
+import { sessionDurationsToMinutes } from '../../../sessionDurationsToMinutes'
 import { DirectoryHandler } from '.'
 import DirectoryContext from '..'
 
@@ -25,18 +26,22 @@ function parse(context: DirectoryContext): ParsedTenant {
       session_lifetime,
       idle_session_lifetime,
       ...tenant
+    }: {
+      session_lifetime?: number
+      idle_session_lifetime?: number,
+      [key: string]: any
     } = loadJSON(tenantFile, context.mappings);
 
     clearTenantFlags(tenant);
 
+    const sessionDurations = sessionDurationsToMinutes({ session_lifetime, idle_session_lifetime })
+
     return {
       tenant: {
         ...tenant,
-        session_lifetime_in_minutes: hoursAsInteger('session_lifetime', session_lifetime)['session_lifetime_in_minutes'],
-        idle_session_lifetime_in_minutes: hoursAsInteger('idle_session_lifetime', idle_session_lifetime)['idle_session_lifetime_in_minutes'],
-      }
+        ...sessionDurations
+      },
     };
-    /* eslint-enable camelcase */
   }
 
   return {};

src/context/yaml/handlers/tenant.ts

@@ -1,4 +1,5 @@
-import { hoursAsInteger, clearTenantFlags } from '../../../utils';
+import { clearTenantFlags } from '../../../utils';
+import { sessionDurationsToMinutes } from '../../../sessionDurationsToMinutes'
 import { YAMLHandler } from '.'
 import YAMLContext from '..'
 
@@ -15,18 +16,22 @@ async function parse(context: YAMLContext): Promise<ParsedTenant> {
     session_lifetime,
     idle_session_lifetime,
     ...tenant
+  }: {
+    session_lifetime?: number
+    idle_session_lifetime?: number,
+    [key: string]: any
   } = context.assets.tenant;
 
   clearTenantFlags(tenant);
 
+  const sessionDurations = sessionDurationsToMinutes({ session_lifetime, idle_session_lifetime })
+
   return {
-    tenant: Object.assign(
-      tenant,
-      session_lifetime && hoursAsInteger('session_lifetime', session_lifetime),
-      idle_session_lifetime && hoursAsInteger('idle_session_lifetime', idle_session_lifetime)
-    )
+    tenant: {
+      ...tenant,
+      ...sessionDurations
+    },
   };
-  /* eslint-enable camelcase */
 }
 
 async function dump(context: YAMLContext): Promise<ParsedTenant> {

src/index.js src/index.ts

@@ -1,14 +1,18 @@
 #!/usr/bin/env node
 import { bootstrap } from 'global-agent';
 
-import { getParams } from './args';
-import commands from './commands';
+import { getParams, ExportParams, ImportParams } from './args';
 import log from './logger';
 import tools from './tools';
+import { Stage } from './tools/auth0'
 
-async function run(params) {
+import importCMD from './commands/import'
+import exportCMD from './commands/export'
+
+async function run(params: ImportParams | ExportParams): Promise<void> {
   // Run command
-  const cmd = commands[params._[0]];
+  const command = params._[0];
+
   const proxy = params.proxy_url;
 
   if (proxy) {
@@ -23,9 +27,14 @@ async function run(params) {
     bootstrap();
   }
 
-  log.debug(`Start command ${params._[0]}`);
-  await cmd(params);
-  log.debug(`Finished command ${params._[0]}`);
+  log.debug(`Start command ${command}`);
+  if (['deploy', 'import'].includes(command) && 'input_file' in params) {
+    await importCMD(params)
+  }
+  if (['dump', 'export'].includes(command) && 'output_folder' in params) {
+    await exportCMD(params)
+  }
+  log.debug(`Finished command ${command}`);
 }
 
 // Only run if from command line
@@ -35,8 +44,6 @@ if (require.main === module) {
 
   log.debug('Starting Auth0 Deploy CLI Tool');
 
-  // Set log level
-  log.transports.console.level = params.level;
   if (params.debug) {
     log.transports.console.level = 'debug';
     // Set for tools
@@ -46,17 +53,23 @@ if (require.main === module) {
 
   run(params)
     .then(() => process.exit(0))
-    .catch((error) => {
+    .catch((error: {
+      type?: string
+      stage?: Stage
+      message?: string
+      stack?: string
+    }) => {
+      const command = params._[0]
       if (error.type || error.stage) {
-        log.error(`Problem running command ${params._[0]} during stage ${error.stage} when processing type ${error.type}`);
+        log.error(`Problem running command ${command} during stage ${error.stage} when processing type ${error.type}`);
       } else {
-        log.error(`Problem running command ${params._[0]}`);
+        log.error(`Problem running command ${command}`);
       }
 
       const msg = error.message || error.toString();
       log.error(msg);
 
-      if (process.env.AUTH0_DEBUG === 'true') {
+      if (process.env.AUTH0_DEBUG === 'true' && error.stack) {
         log.debug(error.stack);
       }
 
@@ -69,9 +82,9 @@ if (require.main === module) {
 
 // Export commands to be used programmatically
 module.exports = {
-  deploy: commands.import,
-  dump: commands.export,
-  import: commands.import,
-  export: commands.export,
+  deploy: importCMD,
+  dump: exportCMD,
+  import: importCMD,
+  export: exportCMD,
   tools: tools
 };

src/sessionDurationsToMinutes.ts

@@ -0,0 +1,16 @@
+function hoursToMinutes(hours: number): number {
+    return Math.round(hours * 60)
+}
+
+export const sessionDurationsToMinutes = (
+    { session_lifetime, idle_session_lifetime }: { session_lifetime?: number, idle_session_lifetime?: number }): { session_lifetime_in_minutes?: number, idle_session_lifetime_in_minutes?: number } => {
+    const sessionDurations: {
+        session_lifetime_in_minutes?: number
+        idle_session_lifetime_in_minutes?: number
+    } = {};
+
+    if (!!session_lifetime) sessionDurations.session_lifetime_in_minutes = hoursToMinutes(session_lifetime)
+    if (!!idle_session_lifetime) sessionDurations.idle_session_lifetime_in_minutes = hoursToMinutes(idle_session_lifetime)
+
+    return sessionDurations
+}

src/tools/auth0/index.ts

@@ -8,9 +8,7 @@ import { Assets, Auth0APIClient } from '../../types'
 import APIHandler from './handlers/default';
 import { ConfigFunction } from '../../configFactory';
 
-
-
-type Stage = 'load' | 'validate' | 'processChanges'
+export type Stage = 'load' | 'validate' | 'processChanges'
 
 type StageFunction = APIHandler['load'] // Using `load` method as a template for what type stage functions resemble