From a7712fba28e1d6d28ec7f43bbbf2c92966d7318d Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <me@rodrigorodriguez.com>
Date: Sat, 17 Oct 2020 23:03:27 -0300
Subject: [PATCH] new(admin.gbapp): custom .gbapp /publish commands.

---
 .gitignore                                      |  8 ++------
 packages/admin.gbapp/dialogs/AdminDialog.ts     | 10 +++++++---
 packages/admin.gbapp/services/GBAdminService.ts | 12 ++++++++----
 packages/core.gbapp/services/GBMinService.ts    |  3 ++-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index d8db0220..60f7c34c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,14 +11,10 @@
 /packages/default.gbui/build
 /packages/default.gbui/.env
 /packages/default.gbui/node_modules
-/tmp
 /work
-/packages/default.gbdialog/bot.js
-/packages/default.gbdialog/bot.ts
 *.vbs.compiled
 *.vbs.js
 *.vbs.ts
 .env
-teste.sql
-poc/
-*.env
\ No newline at end of file
+*.env
+.vscode/launch.json
diff --git a/packages/admin.gbapp/dialogs/AdminDialog.ts b/packages/admin.gbapp/dialogs/AdminDialog.ts
index e7cc7c23..e9c85480 100644
--- a/packages/admin.gbapp/dialogs/AdminDialog.ts
+++ b/packages/admin.gbapp/dialogs/AdminDialog.ts
@@ -198,7 +198,7 @@ export class AdminDialog extends IGBDialog {
 
           if (AdminDialog.isIntentYes(locale, step.result)) {
             step.activeDialog.state.options.args;
-            
+
             for (let index = 0; index < min.appPackages.length; index++) {
               const element = min.appPackages[index];
               await element.onExchangeData(min, 'install', null);
@@ -273,8 +273,12 @@ export class AdminDialog extends IGBDialog {
 
           await CollectionUtil.asyncForEach(packages, async packageName => {
             try {
-              const cmd1 = `deployPackage ${process.env.STORAGE_SITE} /${process.env.STORAGE_LIBRARY}/${botId}.gbai/${packageName}`;
-
+              let cmd1;
+              if (packageName.indexOf('.') !== -1) {
+                cmd1 = `deployPackage ${process.env.STORAGE_SITE} /${process.env.STORAGE_LIBRARY}/${botId}.gbai/${packageName}`;
+              } else {
+                cmd1 = `deployPackage ${packageName}`; 
+              }
               if ((await (deployer as any).getStoragePackageByName(min.instance.instanceId, packageName)) !== null) {
                 const cmd2 = `undeployPackage ${packageName}`;
                 await GBAdminService.undeployPackageCommand(cmd2, min);
diff --git a/packages/admin.gbapp/services/GBAdminService.ts b/packages/admin.gbapp/services/GBAdminService.ts
index 67b8d5af..e6df1903 100644
--- a/packages/admin.gbapp/services/GBAdminService.ts
+++ b/packages/admin.gbapp/services/GBAdminService.ts
@@ -201,10 +201,14 @@ export class GBAdminService implements IGBAdminService {
               reject(err);
             } else {
               const token = res as TokenResponse;
-              await this.setValue(instanceId, 'accessToken', token.accessToken);
-              await this.setValue(instanceId, 'refreshToken', token.refreshToken);
-              await this.setValue(instanceId, 'expiresOn', token.expiresOn.toString());
-              resolve(token.accessToken);
+              try {
+                await this.setValue(instanceId, 'accessToken', token.accessToken);
+                await this.setValue(instanceId, 'refreshToken', token.refreshToken);
+                await this.setValue(instanceId, 'expiresOn', token.expiresOn.toString());
+                resolve(token.accessToken);
+              } catch (error) {
+                reject(err);
+              }
             }
           }
         );
diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts
index 2c8377e4..a879b359 100644
--- a/packages/core.gbapp/services/GBMinService.ts
+++ b/packages/core.gbapp/services/GBMinService.ts
@@ -330,8 +330,9 @@ export class GBMinService {
             GBLog.error(msg);
             res.send(msg);
           } else {
-            this.adminService.setValue(instance.instanceId, 'refreshToken', token.refreshToken);
+            // TODO: await these calls.
             this.adminService.setValue(instance.instanceId, 'accessToken', token.accessToken);
+            this.adminService.setValue(instance.instanceId, 'refreshToken', token.refreshToken);
             this.adminService.setValue(instance.instanceId, 'expiresOn', token.expiresOn.toString());
             this.adminService.setValue(instance.instanceId, 'AntiCSRFAttackState', undefined);
             res.redirect(min.instance.botEndpoint);