@wix/essentials 0.1.4 → 0.1.6

package/build/auth.d.ts

@@ -1,2 +1,21 @@
 import { RESTFunctionDescriptor } from '@wix/sdk-types';
 export declare function elevate<T extends RESTFunctionDescriptor>(restModule: T): T;
+export declare const getTokenInfo: (() => Promise<{
+    active: boolean;
+    subjectType: 'APP' | 'USER' | 'MEMBER' | 'VISITOR' | 'UNKNOWN';
+    subjectId: string;
+    exp: number;
+    iat: number;
+    clientId?: string | undefined;
+    siteId: string;
+    instanceId?: string | undefined;
+}>) & ((restModuleOpts: import("@wix/sdk-types").HttpClient) => () => Promise<{
+    active: boolean;
+    subjectType: 'APP' | 'USER' | 'MEMBER' | 'VISITOR' | 'UNKNOWN';
+    subjectId: string;
+    exp: number;
+    iat: number;
+    clientId?: string | undefined;
+    siteId: string;
+    instanceId?: string | undefined;
+}>);

package/build/auth.js

@@ -2,3 +2,21 @@ import { createRESTModule } from '@wix/sdk-runtime/rest-modules';
 export function elevate(restModule) {
     return createRESTModule(restModule, true);
 }
+export const getTokenInfo = createRESTModule((restModuleOpts) => {
+    return async () => {
+        if (!restModuleOpts.getActiveToken) {
+            throw new Error('Unable to get the currently active token. Please make sure you are using an authentication strategy that supports this operation.');
+        }
+        const res = await restModuleOpts.fetchWithAuth('https://www.wixapis.com/oauth2/token-info', {
+            method: 'POST',
+            body: JSON.stringify({ token: restModuleOpts.getActiveToken() }),
+            headers: {
+                'Content-Type': 'application/json',
+            },
+        });
+        if (!res.ok) {
+            throw new Error(`Failed to fetch token info: ${res.status} - ${res.statusText}. ${await res.text()}`);
+        }
+        return res.json();
+    };
+});

package/build/http-client.d.ts

@@ -28,12 +28,3 @@ export type TypedQueryInput<Result = {
      */
     __ensureTypesOfVariablesAndResultMatching?: (variables: Variables) => Result;
 };
-export declare class FetchErrorResponse extends Error {
-    readonly message: string;
-    readonly response: Response;
-    constructor(message: string, response: Response);
-    details(): Promise<{
-        details: any;
-        message: string;
-    }>;
-}

package/build/http-client.js

