password prompts for azure blobs

mkloubert · Jun 4, 2017 · 61c072a · 61c072a
1 parent 3a80055
commit 61c072a
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 9.16.0 (June 4th, 2017; password prompts)
 
-* password box is shown now if no password is defined in [API](https://github.com/mkloubert/vs-deploy/wiki/target_api), [DropBox](https://github.com/mkloubert/vs-deploy/wiki/target_dropbox), [FTP](https://github.com/mkloubert/vs-deploy/wiki/target_ftp) and [mail](https://github.com/mkloubert/vs-deploy/wiki/target_mail) targets
+* password box is shown now if no password / token / key is defined in [API](https://github.com/mkloubert/vs-deploy/wiki/target_api), [Azure blob](https://github.com/mkloubert/vs-deploy/wiki/target_azureblob), [DropBox](https://github.com/mkloubert/vs-deploy/wiki/target_dropbox), [FTP](https://github.com/mkloubert/vs-deploy/wiki/target_ftp) and [mail](https://github.com/mkloubert/vs-deploy/wiki/target_mail) targets
 
 ## 9.15.1 (June 4th, 2017; bugfixes and password prompt for SFTP)
 

diff --git a/package.json b/package.json
@@ -4070,6 +4070,11 @@
                       "transformerOptions": {
                         "description": "Optional data for the transformer script."
                       },
+                      "promptForKey": {
+                        "type": "boolean",
+                        "description": "Prompt for an access key if not defined.",
+                        "default": true
+                      },
                       "description": {
                         "type": "string",
                         "description": "A description for the target."
@@ -6864,7 +6869,7 @@
                       },
                       "promptForToken": {
                         "type": "boolean",
-                        "description": "Prompt for a access token if not defined.",
+                        "description": "Prompt for an access token if not defined.",
                         "default": true
                       },
                       "description": {

diff --git a/src/contracts.ts b/src/contracts.ts
@@ -112,11 +112,21 @@ export const EVENT_DEPLOYONSAVE_ENABLE = 'deploy.deployOnSave.enable';
 export const EVENT_DEPLOYONSAVE_TOGGLE = 'deploy.deployOnSave.toggle';
 
 /**
- * An object that can handle passwords.
+ * An object that can handle access keys.
+ */
+export interface AccessKeyObject {
+    /**
+     * Prompt for an access key if not defined.
+     */
+    promptForKey?: boolean;
+}
+
+/**
+ * An object that can handle access tokens.
  */
 export interface AccessTokenObject {
     /**
-     * Prompt for a access token if not defined.
+     * Prompt for an access token if not defined.
      */
     promptForToken?: boolean;
 }

diff --git a/src/i18.ts b/src/i18.ts
@@ -305,6 +305,7 @@ export interface Translation {
         },
     },
     prompts?: {
+        inputAccessKey?: string;
         inputAccessToken?: string;
         inputPassword?: string;
     },

diff --git a/src/lang/de.ts b/src/lang/de.ts
@@ -296,6 +296,7 @@ export const translation: Translation = {
         },
     },
     prompts: {
+        inputAccessKey: 'Geben Sie den Zugriffsschlüssel an...',
         inputAccessToken: 'Geben Sie das Zugriffs-Token an...',
         inputPassword: 'Geben Sie das Passwort an...',
     },

diff --git a/src/lang/en.ts b/src/lang/en.ts
@@ -298,6 +298,7 @@ export const translation: Translation = {
         },
     },
     prompts: {
+        inputAccessKey: 'Input the access key...',
         inputAccessToken: 'Input the access token...',
         inputPassword: 'Input the password...',
     },

diff --git a/src/plugins/azureblob.ts b/src/plugins/azureblob.ts
@@ -32,9 +32,10 @@ import * as i18 from '../i18';
 import * as Moment from 'moment';
 import * as Path from 'path';
 import * as TMP from 'tmp';
+import * as vscode from 'vscode';
 
 
-interface DeployTargetAzureBlob extends deploy_contracts.TransformableDeployTarget {
+interface DeployTargetAzureBlob extends deploy_contracts.TransformableDeployTarget, deploy_contracts.AccessKeyObject {
     accessKey?: string;
     account?: string;
     container: string;
@@ -78,26 +79,82 @@ class AzureBlobPlugin extends deploy_objects.DeployPluginWithContextBase<AzureBl
         }
         dir += '/';
 
-        return new Promise<deploy_objects.DeployPluginContextWrapper<any>>((resolve, reject) => {
+        return new Promise<deploy_objects.DeployPluginContextWrapper<AzureBlobContext>>((resolve, reject) => {
+            let completed = (err: any, wrapper?: deploy_objects.DeployPluginContextWrapper<AzureBlobContext>) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    resolve(wrapper);
+                }
+            };
+
             try {
-                let service = AzureStorage.createBlobService(target.account, target.accessKey,
-                                                             target.host);
+                let accessKey = deploy_helpers.toStringSafe(target.accessKey);
+
+                let ctx: AzureBlobContext = {
+                    container: containerName,
+                    dir: dir,
+                    hasCancelled: false,
+                    service: undefined,
+                };
 
                 let wrapper: deploy_objects.DeployPluginContextWrapper<AzureBlobContext> = {
-                    context: {
-                        container: containerName,
-                        dir: dir,
-                        hasCancelled: false,
-                        service: service,
-                    },
+                    context: ctx,
                 };
 
                 me.onCancelling(() => wrapper.context.hasCancelled = true, opts);
 
-                resolve(wrapper);
+                let prepareWrapper = (hasCancelled: boolean) => {
+                    try {
+                        ctx.hasCancelled = hasCancelled;
+
+                        if (!ctx.hasCancelled) {
+                            ctx.service = AzureStorage.createBlobService(target.account, accessKey,
+                                                                         target.host);
+                        }
+
+                        completed(null, wrapper);
+                    }
+                    catch (e) {
+                        completed(e);
+                    }
+                };
+
+                let askForTokenIfNeeded = () => {
+                    let showKeyPrompt = false;
+                    if (deploy_helpers.isEmptyString(accessKey)) {
+                        // user defined, but no key
+                        showKeyPrompt = deploy_helpers.toBooleanSafe(target.promptForKey, true);
+                    }
+
+                    if (showKeyPrompt) {
+                        vscode.window.showInputBox({
+                            placeHolder: i18.t('prompts.inputAccessKey'),
+                            password: true,
+                        }).then((keyFromUser) => {
+                            if (deploy_helpers.isEmptyString(keyFromUser)) {
+                                // cancelled
+                                prepareWrapper(true);
+                            }
+                            else {
+                                accessKey = keyFromUser;
+
+                                prepareWrapper(false);
+                            }
+                        }, (err) => {
+                            completed(err);
+                        });
+                    }
+                    else {
+                        prepareWrapper(false);
+                    }
+                };
+
+                askForTokenIfNeeded();
             }
             catch (e) {
-                reject(e);
+                completed(e);
             }
         });
     }

diff --git a/src/plugins/dropbox.ts b/src/plugins/dropbox.ts
@@ -385,7 +385,7 @@ class DropboxPlugin extends deploy_objects.DeployPluginWithContextBase<DropboxCo
                 let askForTokenIfNeeded = () => {
                     let showTokenPrompt = false;
                     if (deploy_helpers.isEmptyString(ctx.token)) {
-                        // user defined, but no password
+                        // user defined, but no token
                         showTokenPrompt = deploy_helpers.toBooleanSafe(target.promptForToken, true);
                     }