@appcircle/codepush-cli 0.0.3-alpha.1 → 0.0.4

package/script/command-executor.ts

@@ -122,60 +122,6 @@ export const confirm = (message: string = "Are you sure?"): Promise<boolean> =>
   });
 };
 
-function accessKeyAdd(command: cli.IAccessKeyAddCommand): Promise<void> {
-  return sdk.addAccessKey(command.name, command.ttl).then((accessKey: AccessKey) => {
-    log(`Successfully created the "${command.name}" access key: ${accessKey.key}`);
-    log("Make sure to save this key value somewhere safe, since you won't be able to view it from the CLI again!");
-  });
-}
-
-function accessKeyPatch(command: cli.IAccessKeyPatchCommand): Promise<void> {
-  const willUpdateName: boolean = isCommandOptionSpecified(command.newName) && command.oldName !== command.newName;
-  const willUpdateTtl: boolean = isCommandOptionSpecified(command.ttl);
-
-  if (!willUpdateName && !willUpdateTtl) {
-    throw new Error("A new name and/or TTL must be provided.");
-  }
-
-  return sdk.patchAccessKey(command.oldName, command.newName, command.ttl).then((accessKey: AccessKey) => {
-    let logMessage: string = "Successfully ";
-    if (willUpdateName) {
-      logMessage += `renamed the access key "${command.oldName}" to "${command.newName}"`;
-    }
-
-    if (willUpdateTtl) {
-      const expirationDate = moment(accessKey.expires).format("LLLL");
-      if (willUpdateName) {
-        logMessage += ` and changed its expiration date to ${expirationDate}`;
-      } else {
-        logMessage += `changed the expiration date of the "${command.oldName}" access key to ${expirationDate}`;
-      }
-    }
-
-    log(`${logMessage}.`);
-  });
-}
-
-function accessKeyList(command: cli.IAccessKeyListCommand): Promise<void> {
-  throwForInvalidOutputFormat(command.format);
-
-  return sdk.getAccessKeys().then((accessKeys: AccessKey[]): void => {
-    printAccessKeys(command.format, accessKeys);
-  });
-}
-
-function accessKeyRemove(command: cli.IAccessKeyRemoveCommand): Promise<void> {
-  return confirm().then((wasConfirmed: boolean): Promise<void> => {
-    if (wasConfirmed) {
-      return sdk.removeAccessKey(command.accessKey).then((): void => {
-        log(`Successfully removed the "${command.accessKey}" access key.`);
-      });
-    }
-
-    log("Access key removal cancelled.");
-  });
-}
-
 function appAdd(command: cli.IAppAddCommand): Promise<void> {
   return sdk.addApp(command.appName).then((app: App): Promise<void> => {
     log('Successfully added the "' + command.appName + '" app, along with the following default deployments:');
@@ -446,15 +392,7 @@ export function execute(command: cli.ICommand) {
     switch (command.type) {
       // Must not be logged in
       case cli.CommandType.login:
-      case cli.CommandType.register:
-        if (connectionInfo) {
-          throw new Error("You are already logged in from this machine.");
-        }
-        break;
-
-      // It does not matter whether you are logged in or not
-      case cli.CommandType.link:
-        break;
+           return login(<cli.ILoginCommand>command);
 
       // Must be logged in
       default:
@@ -471,18 +409,6 @@ export function execute(command: cli.ICommand) {
     }
 
     switch (command.type) {
-      case cli.CommandType.accessKeyAdd:
-        return accessKeyAdd(<cli.IAccessKeyAddCommand>command);
-
-      case cli.CommandType.accessKeyPatch:
-        return accessKeyPatch(<cli.IAccessKeyPatchCommand>command);
-
-      case cli.CommandType.accessKeyList:
-        return accessKeyList(<cli.IAccessKeyListCommand>command);
-
-      case cli.CommandType.accessKeyRemove:
-        return accessKeyRemove(<cli.IAccessKeyRemoveCommand>command);
-
       case cli.CommandType.appAdd:
         return appAdd(<cli.IAppAddCommand>command);
 
@@ -519,12 +445,6 @@ export function execute(command: cli.ICommand) {
       case cli.CommandType.deploymentRename:
         return deploymentRename(<cli.IDeploymentRenameCommand>command);
 
-      case cli.CommandType.link:
-        return link(<cli.ILinkCommand>command);
-
-      case cli.CommandType.login:
-        return login(<cli.ILoginCommand>command);
-
       case cli.CommandType.logout:
         return logout(command);
 
@@ -534,9 +454,6 @@ export function execute(command: cli.ICommand) {
       case cli.CommandType.promote:
         return promote(<cli.IPromoteCommand>command);
 
-      case cli.CommandType.register:
-        return register(<cli.IRegisterCommand>command);
-
       case cli.CommandType.release:
         return release(<cli.IReleaseCommand>command);
 
@@ -546,12 +463,6 @@ export function execute(command: cli.ICommand) {
       case cli.CommandType.rollback:
         return rollback(<cli.IRollbackCommand>command);
 
-      case cli.CommandType.sessionList:
-        return sessionList(<cli.ISessionListCommand>command);
-
-      case cli.CommandType.sessionRemove:
-        return sessionRemove(<cli.ISessionRemoveCommand>command);
-
       default:
         // We should never see this message as invalid commands should be caught by the argument parser.
         throw new Error("Invalid command:  " + JSON.stringify(command));

package/script/command-parser.ts

@@ -34,84 +34,6 @@ export function showHelp(showRootDescription?: boolean): void {
   }
 }
 
-function accessKeyAdd(commandName: string, yargs: yargs.Argv): void {
-  isValidCommand = true;
-  yargs
-    .usage(USAGE_PREFIX + " access-key " + commandName + " <accessKeyName>")
-    .demand(/*count*/ 1, /*max*/ 1) // Require exactly one non-option arguments
-    .example(
-      "access-key " + commandName + ' "VSTS Integration"',
-      'Creates a new access key with the name "VSTS Integration", which expires in 60 days'
-    )
-    .example(
-      "access-key " + commandName + ' "One time key" --ttl 5m',
-      'Creates a new access key with the name "One time key", which expires in 5 minutes'
-    )
-    .option("ttl", {
-      default: "60d",
-      demand: false,
-      description: "Duration string which specifies the amount of time that the access key should remain valid for (e.g 5m, 60d, 1y)",
-      type: "string",
-    });
-
-  addCommonConfiguration(yargs);
-}
-
-function accessKeyPatch(commandName: string, yargs: yargs.Argv): void {
-  isValidCommand = true;
-  yargs
-    .usage(USAGE_PREFIX + " access-key " + commandName + " <accessKeyName>")
-    .demand(/*count*/ 1, /*max*/ 1) // Require exactly one non-option arguments
-    .example(
-      "access-key " + commandName + ' "Key for build server" --name "Key for CI machine"',
-      'Renames the access key named "Key for build server" to "Key for CI machine"'
-    )
-    .example(
-      "access-key " + commandName + ' "Key for build server" --ttl 7d',
-      'Updates the access key named "Key for build server" to expire in 7 days'
-    )
-    .option("name", {
-      default: null,
-      demand: false,
-      description: "Display name for the access key",
-      type: "string",
-    })
-    .option("ttl", {
-      default: null,
-      demand: false,
-      description: "Duration string which specifies the amount of time that the access key should remain valid for (e.g 5m, 60d, 1y)",
-      type: "string",
-    });
-  addCommonConfiguration(yargs);
-}
-
-function accessKeyList(commandName: string, yargs: yargs.Argv): void {
-  isValidCommand = true;
-  yargs
-    .usage(USAGE_PREFIX + " access-key " + commandName + " [options]")
-    .demand(/*count*/ 0, /*max*/ 0)
-    .example("access-key " + commandName, "Lists your access keys in tabular format")
-    .example("access-key " + commandName + " --format json", "Lists your access keys in JSON format")
-    .option("format", {
-      default: "table",
-      demand: false,
-      description: 'Output format to display your access keys with ("json" or "table")',
-      type: "string",
-    });
-
-  addCommonConfiguration(yargs);
-}
-
-function accessKeyRemove(commandName: string, yargs: yargs.Argv): void {
-  isValidCommand = true;
-  yargs
-    .usage(USAGE_PREFIX + " access-key " + commandName + " <accessKeyName>")
-    .demand(/*count*/ 1, /*max*/ 1) // Require exactly one non-option arguments
-    .example("access-key " + commandName + ' "VSTS Integration"', 'Removes the "VSTS Integration" access key');
-
-  addCommonConfiguration(yargs);
-}
-
 function addCommonConfiguration(yargs: yargs.Argv): void {
   yargs
     .wrap(/*columnLimit*/ null)
@@ -183,33 +105,6 @@ function removeCollaborator(commandName: string, yargs: yargs.Argv): void {
   addCommonConfiguration(yargs);
 }
 
-function sessionList(commandName: string, yargs: yargs.Argv): void {
-  isValidCommand = true;
-  yargs
-    .usage(USAGE_PREFIX + " session " + commandName + " [options]")
-    .demand(/*count*/ 0, /*max*/ 0)
-    .example("session " + commandName, "Lists your sessions in tabular format")
-    .example("session " + commandName + " --format json", "Lists your login sessions in JSON format")
-    .option("format", {
-      default: "table",
-      demand: false,
-      description: 'Output format to display your login sessions with ("json" or "table")',
-      type: "string",
-    });
-
-  addCommonConfiguration(yargs);
-}
-
-function sessionRemove(commandName: string, yargs: yargs.Argv): void {
-  isValidCommand = true;
-  yargs
-    .usage(USAGE_PREFIX + " session " + commandName + " <machineName>")
-    .demand(/*count*/ 1, /*max*/ 1) // Require exactly one non-option arguments
-    .example("session " + commandName + ' "John\'s PC"', 'Removes the existing login session from "John\'s PC"');
-
-  addCommonConfiguration(yargs);
-}
-
 function deploymentHistoryClear(commandName: string, yargs: yargs.Argv): void {
   isValidCommand = true;
   yargs
@@ -289,21 +184,6 @@ function deploymentHistory(commandName: string, yargs: yargs.Argv): void {
 yargs
   .usage(USAGE_PREFIX + " <command>")
   .demand(/*count*/ 1, /*max*/ 1) // Require exactly one non-option argument.
-  .command("access-key", "View and manage the access keys associated with your account", (yargs: yargs.Argv) => {
-    isValidCommandCategory = true;
-    yargs
-      .usage(USAGE_PREFIX + " access-key <command>")
-      .demand(/*count*/ 2, /*max*/ 2) // Require exactly two non-option arguments.
-      .command("add", "Create a new access key associated with your account", (yargs: yargs.Argv) => accessKeyAdd("add", yargs))
-      .command("patch", "Update the name and/or TTL of an existing access key", (yargs: yargs.Argv) => accessKeyPatch("patch", yargs))
-      .command("remove", "Remove an existing access key", (yargs: yargs.Argv) => accessKeyRemove("remove", yargs))
-      .command("rm", "Remove an existing access key", (yargs: yargs.Argv) => accessKeyRemove("rm", yargs))
-      .command("list", "List the access keys associated with your account", (yargs: yargs.Argv) => accessKeyList("list", yargs))
-      .command("ls", "List the access keys associated with your account", (yargs: yargs.Argv) => accessKeyList("ls", yargs))
-      .check((argv: any, aliases: { [aliases: string]: string }): any => isValidCommand); // Report unrecognized, non-hyphenated command category.
-
-    addCommonConfiguration(yargs);
-  })
   .command("app", "View and manage your CodePush apps", (yargs: yargs.Argv) => {
     isValidCommandCategory = true;
     yargs
@@ -402,17 +282,6 @@ yargs
 
     addCommonConfiguration(yargs);
   })
-  .command("link", "Link an additional authentication provider (e.g. GitHub) to an existing CodePush account", (yargs: yargs.Argv) => {
-    isValidCommandCategory = true;
-    isValidCommand = true;
-    yargs
-      .usage(USAGE_PREFIX + " link")
-      .demand(/*count*/ 0, /*max*/ 1) //set 'max' to one to allow usage of serverUrl undocument parameter for testing
-      .example("link", "Links an account on the CodePush server")
-      .check((argv: any, aliases: { [aliases: string]: string }): any => isValidCommand); // Report unrecognized, non-hyphenated command category.
-
-    addCommonConfiguration(yargs);
-  })
   .command("login", "Authenticate with the CodePush server in order to begin managing your apps", (yargs: yargs.Argv) => {
     isValidCommandCategory = true;
     isValidCommand = true;
@@ -590,17 +459,6 @@ yargs
 
     addCommonConfiguration(yargs);
   })
-  .command("register", "Register a new CodePush account", (yargs: yargs.Argv) => {
-    isValidCommandCategory = true;
-    isValidCommand = true;
-    yargs
-      .usage(USAGE_PREFIX + " register")
-      .demand(/*count*/ 0, /*max*/ 1) //set 'max' to one to allow usage of serverUrl undocument parameter for testing
-      .example("register", "Registers a new CodePush account")
-      .check((argv: any, aliases: { [aliases: string]: string }): any => isValidCommand); // Report unrecognized, non-hyphenated command category.
-
-    addCommonConfiguration(yargs);
-  })
   .command("release", "Release an update to an app deployment", (yargs: yargs.Argv) => {
     yargs
       .usage(USAGE_PREFIX + " release <appName> <updateContentsPath> <targetBinaryVersion> [options]")
@@ -864,21 +722,6 @@ yargs
 
     addCommonConfiguration(yargs);
   })
-  .command("session", "View and manage the current login sessions associated with your account", (yargs: yargs.Argv) => {
-    isValidCommandCategory = true;
-    yargs
-      .usage(USAGE_PREFIX + " session <command>")
-      .demand(/*count*/ 2, /*max*/ 2) // Require exactly two non-option arguments.
-      .command("remove", "Remove an existing login session", (yargs: yargs.Argv) => sessionRemove("remove", yargs))
-      .command("rm", "Remove an existing login session", (yargs: yargs.Argv) => sessionRemove("rm", yargs))
-      .command("list", "List the current login sessions associated with your account", (yargs: yargs.Argv) =>
-        sessionList("list", yargs)
-      )
-      .command("ls", "List the current login sessions associated with your account", (yargs: yargs.Argv) => sessionList("ls", yargs))
-      .check((argv: any, aliases: { [aliases: string]: string }): any => isValidCommand); // Report unrecognized, non-hyphenated command category.
-
-    addCommonConfiguration(yargs);
-  })
   .alias("v", "version")
   .version(packageJson.version)
   .wrap(/*columnLimit*/ null)
@@ -898,56 +741,6 @@ export function createCommand(): cli.ICommand {
     const arg4: any = argv._[4];
 
     switch (arg0) {
-      case "access-key":
-        switch (arg1) {
-          case "add":
-            if (arg2) {
-              cmd = { type: cli.CommandType.accessKeyAdd };
-              const accessKeyAddCmd = <cli.IAccessKeyAddCommand>cmd;
-              accessKeyAddCmd.name = arg2;
-              const ttlOption: string = argv["ttl"] as any;
-              if (isDefined(ttlOption)) {
-                accessKeyAddCmd.ttl = parseDurationMilliseconds(ttlOption);
-              }
-            }
-            break;
-
-          case "patch":
-            if (arg2) {
-              cmd = { type: cli.CommandType.accessKeyPatch };
-              const accessKeyPatchCmd = <cli.IAccessKeyPatchCommand>cmd;
-              accessKeyPatchCmd.oldName = arg2;
-
-              const newNameOption: string = argv["name"] as any;
-              const ttlOption: string = argv["ttl"] as any;
-              if (isDefined(newNameOption)) {
-                accessKeyPatchCmd.newName = newNameOption;
-              }
-
-              if (isDefined(ttlOption)) {
-                accessKeyPatchCmd.ttl = parseDurationMilliseconds(ttlOption);
-              }
-            }
-            break;
-
-          case "list":
-          case "ls":
-            cmd = { type: cli.CommandType.accessKeyList };
-
-            (<cli.IAccessKeyListCommand>cmd).format = argv["format"] as any;
-            break;
-
-          case "remove":
-          case "rm":
-            if (arg2) {
-              cmd = { type: cli.CommandType.accessKeyRemove };
-
-              (<cli.IAccessKeyRemoveCommand>cmd).accessKey = arg2;
-            }
-            break;
-        }
-        break;
-
       case "app":
         switch (arg1) {
           case "add":
@@ -1079,13 +872,6 @@ export function createCommand(): cli.ICommand {
         }
         break;
 
-      case "link":
-        cmd = <cli.ILinkCommand>{
-          type: cli.CommandType.link,
-          serverUrl: getServerUrl(arg1),
-        };
-        break;
-
       case "login":
         cmd = { type: cli.CommandType.login };
 
@@ -1138,14 +924,6 @@ export function createCommand(): cli.ICommand {
         }
         break;
 
-      case "register":
-        cmd = { type: cli.CommandType.register };
-
-        const registerCommand = <cli.IRegisterCommand>cmd;
-
-        registerCommand.serverUrl = getServerUrl(arg1);
-        break;
-
       case "release":
         if (arg1 && arg2 && arg3) {
           cmd = { type: cli.CommandType.release };
@@ -1209,26 +987,6 @@ export function createCommand(): cli.ICommand {
           rollbackCommand.targetRelease = argv["targetRelease"] as any;
         }
         break;
-
-      case "session":
-        switch (arg1) {
-          case "list":
-          case "ls":
-            cmd = { type: cli.CommandType.sessionList };
-
-            (<cli.ISessionListCommand>cmd).format = argv["format"] as any;
-            break;
-
-          case "remove":
-          case "rm":
-            if (arg2) {
-              cmd = { type: cli.CommandType.sessionRemove };
-
-              (<cli.ISessionRemoveCommand>cmd).machineName = arg2;
-            }
-            break;
-        }
-        break;
     }
 
     return cmd;

package/script/types/cli.ts

@@ -4,10 +4,6 @@
 import AccountManager = require("../management-sdk");
 
 export enum CommandType {
-  accessKeyAdd,
-  accessKeyPatch,
-  accessKeyList,
-  accessKeyRemove,
   appAdd,
   appList,
   appDeploymentKeyList,
@@ -21,17 +17,13 @@ export enum CommandType {
   deploymentMetrics,
   deploymentRemove,
   deploymentRename,
-  link,
   login,
   logout,
   patch,
   promote,
-  register,
   release,
   releaseReact,
-  rollback,
-  sessionList,
-  sessionRemove
+  rollback
 }
 
 export interface ICommand {