logout local

noscripter · Nov 4, 2015 · edbc7ee · edbc7ee
1 parent 11028bb
commit edbc7ee
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 14 deletions.
diff --git a/cli/definitions/cli.ts b/cli/definitions/cli.ts
@@ -77,6 +77,10 @@ export interface ILoginCommand extends ICommand {
     accessKey: string;
 }
 
+export interface ILogoutCommand extends ICommand {
+    isLocal: boolean;
+}
+
 export interface IPromoteCommand extends ICommand {
     appName: string;
     sourceDeploymentName: string;

diff --git a/cli/package.json b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "code-push-cli",
-  "version": "1.1.1-beta",
+  "version": "1.1.2-beta",
   "description": "Management CLI for the CodePush service",
   "main": "script/cli.js",
   "scripts": {

diff --git a/cli/script/command-executor.ts b/cli/script/command-executor.ts
@@ -312,7 +312,7 @@ export function execute(command: cli.ICommand): Promise<void> {
             return login(<cli.ILoginCommand>command);
 
         case cli.CommandType.logout:
-            return logout();
+            return logout(<cli.ILogoutCommand>command);
 
         case cli.CommandType.register:
             return register(<cli.IRegisterCommand>command);
@@ -505,19 +505,33 @@ function loginWithAccessTokenInternal(serverUrl: string): Promise<void> {
         });
 }
 
-function logout(): Promise<void> {
+function logout(command: cli.ILogoutCommand): Promise<void> {
     if (connectionInfo) {
-        return loginWithAccessToken()
-            .then((): Promise<string> => {
-                var standardLoginConnectionInfo: IStandardLoginConnectionInfo = <IStandardLoginConnectionInfo>connectionInfo;
-                var accessKeyLoginConnectionInfo: IAccessKeyLoginConnectionInfo = <IAccessKeyLoginConnectionInfo>connectionInfo;
-
-                if (standardLoginConnectionInfo.accessKeyName) return getAccessKeyId(standardLoginConnectionInfo.accessKeyName);
-                else return getAccessKeyId(accessKeyLoginConnectionInfo.accessKey);
-            })
-            .then((accessKeyId: string): Promise<void> => {
-                return sdk.removeAccessKey(accessKeyId);
-            })
+        var setupPromise: Promise<void> = loginWithAccessToken();
+        if (!command.isLocal) {
+            var accessKeyName: string;
+            setupPromise = setupPromise
+                .then((): Promise<string> => {
+                    var standardLoginConnectionInfo: IStandardLoginConnectionInfo = <IStandardLoginConnectionInfo>connectionInfo;
+                    var accessKeyLoginConnectionInfo: IAccessKeyLoginConnectionInfo = <IAccessKeyLoginConnectionInfo>connectionInfo;
+
+                    if (standardLoginConnectionInfo.accessKeyName) {
+                        accessKeyName = standardLoginConnectionInfo.accessKeyName;
+                        return getAccessKeyId(standardLoginConnectionInfo.accessKeyName);
+                    } else {
+                        accessKeyName = accessKeyLoginConnectionInfo.accessKey;
+                        return getAccessKeyId(accessKeyLoginConnectionInfo.accessKey);
+                    }
+                })
+                .then((accessKeyId: string): Promise<void> => {
+                    return sdk.removeAccessKey(accessKeyId);
+                })
+                .then((): void => {
+                    log("Removed access key " + accessKeyName + ".");
+                });
+        }
+
+        return setupPromise
             .then((): Promise<void> => sdk.logout(), (): Promise<void> => sdk.logout())
             .then((): void => deleteConnectionInfoCache(), (): void => deleteConnectionInfoCache())
             .then((): void => {

diff --git a/cli/script/command-parser.ts b/cli/script/command-parser.ts
@@ -212,6 +212,12 @@ var argv = yargs.usage(USAGE_PREFIX + " <command>")
     .command("logout", "Log out of the current session", (yargs: yargs.Argv) => {
         isValidCommandCategory = true;
         isValidCommand = true;
+        yargs.usage(USAGE_PREFIX + " logout [--local <true|false>]")
+            .demand(/*count*/ 1, /*max*/ 1)  // Require exactly one non-option argument.
+            .example("logout", "Log out and also remove the access key used for the current session.")
+            .example("logout --local", "Log out but still allow the use of the same access key for future logins.")
+            .option("local", { demand: false, description: "Whether to delete the current session's access key on the server", type: "boolean" })
+        addCommonConfiguration(yargs);
     })
     // Disabling this for closed beta
     //.command("register", "Register a new account with a specific CodePush server", (yargs: yargs.Argv) => {
@@ -373,6 +379,10 @@ function createCommand(): cli.ICommand {
 
             case "logout":
                 cmd = { type: cli.CommandType.logout };
+
+                var logoutCommand = <cli.ILogoutCommand>cmd;
+
+                logoutCommand.isLocal = argv["local"];
                 break;
 
             case "promote":