@@ -7,48 +7,15 @@ export const graphql = createRESTModule(((restModuleOpts) => {
     return async function graphql(query, variables, opts = {
         apiVersion: 'alpha',
     }) {
-        const res = await restModuleOpts.wixAPIFetch(`/graphql/${opts.apiVersion}`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({ query, variables }),
+        const result = await restModuleOpts.request(({ host }) => {
+            const basePath = host === 'www.wixapis.com' ? '/graphql' : '/_api/graphql';
+            return {
+                method: 'POST',
+                url: `${basePath}/${opts.apiVersion}`,
+                data: { query, variables },
+                packageName: '@wix/essentials',
+            };
         });
-        if (res.status !== 200) {
-            throw new FetchErrorResponse(`GraphQL request failed with status ${res.status}`, res);
-        }
-        const { data, errors } = await res.json();
-        return { data: data ?? {}, errors };
+        return result.data;
     };
 }));
-export class FetchErrorResponse extends Error {
-    message;
-    response;
-    constructor(message, response) {
-        super(message);
-        this.message = message;
-        this.response = response;
-    }
-    async details() {
-        const dataError = await this.response.json();
-        return errorBuilder(this.response.status, dataError?.message, dataError?.details, {
-            requestId: this.response.headers.get('X-Wix-Request-Id'),
-            details: dataError,
-        });
-    }
-}
-const errorBuilder = (code, description, details, data) => {
-    return {
-        details: {
-            ...(!details?.validationError && {
-                applicationError: {
-                    description,
-                    code,
-                    data,
-                },
-            }),
-            ...details,
-        },
-        message: description,
-    };
-};

package/cjs/build/auth.d.ts

@@ -1,2 +1,21 @@
 import { RESTFunctionDescriptor } from '@wix/sdk-types';
 export declare function elevate<T extends RESTFunctionDescriptor>(restModule: T): T;
+export declare const getTokenInfo: (() => Promise<{
+    active: boolean;
+    subjectType: 'APP' | 'USER' | 'MEMBER' | 'VISITOR' | 'UNKNOWN';
+    subjectId: string;
+    exp: number;
+    iat: number;
+    clientId?: string | undefined;
+    siteId: string;
+    instanceId?: string | undefined;
+}>) & ((restModuleOpts: import("@wix/sdk-types").HttpClient) => () => Promise<{
+    active: boolean;
+    subjectType: 'APP' | 'USER' | 'MEMBER' | 'VISITOR' | 'UNKNOWN';
+    subjectId: string;
+    exp: number;
+    iat: number;
+    clientId?: string | undefined;
+    siteId: string;
+    instanceId?: string | undefined;
+}>);

package/cjs/build/auth.js

@@ -1,8 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.elevate = void 0;
+exports.getTokenInfo = exports.elevate = void 0;
 const rest_modules_1 = require("@wix/sdk-runtime/rest-modules");
 function elevate(restModule) {
     return (0, rest_modules_1.createRESTModule)(restModule, true);
 }
 exports.elevate = elevate;
+exports.getTokenInfo = (0, rest_modules_1.createRESTModule)((restModuleOpts) => {
+    return async () => {
+        if (!restModuleOpts.getActiveToken) {
+            throw new Error('Unable to get the currently active token. Please make sure you are using an authentication strategy that supports this operation.');
+        }
+        const res = await restModuleOpts.fetchWithAuth('https://www.wixapis.com/oauth2/token-info', {
+            method: 'POST',
+            body: JSON.stringify({ token: restModuleOpts.getActiveToken() }),
+            headers: {
+                'Content-Type': 'application/json',
+            },
+        });
+        if (!res.ok) {
+            throw new Error(`Failed to fetch token info: ${res.status} - ${res.statusText}. ${await res.text()}`);
+        }
+        return res.json();
+    };
+});

package/cjs/build/http-client.d.ts

@@ -28,12 +28,3 @@ export type TypedQueryInput<Result = {
      */
     __ensureTypesOfVariablesAndResultMatching?: (variables: Variables) => Result;
 };
-export declare class FetchErrorResponse extends Error {
-    readonly message: string;
-    readonly response: Response;
-    constructor(message: string, response: Response);
-    details(): Promise<{
-        details: any;
-        message: string;
-    }>;
-}

package/cjs/build/http-client.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FetchErrorResponse = exports.graphql = exports.fetchWithAuth = void 0;
+exports.graphql = exports.fetchWithAuth = void 0;
 const rest_modules_1 = require("@wix/sdk-runtime/rest-modules");
 exports.fetchWithAuth = (0, rest_modules_1.createRESTModule)((restModuleOpts) => {
     return ((url, options) => restModuleOpts.fetchWithAuth(url, options));
@@ -10,49 +10,15 @@ exports.graphql = (0, rest_modules_1.createRESTModule)(((restModuleOpts) => {
     return async function graphql(query, variables, opts = {
         apiVersion: 'alpha',
     }) {
-        const res = await restModuleOpts.wixAPIFetch(`/graphql/${opts.apiVersion}`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({ query, variables }),
+        const result = await restModuleOpts.request(({ host }) => {
+            const basePath = host === 'www.wixapis.com' ? '/graphql' : '/_api/graphql';
+            return {
+                method: 'POST',
+                url: `${basePath}/${opts.apiVersion}`,
+                data: { query, variables },
+                packageName: '@wix/essentials',
+            };
         });
-        if (res.status !== 200) {
-            throw new FetchErrorResponse(`GraphQL request failed with status ${res.status}`, res);
-        }
-        const { data, errors } = await res.json();
-        return { data: data ?? {}, errors };
+        return result.data;
     };
 }));
-class FetchErrorResponse extends Error {
-    message;
-    response;
-    constructor(message, response) {
-        super(message);
-        this.message = message;
-        this.response = response;
-    }
-    async details() {
-        const dataError = await this.response.json();
-        return errorBuilder(this.response.status, dataError?.message, dataError?.details, {
-            requestId: this.response.headers.get('X-Wix-Request-Id'),
-            details: dataError,
-        });
-    }
-}
-exports.FetchErrorResponse = FetchErrorResponse;
-const errorBuilder = (code, description, details, data) => {
-    return {
-        details: {
-            ...(!details?.validationError && {
-                applicationError: {
-                    description,
-                    code,
-                    data,
-                },
-            }),
-            ...details,
-        },
-        message: description,
-    };
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/essentials",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "license": "UNLICENSED",
   "main": "cjs/build/index.js",
   "module": "build/index.mjs",
@@ -22,7 +22,7 @@
   },
   "scripts": {
     "build": "tsc && tsc --project tsconfig.cjs.json",
-    "test": ":",
+    "test": "vitest",
     "lint": "eslint --max-warnings=0 .",
     "lint:fix": "eslint --max-warnings=0 . --fix",
     "typecheck": "tsc --noEmit"
@@ -31,8 +31,8 @@
     "*.{js,ts}": "yarn lint"
   },
   "dependencies": {
-    "@wix/sdk-runtime": "^0.3.17",
-    "@wix/sdk-types": "^1.10.0"
+    "@wix/sdk-runtime": "^0.3.19",
+    "@wix/sdk-types": "^1.12.0"
   },
   "optionalDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
@@ -41,13 +41,13 @@
     "@types/is-ci": "^3.0.4",
     "@types/node": "^20.10.6",
     "@vitest/ui": "^1.5.0",
-    "@wix/sdk-runtime": "0.3.17",
+    "@wix/sdk": "1.12.14",
     "eslint": "^8.56.0",
     "eslint-config-sdk": "0.0.0",
     "graphql": "^16.8.0",
     "is-ci": "^3.0.1",
     "jsdom": "^22.1.0",
-    "msw": "^2.0.12",
+    "msw": "^2.4.5",
     "typescript": "^5.3.3",
     "vitest": "^1.5.0",
     "vitest-teamcity-reporter": "^0.3.0"
@@ -69,5 +69,5 @@
       ]
     }
   },
-  "falconPackageHash": "afe157abb030ac5b0c147efaf2957e520b3b7f5aa49be3305c4bb5c5"
+  "falconPackageHash": "31bf6b618b6d87c3608612f6081ce2043607fa9e92701cc38acb0f51"
 }