@wix/sdk 1.17.6 → 1.17.7

package/build/event-handlers-modules.d.ts

@@ -47,7 +47,7 @@ export type EventHandlersClient = Emitter<{
         }, 'AppRemoved'>;
     };
 };
-export declare function eventHandlersModules(authStrategy: AuthenticationStrategy<any>): {
+export declare function eventHandlersModules(getAuthStrategy: () => AuthenticationStrategy<any>): {
     initModule(eventDefinition: EventDefinition<any, string>): (handler: EventHandler<EventDefinition<any, string>>) => void;
     client: EventHandlersClient;
 };

package/build/event-handlers-modules.js

@@ -73,7 +73,7 @@ function runHandler(eventDefinition, handler, payload, baseEventMetadata) {
     }
     return handler(transformFromRESTFn(originalEnvelope));
 }
-export function eventHandlersModules(authStrategy) {
+export function eventHandlersModules(getAuthStrategy) {
     const eventHandlers = new Map();
     const webhooksEmitter = createNanoEvents();
     const client = {
@@ -110,6 +110,7 @@ export function eventHandlersModules(authStrategy) {
             return this.process(body, opts);
         },
         async parseJWT(jwt) {
+            const authStrategy = getAuthStrategy();
             if (!authStrategy.decodeJWT) {
                 throw new Error('decodeJWT is not supported by the authentication strategy');
             }

package/build/service-plugin-modules.d.ts

@@ -26,7 +26,7 @@ export type ServicePluginsClient = Emitter<{
     parseRequest(request: Request): Promise<ServicePluginRequest>;
     executeHandler(servicePluginRequest: ServicePluginRequest, url: string): Promise<UnknownServicePluginResponse>;
 };
-export declare function servicePluginsModules(authStrategy: AuthenticationStrategy<any>): {
+export declare function servicePluginsModules(getAuthStrategy: () => AuthenticationStrategy<any>): {
     initModule<T extends ServicePluginDefinition<any>>(servicePluginDefinition: T): (implementation: T["__contract"]) => void;
     client: ServicePluginsClient;
 };

package/build/service-plugin-modules.js

@@ -1,12 +1,13 @@
 import { createNanoEvents } from './nanoevents.js';
 export const isServicePluginModule = (val) => val.__type === 'service-plugin-definition';
-export function servicePluginsModules(authStrategy) {
+export function servicePluginsModules(getAuthStrategy) {
     const servicePluginsImplementations = new Map();
     const servicePluginsEmitter = createNanoEvents();
     const client = {
         ...servicePluginsEmitter,
         getRegisteredServicePlugins: () => servicePluginsImplementations,
         async parseJWT(jwt) {
+            const authStrategy = getAuthStrategy();
             if (!authStrategy.decodeJWT) {
                 throw new Error('decodeJWT is not supported by the authentication strategy');
             }

package/build/wixClient.d.ts

@@ -50,7 +50,7 @@ export type WixClient<H extends Host<any> | undefined = undefined, Z extends Aut
 } & BuildDescriptors<T, H>;
 export declare function createClient<H extends Host<any> | undefined = undefined, Z extends AuthenticationStrategy<H> = AuthenticationStrategy<H>, T extends Descriptors = EmptyObject>(config: {
     modules?: H extends Host<any> ? AssertHostMatches<T, H> : T;
-    auth?: Z;
+    auth?: Z | (() => Z);
     headers?: Headers;
     host?: H;
     useCDN?: boolean;

package/build/wixClient.js

@@ -12,12 +12,14 @@ import { runWithoutContext } from '@wix/sdk-runtime/context';
 export const X_WIX_CONSISTENT_HEADER = 'X-Wix-Consistent';
 export function createClient(config) {
     const _headers = config.headers || { Authorization: '' };
-    const authStrategy = config.auth ||
-        {
-            getAuthHeaders: (_) => Promise.resolve({ headers: {} }),
-        };
-    const boundGetAuthHeaders = authStrategy.getAuthHeaders.bind(undefined, config.host);
-    authStrategy.getAuthHeaders = boundGetAuthHeaders;
+    const defaultStrategy = {
+        getAuthHeaders: (_) => Promise.resolve({ headers: {} }),
+    };
+    const auth = config.auth;
+    const getAuthStrategy = typeof auth === 'function' ? auth : () => auth ?? defaultStrategy;
+    const boundGetAuthHeaders = () => {
+        return getAuthStrategy().getAuthHeaders(config.host);
+    };
     const fetchWithAuth = async (urlOrRequest, requestInit) => {
         const authHeaders = await boundGetAuthHeaders();
         const headers = {
@@ -79,8 +81,8 @@ export function createClient(config) {
             throw e;
         }
     };
-    const { client: servicePluginsClient, initModule: initServicePluginModule } = servicePluginsModules(authStrategy);
-    const { client: eventHandlersClient, initModule: initEventHandlerModule } = eventHandlersModules(authStrategy);
+    const { client: servicePluginsClient, initModule: initServicePluginModule } = servicePluginsModules(getAuthStrategy);
+    const { client: eventHandlersClient, initModule: initEventHandlerModule } = eventHandlersModules(getAuthStrategy);
     const boundFetch = async (url, options) => {
         const authHeaders = await boundGetAuthHeaders();
         const defaultContentTypeHeader = getDefaultContentHeader(options);
@@ -125,7 +127,9 @@ export function createClient(config) {
                 return modules;
             }
             const apiBaseUrl = config.host?.apiBaseUrl ?? DEFAULT_API_URL;
-            const shouldUseCDN = config.useCDN === undefined ? config.auth?.shouldUseCDN : config.useCDN;
+            const shouldUseCDN = config.useCDN === undefined
+                ? getAuthStrategy().shouldUseCDN
+                : config.useCDN;
             return buildRESTDescriptor(runWithoutContext(() => isAmbassadorModule(modules))
                 ? toHTTPModule(modules)
                 : modules, metadata ?? {}, boundFetch, config.host?.getErrorHandler?.(), (relativeUrl, fetchOptions) => {
@@ -133,7 +137,7 @@ export function createClient(config) {
                 finalUrl.host = apiBaseUrl;
                 finalUrl.protocol = 'https';
                 return boundFetch(finalUrl.toString(), fetchOptions);
-            }, authStrategy.getActiveToken, { HTTPHost: apiBaseUrl }, config.host?.name, shouldUseCDN);
+            }, getAuthStrategy().getActiveToken, { HTTPHost: apiBaseUrl }, config.host?.name, shouldUseCDN);
         }
         else if (isObject(modules)) {
             return Object.fromEntries(Object.entries(modules).map(([key, value]) => {
@@ -152,6 +156,8 @@ export function createClient(config) {
     const wrappedModules = config.modules
         ? use(config.modules)
         : {};
+    const authStrategy = { ...getAuthStrategy() };
+    authStrategy.getAuthHeaders = boundGetAuthHeaders;
     return {
         ...wrappedModules,
         auth: authStrategy,

package/cjs/build/event-handlers-modules.d.ts

@@ -47,7 +47,7 @@ export type EventHandlersClient = Emitter<{
         }, 'AppRemoved'>;
     };
 };
-export declare function eventHandlersModules(authStrategy: AuthenticationStrategy<any>): {
+export declare function eventHandlersModules(getAuthStrategy: () => AuthenticationStrategy<any>): {
     initModule(eventDefinition: EventDefinition<any, string>): (handler: EventHandler<EventDefinition<any, string>>) => void;
     client: EventHandlersClient;
 };

package/cjs/build/event-handlers-modules.js

@@ -79,7 +79,7 @@ function runHandler(eventDefinition, handler, payload, baseEventMetadata) {
     }
     return handler(transformFromRESTFn(originalEnvelope));
 }
-function eventHandlersModules(authStrategy) {
+function eventHandlersModules(getAuthStrategy) {
     const eventHandlers = new Map();
     const webhooksEmitter = (0, nanoevents_js_1.createNanoEvents)();
     const client = {
@@ -116,6 +116,7 @@ function eventHandlersModules(authStrategy) {
             return this.process(body, opts);
         },
         async parseJWT(jwt) {
+            const authStrategy = getAuthStrategy();
             if (!authStrategy.decodeJWT) {
                 throw new Error('decodeJWT is not supported by the authentication strategy');
             }

package/cjs/build/service-plugin-modules.d.ts

@@ -26,7 +26,7 @@ export type ServicePluginsClient = Emitter<{
     parseRequest(request: Request): Promise<ServicePluginRequest>;
     executeHandler(servicePluginRequest: ServicePluginRequest, url: string): Promise<UnknownServicePluginResponse>;
 };
-export declare function servicePluginsModules(authStrategy: AuthenticationStrategy<any>): {
+export declare function servicePluginsModules(getAuthStrategy: () => AuthenticationStrategy<any>): {
     initModule<T extends ServicePluginDefinition<any>>(servicePluginDefinition: T): (implementation: T["__contract"]) => void;
     client: ServicePluginsClient;
 };

package/cjs/build/service-plugin-modules.js

@@ -5,13 +5,14 @@ exports.servicePluginsModules = servicePluginsModules;
 const nanoevents_js_1 = require("./nanoevents.js");
 const isServicePluginModule = (val) => val.__type === 'service-plugin-definition';
 exports.isServicePluginModule = isServicePluginModule;
-function servicePluginsModules(authStrategy) {
+function servicePluginsModules(getAuthStrategy) {
     const servicePluginsImplementations = new Map();
     const servicePluginsEmitter = (0, nanoevents_js_1.createNanoEvents)();
     const client = {
         ...servicePluginsEmitter,
         getRegisteredServicePlugins: () => servicePluginsImplementations,
         async parseJWT(jwt) {
+            const authStrategy = getAuthStrategy();
             if (!authStrategy.decodeJWT) {
                 throw new Error('decodeJWT is not supported by the authentication strategy');
             }

package/cjs/build/wixClient.d.ts

@@ -50,7 +50,7 @@ export type WixClient<H extends Host<any> | undefined = undefined, Z extends Aut
 } & BuildDescriptors<T, H>;
 export declare function createClient<H extends Host<any> | undefined = undefined, Z extends AuthenticationStrategy<H> = AuthenticationStrategy<H>, T extends Descriptors = EmptyObject>(config: {
     modules?: H extends Host<any> ? AssertHostMatches<T, H> : T;
-    auth?: Z;
+    auth?: Z | (() => Z);
     headers?: Headers;
     host?: H;
     useCDN?: boolean;

package/cjs/build/wixClient.js

@@ -16,12 +16,14 @@ const context_1 = require("@wix/sdk-runtime/context");
 exports.X_WIX_CONSISTENT_HEADER = 'X-Wix-Consistent';
 function createClient(config) {
     const _headers = config.headers || { Authorization: '' };
-    const authStrategy = config.auth ||
-        {
-            getAuthHeaders: (_) => Promise.resolve({ headers: {} }),
-        };
-    const boundGetAuthHeaders = authStrategy.getAuthHeaders.bind(undefined, config.host);
-    authStrategy.getAuthHeaders = boundGetAuthHeaders;
+    const defaultStrategy = {
+        getAuthHeaders: (_) => Promise.resolve({ headers: {} }),
+    };
+    const auth = config.auth;
+    const getAuthStrategy = typeof auth === 'function' ? auth : () => auth ?? defaultStrategy;
+    const boundGetAuthHeaders = () => {
+        return getAuthStrategy().getAuthHeaders(config.host);
+    };
     const fetchWithAuth = async (urlOrRequest, requestInit) => {
         const authHeaders = await boundGetAuthHeaders();
         const headers = {
@@ -83,8 +85,8 @@ function createClient(config) {
             throw e;
         }
     };
-    const { client: servicePluginsClient, initModule: initServicePluginModule } = (0, service_plugin_modules_js_1.servicePluginsModules)(authStrategy);
-    const { client: eventHandlersClient, initModule: initEventHandlerModule } = (0, event_handlers_modules_js_1.eventHandlersModules)(authStrategy);
+    const { client: servicePluginsClient, initModule: initServicePluginModule } = (0, service_plugin_modules_js_1.servicePluginsModules)(getAuthStrategy);
+    const { client: eventHandlersClient, initModule: initEventHandlerModule } = (0, event_handlers_modules_js_1.eventHandlersModules)(getAuthStrategy);
     const boundFetch = async (url, options) => {
         const authHeaders = await boundGetAuthHeaders();
         const defaultContentTypeHeader = (0, helpers_js_1.getDefaultContentHeader)(options);
@@ -129,7 +131,9 @@ function createClient(config) {
                 return modules;
             }
             const apiBaseUrl = config.host?.apiBaseUrl ?? common_js_1.DEFAULT_API_URL;
-            const shouldUseCDN = config.useCDN === undefined ? config.auth?.shouldUseCDN : config.useCDN;
+            const shouldUseCDN = config.useCDN === undefined
+                ? getAuthStrategy().shouldUseCDN
+                : config.useCDN;
             return (0, rest_modules_js_1.buildRESTDescriptor)((0, context_1.runWithoutContext)(() => (0, ambassador_modules_js_1.isAmbassadorModule)(modules))
                 ? (0, ambassador_modules_js_1.toHTTPModule)(modules)
                 : modules, metadata ?? {}, boundFetch, config.host?.getErrorHandler?.(), (relativeUrl, fetchOptions) => {
@@ -137,7 +141,7 @@ function createClient(config) {
                 finalUrl.host = apiBaseUrl;
                 finalUrl.protocol = 'https';
                 return boundFetch(finalUrl.toString(), fetchOptions);
-            }, authStrategy.getActiveToken, { HTTPHost: apiBaseUrl }, config.host?.name, shouldUseCDN);
+            }, getAuthStrategy().getActiveToken, { HTTPHost: apiBaseUrl }, config.host?.name, shouldUseCDN);
         }
         else if ((0, helpers_js_1.isObject)(modules)) {
             return Object.fromEntries(Object.entries(modules).map(([key, value]) => {
@@ -156,6 +160,8 @@ function createClient(config) {
     const wrappedModules = config.modules
         ? use(config.modules)
         : {};
+    const authStrategy = { ...getAuthStrategy() };
+    authStrategy.getAuthHeaders = boundGetAuthHeaders;
     return {
         ...wrappedModules,
         auth: authStrategy,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/sdk",
-  "version": "1.17.6",
+  "version": "1.17.7",
   "license": "MIT",
   "author": {
     "name": "Ronny Ringel",
@@ -127,5 +127,5 @@
   "wallaby": {
     "autoDetect": true
   },
-  "falconPackageHash": "25d16bf9f75c7cef263c96b55f2354cca27dc38f4cb230c62b00251f"
+  "falconPackageHash": "56ca4bfad88fe040bd3a7acf7270870a21caf1eac8736de6ef704215"
 }