test: adding tests

Signed-off-by: Pawel Psztyc <jarrodek@gmail.com>

manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "API console extension",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "API Console extension to proxy HTTP requests to the documented API.",
   "author": "Pawel Psztyc <pawel.psztyc@mulesoft.com>",
   "content_scripts": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@advanced-rest-client/api-console-extension",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "API Console extension to proxy HTTP requests to the documented API.",
   "type": "module",
   "main": "index.js",

src/ApiConsoleAppProxy.js

@@ -234,51 +234,40 @@ export class ApiConsoleAppProxy extends EventTarget {
           detail: {
             message: "No response has been recorded.",
             code: "no_response",
+            error: true,
           },
         })
       );
       return;
     }
     const typedError = /** @type IApiConsoleProxyError */ (data);
     if (typedError.error) {
-      const message =
-        typeof typedError.message === "string"
-          ? typedError.message
-          : "No response has been recorded.";
-      const code =
-        typeof typedError.code === "string" ? typedError.code : "unknown_error";
+      const message = typeof typedError.message === "string" ? typedError.message : "No response has been recorded.";
+      const code = typeof typedError.code === "string" ? typedError.code : "unknown_error";
+      const state = typeof typedError.state === "string" ? typedError.state : undefined;
       this.eventTarget.dispatchEvent(
         new CustomEvent("oauth2-error", {
           bubbles: true,
           composed: true,
           detail: {
             message,
             code,
+            state,
+            error: true,
           },
         })
       );
       return;
     }
     const typedToken = /** @type ITokenInfo */ (data);
-    const state =
-      typeof typedToken.state === "string" ? typedToken.state : undefined;
-    const accessToken =
-      typedToken.accessToken && typeof typedToken.accessToken === "string"
-        ? typedToken.accessToken
-        : undefined;
-    const tokenType =
-      typedToken.tokenType && typeof typedToken.tokenType === "string"
-        ? typedToken.tokenType
-        : undefined;
-    const expiresIn =
-      typedToken.expiresIn &&
-      (typeof typedToken.expiresIn === "number" ||
-        typeof typedToken.expiresIn === "string")
-        ? Number(typedToken.expiresIn)
-        : undefined;
-    const scope = Array.isArray(typedToken.scope)
-      ? typedToken.scope
-      : undefined;
+    const state = typeof typedToken.state === "string" ? typedToken.state : undefined;
+    const accessToken = typedToken.accessToken && typeof typedToken.accessToken === "string" ? typedToken.accessToken : undefined;
+    const refreshToken = typedToken.refreshToken && typeof typedToken.refreshToken === "string" ? typedToken.refreshToken : undefined;
+    const tokenType = typedToken.tokenType && typeof typedToken.tokenType === "string" ? typedToken.tokenType : undefined;
+    const expiresIn = typedToken.expiresIn && (typeof typedToken.expiresIn === "number" || typeof typedToken.expiresIn === "string") ? Number(typedToken.expiresIn): undefined;
+    const expiresAt = typedToken.expiresAt && (typeof typedToken.expiresAt === "number" || typeof typedToken.expiresAt === "string") ? Number(typedToken.expiresAt): undefined;
+    const expiresAssumed = typeof typedToken.expiresAssumed === "boolean" ? typedToken.expiresAssumed : undefined;
+    const scope = Array.isArray(typedToken.scope) ? typedToken.scope : undefined;
     this.eventTarget.dispatchEvent(
       new CustomEvent("oauth2-token-response", {
         bubbles: true,
@@ -289,6 +278,9 @@ export class ApiConsoleAppProxy extends EventTarget {
           tokenType,
           expiresIn,
           scope,
+          refreshToken,
+          expiresAt,
+          expiresAssumed,
         },
       })
     );

src/proxy/OAuth2Proxy.js

@@ -250,6 +250,7 @@ export class OAuth2Proxy {
         id: id,
         tab: tab
       };
+      this._addTabHandlers();
     } catch (e) {
       throw new AuthorizationError(
         e.message,
@@ -343,7 +344,7 @@ export class OAuth2Proxy {
     /** @type string */
     let raw;
     try {
-      const raw = this._authDataFromUrl(url);
+      raw = this._authDataFromUrl(url);
       if (!raw) {
         throw new Error('');
       }
@@ -437,6 +438,7 @@ export class OAuth2Proxy {
       let tokenInfo;
       try {
         tokenInfo = await this.exchangeCode(code);
+        tokenInfo.state = state;
       } catch (e) {
         this._handleTokenCodeError(/** @type Error */(e));
         return;

src/proxy/OAuthUtils.js

@@ -59,7 +59,7 @@ export function sanityCheck(settings) {
  */
 export function randomString() {
   const array = new Uint32Array(28);
-  window.crypto.getRandomValues(array);
+  globalThis.crypto.getRandomValues(array);
   return Array.from(array, (dec) => `0${dec.toString(16)}`.substr(-2)).join("");
 }
 
@@ -93,7 +93,7 @@ export function camel(name) {
 export async function sha256(value) {
   const encoder = new TextEncoder();
   const data = encoder.encode(value);
-  return window.crypto.subtle.digest("SHA-256", data);
+  return globalThis.crypto.subtle.digest("SHA-256", data);
 }
 
 /**
@@ -126,7 +126,7 @@ export async function generateCodeChallenge(verifier) {
 export function nonceGenerator(size = 20) {
   const validChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
   let array = new Uint8Array(size);
-  window.crypto.getRandomValues(array);
+  globalThis.crypto.getRandomValues(array);
   array = array.map(x => validChars.charCodeAt(x % validChars.length));
   return String.fromCharCode.apply(null, array);
 }

src/service.js

@@ -51,8 +51,9 @@ class ApiConsoleService {
     } catch (e) {
       this.sendResponse({
         'message': e.message || 'The request is invalid.',
-        'code': 'invalid_request',
-        'error': true
+        'code': e.code || 'invalid_request',
+        'error': true,
+        'state': e.state,
       });
     }
   }

src/types.d.ts

@@ -108,6 +108,7 @@ export interface IApiConsoleProxyError {
   error: true;
   code?: string;
   message: string;
+  state?: string;
 }
 
 export interface IApiConsoleHttpResponseStats {