@scayle/storefront-nuxt 7.48.1 → 7.49.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @scayle/storefront-nuxt
 
+## 7.49.0
+
+### Minor Changes
+
+- Support `Response` returns in RPC methods
+- Handle 401 from CO and delete session
+
+### Patch Changes
+
+- Updated dependencies
+  - @scayle/storefront-core@7.36.0
+
+## 7.48.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @scayle/storefront-core@7.35.0
+
 ## 7.48.1
 
 ### Patch Changes

package/dist/index.mjs

@@ -1,2 +1,3 @@
 export { rpcCall } from './rpc.mjs';
 export * from '@scayle/storefront-core';
+import '@scayle/storefront-core/dist/utils/response';

package/dist/module.json

@@ -4,5 +4,5 @@
   "compatibility": {
     "nuxt": "^3.7.0"
   },
-  "version": "7.48.0"
+  "version": "7.48.2"
 }

package/dist/rpc.d.mts

@@ -9,6 +9,6 @@ import 'unstorage';
  * It makes an HTTP request on the client and direct call on the server using $fetch
  * https://nuxt.com/docs/api/utils/dollarfetch
  */
-declare const rpcCall: <N extends RpcMethodName, P extends RpcMethodParameters<N>, TResult extends Awaited<RpcMethodReturnType<N>>, TakesParameters = P extends RpcContext ? undefined : boolean>(nuxtApp: NuxtApp, method: N, shop: PublicShopConfig) => TakesParameters extends undefined ? () => Promise<TResult> : (params: P) => Promise<TResult>;
+declare const rpcCall: <N extends RpcMethodName, P extends RpcMethodParameters<N>, TResult extends Exclude<Awaited<RpcMethodReturnType<N>>, Response>, TakesParameters = P extends RpcContext ? undefined : boolean>(nuxtApp: NuxtApp, method: N, shop: PublicShopConfig) => TakesParameters extends undefined ? () => Promise<TResult> : (params: P) => Promise<TResult>;
 
 export { rpcCall };

package/dist/rpc.d.ts

@@ -9,6 +9,6 @@ import 'unstorage';
  * It makes an HTTP request on the client and direct call on the server using $fetch
  * https://nuxt.com/docs/api/utils/dollarfetch
  */
-declare const rpcCall: <N extends RpcMethodName, P extends RpcMethodParameters<N>, TResult extends Awaited<RpcMethodReturnType<N>>, TakesParameters = P extends RpcContext ? undefined : boolean>(nuxtApp: NuxtApp, method: N, shop: PublicShopConfig) => TakesParameters extends undefined ? () => Promise<TResult> : (params: P) => Promise<TResult>;
+declare const rpcCall: <N extends RpcMethodName, P extends RpcMethodParameters<N>, TResult extends Exclude<Awaited<RpcMethodReturnType<N>>, Response>, TakesParameters = P extends RpcContext ? undefined : boolean>(nuxtApp: NuxtApp, method: N, shop: PublicShopConfig) => TakesParameters extends undefined ? () => Promise<TResult> : (params: P) => Promise<TResult>;
 
 export { rpcCall };

package/dist/rpc.mjs

@@ -1,3 +1,5 @@
+import { unwrap } from '@scayle/storefront-core/dist/utils/response';
+
 const rpcCall = (nuxtApp, method, shop) => {
   const fetch = nuxtApp.ssrContext?.event.$fetch ?? $fetch;
   return async (params = void 0) => {
@@ -11,7 +13,7 @@ const rpcCall = (nuxtApp, method, shop) => {
         "x-shop-id": shop.shopId.toString()
       }
     });
-    return data;
+    return await unwrap(data);
   };
 };
 

package/dist/runtime/composables/core/useRpc.d.ts

@@ -7,7 +7,7 @@ export interface RpcOptions {
     lazy?: boolean;
 }
 export type Status = 'idle' | 'pending' | 'success' | 'error';
