refactoring; fixing tests for power pages #157

Author: AleksandrRogov

src/client/RequestClient.ts

@@ -93,19 +93,11 @@ export class RequestClient {
         }
 
         if (token) {
-            if (!request.headers) {
-                request.headers = {};
-            }
-            request.headers["Authorization"] = "Bearer " + (token.hasOwnProperty("accessToken") ? (token as AccessToken).accessToken : token);
+            request.headers!["Authorization"] = "Bearer " + (token.hasOwnProperty("accessToken") ? (token as AccessToken).accessToken : token);
         }
 
         if (Utility.isRunningWithinPortals()) {
-            try {
-                const token = await (window as any).shell.getTokenDeferred();
-                request.headers["__RequestVerificationToken"] = token;
-            } catch (error) {
-                throw new Error("Unable to fetch token from shell. Error: " + (error as Error)?.message);
-            }
+            request.headers!["__RequestVerificationToken"] = await global.window.shell!.getTokenDeferred();
         }
 
         const url = request.apiConfig ? request.apiConfig.url : config.dataApi.url;

src/types.ts

@@ -167,3 +167,11 @@ export declare namespace Core {
         async?: boolean;
     }
 }
+
+declare global {
+    interface Window {
+        shell?: {
+            getTokenDeferred: () => Promise<string>;
+        };
+    }
+}

src/utils/Utility.ts

@@ -162,7 +162,7 @@ export class Utility {
      * @returns {boolean}
      */
     static isRunningWithinPortals(): boolean {
-        return global.DWA_BROWSER ? !!(global.window as any).shell : false;
+        return global.DWA_BROWSER ? !!global.window.shell : false;
     }
 
     static isObject(obj: any): boolean {

tests/xhr.spec.ts

@@ -126,7 +126,11 @@ describe("xhr -", () => {
                 };
 
                 //@ts-ignore
-                global.window.shell = {};
+                global.window.shell = {
+                    getTokenDeferred: async () => {
+                        return "token";
+                    },
+                };
                 //@ts-ignore
                 global.window.location = {};
                 //@ts-ignore
@@ -177,6 +181,10 @@ describe("xhr -", () => {
                 expect(requests[0].requestBody).to.be.undefined;
             });
 
+            it("sends the correct __RequestVerificationToken header", function () {
+                expect(requests[0].requestHeaders["__RequestVerificationToken"]).to.be.eq("token");
+            });
+
             it("sends the correct If-Match header", function () {
                 expect(requests[0].requestHeaders["If-Match"]).to.be.undefined;
             });