tmp

Author: azaslonov

src/authentication/armAuthenticator.ts

@@ -51,9 +51,9 @@ export class ArmAuthenticator implements IAuthenticator {
         return accessToken;
     }
 
-    public async getAccessToken(): Promise<string> {
+    public async getAccessToken(): Promise<AccessToken> {
         if (this.accessToken && !this.accessToken.isExpired()) {
-            return this.accessToken.toString();
+            return this.accessToken;
         }
 
         const storedAccessToken = sessionStorage.getItem("armAccessToken");
@@ -62,11 +62,16 @@ export class ArmAuthenticator implements IAuthenticator {
             const parsedToken = AccessToken.parse(storedAccessToken);
 
             if (!parsedToken.isExpired()) {
-                return parsedToken.toString();
+                return parsedToken;
             }
         }
 
         const accessToken = await this.tryAcquireToken();
+        return accessToken;
+    }
+
+    public async getAccessTokenAsString(): Promise<string> {
+        const accessToken = await this.getAccessToken();
         return accessToken.toString();
     }
 
@@ -91,12 +96,6 @@ export class ArmAuthenticator implements IAuthenticator {
             return false;
         }
 
-        const parsedToken = AccessToken.parse(accessToken);
-
-        if (!parsedToken) {
-            return false;
-        }
-
-        return !parsedToken.isExpired();
+        return !accessToken.isExpired();
     }
 }

src/services/armService.ts

@@ -17,7 +17,7 @@ export class AzureResourceManagementService {
      */
     public async getServiceDescription(): Promise<ServiceDescriptionContract> {
         const managementApiUrl = await this.settingsProvider.getSetting<string>(Constants.SettingNames.managementApiUrl);
-        const armAccessToken = await this.authenticator.getAccessToken();
+        const armAccessToken = await this.authenticator.getAccessTokenAsString();
 
         const serviceDescriptionResponse = await this.httpClient.send<ServiceDescriptionContract>({
             url: `${managementApiUrl}?api-version=${Constants.managementApiVersion}`,
@@ -36,7 +36,7 @@ export class AzureResourceManagementService {
      */
     public async getUserAccessToken(userName: string): Promise<string> {
         const managementApiUrl = await this.settingsProvider.getSetting<string>(Constants.SettingNames.managementApiUrl);
-        const armAccessToken = await this.authenticator.getAccessToken();
+        const armAccessToken = await this.authenticator.getAccessTokenAsString();
         const exp = new Date(new Date().valueOf() + 60 * 60 * 1000);
 
         const userTokenResponse = await this.httpClient.send<ServiceDescriptionContract>({

webpack.designer.js

@@ -63,12 +63,11 @@ const designerConfig = {
         }),
         new CopyWebpackPlugin({
             patterns: [
-                { from: `./scripts/data.json`, to: "editors/themes/default.json" },
                 { from: `./src/themes/designer/assets/index.html`, to: "index.html" },
                 { from: `./src/themes/designer/styles/fonts`, to: "editors/styles/fonts" },
                 { from: `./src/libraries`, to: "data" },
                 { from: `./scripts.v3/data.json`, to: "editors/themes/default.json" },
-                { from: "./src/config.design.json", to: "config.json" }
+                { from: "./src/config.design.json" },
                 { from: "./src/config.runtime.json" }
             ]
         })