-export declare const useRpc: <N extends RpcMethodName, P extends RpcMethodParameters<N>, TResult extends Awaited<RpcMethodReturnType<N>>, TParams = P extends RpcContext ? undefined : P>(method: N, key: string, params?: any, options?: RpcOptions) => Promise<{
+export declare const useRpc: <N extends RpcMethodName, P extends RpcMethodParameters<N>, TResult extends Exclude<Awaited<RpcMethodReturnType<N>>, Response>, TParams = P extends RpcContext ? undefined : P>(method: N, key: string, params?: any, options?: RpcOptions) => Promise<{
     data: import("vue").Ref<TResult>;
     fetching: import("vue").Ref<boolean>;
     fetch: () => Promise<void>;

package/dist/runtime/composables/core/useRpc.mjs

@@ -1,3 +1,4 @@
+import { unwrap } from "@scayle/storefront-core/dist/utils/response";
 import { useNuxtApp, useState, createError } from "nuxt/app";
 import { useCoreLog } from "../useCoreLog.mjs";
 import { resolveError } from "../../error/handler.mjs";
@@ -33,17 +34,19 @@ export const useRpc = async (method, key, params, options = { autoFetch: true, l
       fetching.value = true;
       const apiBasePath = currentShop.value?.apiBasePath ?? "/api";
       const fetch2 = getFetch(nuxtApp, log);
-      data.value = await fetch2(`/rpc/${method}`, {
-        // @ts-ignore
-        method: "POST",
-        body: {
-          payload: toValue(params)
-        },
-        baseURL: apiBasePath,
-        headers: {
-          "x-shop-id": currentShop.value?.shopId + ""
-        }
-      });
+      data.value = await unwrap(
+        await fetch2(`/rpc/${method}`, {
+          // @ts-ignore
+          method: "POST",
+          body: {
+            payload: toValue(params)
+          },
+          baseURL: apiBasePath,
+          headers: {
+            "x-shop-id": currentShop.value?.shopId + ""
+          }
+        })
+      );
     } catch (e) {
       error.value = handleError(e);
     } finally {

package/dist/runtime/composables/core/useSession.d.ts

@@ -8,7 +8,9 @@ export declare function useSession(): {
     revokeToken: () => Promise<{
         result: boolean;
     }>;
-    forgetPassword: (params: import("@scayle/storefront-core").SendResetPasswordEmailRequest) => Promise<{
+    forgetPassword: (params: {
+        email: string;
+    }) => Promise<{
         success: boolean;
     }>;
     resetPasswordByHash: (params: import("utility-types").Optional<import("@scayle/storefront-core").UpdatePasswordByHashRequest, "shop_id">) => Promise<undefined>;

package/dist/runtime/error/handler.d.ts

@@ -1,5 +1,5 @@
 declare const resolveError: (error: Error | unknown) => {
-    statusCode: 401 | 500 | 400 | 100 | 101 | 102 | 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207 | 208 | 226 | 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451 | 501 | 502 | 503 | 504 | 505 | 506 | 507 | 508 | 510 | 511;
+    statusCode: 500 | 401 | 400 | 100 | 101 | 102 | 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207 | 208 | 226 | 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 421 | 422 | 423 | 424 | 426 | 428 | 429 | 431 | 451 | 501 | 502 | 503 | 504 | 505 | 506 | 507 | 508 | 510 | 511;
     statusMessage: string;
     name: string;
 };

package/dist/runtime/handler.d.ts

@@ -5,4 +5,4 @@ import type { RpcContext, RpcMethodName, RpcMethodParameters, RpcMethodReturnTyp
  * @param payload
  * @param rpcContext
  */
-export declare const handler: <N extends RpcMethodName, P extends RpcMethodParameters<N>, TResult extends Awaited<RpcMethodReturnType<N>>, TakesParameters = P extends RpcContext ? undefined : boolean, TParams = TakesParameters extends undefined ? null : P>(method: N, payload: TParams, rpcContext: RpcContext) => Promise<TResult>;
+export declare const handler: <N extends RpcMethodName, P extends RpcMethodParameters<N>, TResult extends Awaited<RpcMethodReturnType<N>>, TakesParameters = P extends RpcContext ? undefined : boolean, TParams = TakesParameters extends undefined ? null : P>(method: N, payload: TParams, rpcContext: RpcContext) => Promise<TResult | Response>;

package/dist/runtime/handler.mjs

@@ -11,14 +11,24 @@ export const handler = async (method, payload, rpcContext) => {
   const log = rpcContext.log.space("sfc").space("rpc");
   return await log.time(`Calling RPC method: ${method}`, async () => {
     const fun = rpcMethods[method];
-    if (fun.length === 1) {
+    try {
+      if (fun.length === 1) {
+        return await fun(
+          rpcContext
+        );
+      }
       return await fun(
+        payload,
         rpcContext
       );
+    } catch (e) {
+      if (e instanceof Error) {
+        return new Response(JSON.stringify({ message: e.message }), {
+          status: 500
+        });
+      } else {
+        return new Response(null, { status: 500 });
+      }
     }
-    return await fun(
-      payload,
-      rpcContext
-    );
   });
 };

package/dist/runtime/rpc/rpcCall.d.ts

@@ -6,4 +6,4 @@ import type { PublicShopConfig } from '../../types/module';
  * It makes an HTTP request on the client and direct call on the server using $fetch
  * https://nuxt.com/docs/api/utils/dollarfetch
  */
-export declare const rpcCall: <N extends RpcMethodName, P extends RpcMethodParameters<N>, TResult extends Awaited<RpcMethodReturnType<N>>, TakesParameters = P extends RpcContext ? undefined : boolean>(nuxtApp: NuxtApp, method: N, shop: PublicShopConfig) => TakesParameters extends undefined ? () => Promise<TResult> : (params: P) => Promise<TResult>;
+export declare const rpcCall: <N extends RpcMethodName, P extends RpcMethodParameters<N>, TResult extends Exclude<Awaited<RpcMethodReturnType<N>>, Response>, TakesParameters = P extends RpcContext ? undefined : boolean>(nuxtApp: NuxtApp, method: N, shop: PublicShopConfig) => TakesParameters extends undefined ? () => Promise<TResult> : (params: P) => Promise<TResult>;

package/dist/runtime/rpc/rpcCall.mjs

@@ -1,3 +1,4 @@
+import { unwrap } from "@scayle/storefront-core/dist/utils/response";
 export const rpcCall = (nuxtApp, method, shop) => {
   const fetch = nuxtApp.ssrContext?.event.$fetch ?? $fetch;
   return async (params = void 0) => {
@@ -11,6 +12,6 @@ export const rpcCall = (nuxtApp, method, shop) => {
         "x-shop-id": shop.shopId.toString()
       }
     });
-    return data;
+    return await unwrap(data);
   };
 };

package/dist/runtime/server/middleware/bootstrap.mjs

@@ -1,5 +1,5 @@
 import { defineEventHandler, getRequestURL } from "h3";
-import { createRemoteJWKSet, decodeJwt } from "jose";
+import { decodeJwt } from "jose";
 import { randomUUID } from "uncrypto";
 import { useSession } from "@scayle/h3-session";
 import { buildContext } from "../../context.mjs";
@@ -9,7 +9,6 @@ import {
   getCurrentShopForRequest,
   getPublicShopData
 } from "./bootstrap.utils.mjs";
-import { useOauth } from "./oauth.mjs";
 import { useRedirects } from "./redirects.mjs";
 import { useRuntimeConfig } from "#imports";
 const getShopConfig = (event, config) => {
@@ -20,26 +19,6 @@ const getShopConfig = (event, config) => {
   );
   return $shopConfig;
 };
-async function handleOauth(event, storefrontConfig, log) {
-  if (!storefrontConfig.oauth.apiHost) {
-    log.error("oauth.apiHost must be set in the module options.");
-    return false;
-  }
-  if (!storefrontConfig.oauth.clientId) {
-    log.error("oauth.clientId must be set in the module options.");
-    return false;
-  }
-  if (!storefrontConfig.oauth.clientSecret) {
-    log.error("oauth.clientSecret must be set in the module options.");
-    return false;
-  }
-  const authURL = storefrontConfig.oauth.apiHost;
-  const JWKS = createRemoteJWKSet(new URL("/.well-known/jwks.json", authURL), {
-    cacheMaxAge: 5 * 60 * 1e3
-    // Cache Keys for 5 minutes.
-  });
-  await useOauth(event, JWKS);
-}
 async function bootstrap(event, url, $shopConfig, $storefrontConfig, apiBasePath, config) {
   const log = event.context.$log;
   const bootstrapLog = log.space("bootstrap");
@@ -129,7 +108,6 @@ export default defineEventHandler(async (event) => {
     }
     const $shopConfig = getShopConfig(event, config);
     const apiBasePath = ($storefrontConfig.shopSelector === "path" && $shopConfig.path ? `/${$shopConfig.path}` : "") + ($shopConfig.apiBasePath || $storefrontConfig.apiBasePath || "/api");
-    const log = event.context.$log;
     if (!event.context.$rpcContext) {
       await bootstrap(
         event,
@@ -143,7 +121,6 @@ export default defineEventHandler(async (event) => {
     if ($storefrontConfig.redirects?.enabled && !url.pathname.startsWith(apiBasePath)) {
       await useRedirects(event);
     }
-    await handleOauth(event, $storefrontConfig, log);
   } catch (e) {
     console.error(e);
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@scayle/storefront-nuxt",
   "type": "module",
-  "version": "7.48.1",
+  "version": "7.49.0",
   "description": "Nuxt integration for the SCAYLE Commerce Engine and Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -62,12 +62,12 @@
   "dependencies": {
     "@nuxt/kit": "3.8.2",
     "@scayle/h3-session": "0.3.4",
-    "@scayle/storefront-core": "7.34.1",
+    "@scayle/storefront-core": "7.36.0",
     "@scayle/unstorage-compression-driver": "0.1.1",
     "@vueuse/core": "10.7.1",
     "consola": "3.2.3",
     "core-js": "3.35.0",
-    "defu": "6.1.3",
+    "defu": "6.1.4",
     "h3": "1.9.0",
     "jose": "4.15.4",
     "knitwork": "1.0.0",
@@ -85,14 +85,14 @@
     "@nuxt/test-utils": "3.9.0",
     "@scayle/eslint-config-storefront": "3.2.6",
     "@scayle/prettier-config-storefront": "2.0.2",
-    "@types/node": "20.10.6",
+    "@types/node": "20.10.7",
     "eslint": "8.56.0",
     "eslint-formatter-gitlab": "5.1.0",
     "node-mocks-http": "1.14.1",
     "nuxt": "3.8.2",
     "prettier": "3.0.0",
     "publint": "0.2.7",
-    "vitest": "1.1.1",
+    "vitest": "1.1.3",
     "vue-tsc": "1.8.27"
   },
   "peerDependencies": {

package/dist/runtime/server/middleware/oauth.d.ts

@@ -1,3 +0,0 @@
-import { H3Event } from 'h3';
-import type { JWTVerifyGetKey } from 'jose';
-export declare function useOauth(event: H3Event, jwks: JWTVerifyGetKey): Promise<void>;

package/dist/runtime/server/middleware/oauth.mjs

@@ -1,112 +0,0 @@
-import { errors as joseErrors, jwtVerify } from "jose";
-import { rpcMethods } from "@scayle/storefront-core";
-async function updateSession(event, data) {
-  const session = event.context.session;
-  Object.assign(session.data, data);
-  await session.save();
-}
-const updateUser = async (event) => {
-  const session = event.context.session;
-  const user = await rpcMethods.fetchUser(
-    { accessToken: session.data.accessToken, callback: "" },
-    event.context.$rpcContext
-  );
-  await updateSession(event, {
-    user
-  });
-};
-const updateAccessTokenWithRefreshToken = async (event, sessionData, log) => {
-  if (!sessionData?.refreshToken) {
-    return false;
-  }
-  try {
-    const context = event.context.$rpcContext;
-    const { success } = await rpcMethods.refreshAccessToken(context);
-    if (!success) {
-      await revokeTokensAndDestroySession(event, log);
-      return true;
-    }
-    try {
-      await updateUser(event);
-      return true;
-    } catch (e) {
-      log.error("api/oauth/me", {
-        message: "fetching user failed",
-        error: e
-      });
-    }
-  } catch (e) {
-    log.error("v1/oauth/token", {
-      message: "refresh access token failed, so the local tokens were deleted",
-      error: e
-    });
-  }
-  return false;
-};
-const revokeTokensAndDestroySession = async (event, log) => {
-  log.debug("revokeTokensAndDestroySession");
-  const context = event.context.$rpcContext;
-  try {
-    await rpcMethods.oauthRevokeToken(context);
-  } catch (e) {
-    log.error("v1/oauth/tokens", {
-      message: "error when revoking an access token",
-      error: e
-    });
-  } finally {
-    await context.destroySession();
-  }
-};
-const updateSessionWithUser = async (event, sessionData, log) => {
-  try {
-    const user = await rpcMethods.fetchUser(
-      { accessToken: sessionData.accessToken, callback: "" },
-      event.context.$rpcContext
-    );
-    await updateSession(event, {
-      user
-    });
-  } catch (e) {
-    log.error("api/oauth/me", {
-      message: "fetching user failed",
-      error: e
-    });
-  }
-};
-export async function useOauth(event, jwks) {
-  const context = event.context.$rpcContext;
-  const log = event.context.$rpcContext.log.space("core").space("session");
-  const sessionData = event.context.session.data;
-  log.debug("validating oauth");
-  if (!sessionData?.accessToken && !sessionData?.refreshToken) {
-    log.debug("no tokens saved on session; skipping validation");
-    return;
-  }
-  if (!sessionData?.accessToken) {
-    log.debug("destroying session");
-    await context.destroySession();
-    return;
-  }
-  try {
-    log.debug("validating existing session");
-    await jwtVerify(sessionData.accessToken, jwks, { clockTolerance: 5 });
-    if (!sessionData?.user) {
-      log.debug("updating user session");
-      await updateSessionWithUser(event, sessionData, log);
-    }
-    return;
-  } catch (e) {
-    log.debug("error validating session");
-    if (e instanceof joseErrors.JWTExpired) {
-      log.debug("token expired");
-      const wasTokenSuccessfullyRefreshed = await updateAccessTokenWithRefreshToken(event, sessionData, log);
-      if (wasTokenSuccessfullyRefreshed) {
-        log.debug("token successfully refreshed");
-        return;
-      }
-    }
-    log.error("Could not verify JWT", e);
-  }
-  log.debug("revoking token and destroying session");
-  await revokeTokensAndDestroySession(event, log);
-}