@scayle/storefront-core 7.38.0 → 7.38.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @scayle/storefront-core
 
+## 7.38.1
+
+### Patch Changes
+
+- Fix potential empty user after login
+
 ## 7.38.0
 
 ### Minor Changes

package/dist/api/customer.cjs

@@ -50,16 +50,16 @@ class CustomerAPIClient {
    * When not logged in will return undefined.
    * @see https://scayle.dev/api/oauth/latest/fetch-authorized-payload
    */
-  async getMe(shopId) {
+  async getMe(shopId, accessToken) {
     const response = await fetch(`${this.baseURL}/api/oauth/me`, {
       headers: {
         ...this.headers,
+        ...(accessToken ? {
+          Authorization: `Bearer ${accessToken}`
+        } : {}),
         "X-Shop-Id": shopId.toString()
       }
     });
-    if (response.status === _httpStatus.HttpStatusCode.FORBIDDEN) {
-      return void 0;
-    }
     return this.handleResponse(response);
   }
   /**

package/dist/api/customer.d.ts

@@ -49,7 +49,7 @@ export declare class CustomerAPIClient {
      * When not logged in will return undefined.
      * @see https://scayle.dev/api/oauth/latest/fetch-authorized-payload
      */
-    getMe(shopId: number): Promise<ShopUser | undefined>;
+    getMe(shopId: number, accessToken?: string): Promise<ShopUser>;
     /**
      * Fetch a customer's order
      * @see https://scayle.dev/api/oauth/latest/fetch-order-by-id

package/dist/api/customer.mjs

@@ -44,16 +44,14 @@ export class CustomerAPIClient {
    * When not logged in will return undefined.
    * @see https://scayle.dev/api/oauth/latest/fetch-authorized-payload
    */
-  async getMe(shopId) {
+  async getMe(shopId, accessToken) {
     const response = await fetch(`${this.baseURL}/api/oauth/me`, {
       headers: {
         ...this.headers,
+        ...accessToken ? { Authorization: `Bearer ${accessToken}` } : {},
         "X-Shop-Id": shopId.toString()
       }
     });
-    if (response.status === HttpStatusCode.FORBIDDEN) {
-      return void 0;
-    }
     return this.handleResponse(response);
   }
   /**

package/dist/rpc/methods/session.cjs

@@ -17,19 +17,16 @@ const convertErrorForRpcCall = (error, httpStatuses) => {
   }
 };
 exports.convertErrorForRpcCall = convertErrorForRpcCall;
-const saveUserOnSession = async (accessToken, context) => {
+async function postLogin(context, tokens) {
   const user = await (0, _user2.fetchUser)({
-    accessToken,
+    accessToken: tokens.access_token,
     callback: ""
   }, context);
-  context.updateUser(user);
-};
-async function postLogin(context, tokens) {
   context.updateTokens({
     accessToken: tokens.access_token,
     refreshToken: tokens.refresh_token
   });
-  await saveUserOnSession(tokens.access_token, context);
+  context.updateUser(user);
   const {
     customerId
   } = (0, _jose.decodeJwt)(tokens.access_token);
@@ -50,7 +47,7 @@ const oauthLogin = async (login, context) => {
     });
     await postLogin(context, tokens);
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_FOUND]);
+    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_FOUND, _constants.HttpStatusCode.FORBIDDEN]);
     if (err) {
       throw err;
     }
@@ -68,7 +65,7 @@ const oauthRegister = async (register, context) => {
     });
     await postLogin(context, tokens);
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT]);
+    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT, _constants.HttpStatusCode.FORBIDDEN]);
     if (err) {
       throw err;
     }
@@ -86,7 +83,7 @@ const oauthGuestLogin = async (guest, context) => {
     });
     await postLogin(context, tokens);
   } catch (error) {
-    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT]);
+    const err = convertErrorForRpcCall(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT, _constants.HttpStatusCode.FORBIDDEN]);
     if (err) {
       throw err;
     }

package/dist/rpc/methods/session.mjs

@@ -10,16 +10,16 @@ export const convertErrorForRpcCall = (error, httpStatuses) => {
     return error;
   }
 };
-const saveUserOnSession = async (accessToken, context) => {
-  const user = await fetchUser({ accessToken, callback: "" }, context);
-  context.updateUser(user);
-};
 async function postLogin(context, tokens) {
+  const user = await fetchUser(
+    { accessToken: tokens.access_token, callback: "" },
+    context
+  );
   context.updateTokens({
     accessToken: tokens.access_token,
     refreshToken: tokens.refresh_token
   });
-  await saveUserOnSession(tokens.access_token, context);
+  context.updateUser(user);
   const { customerId } = decodeJwt(tokens.access_token);
   await Promise.all([
     mergeBaskets(
@@ -54,7 +54,8 @@ export const oauthLogin = async (login, context) => {
       HttpStatusCode.INTERNAL_SERVER_ERROR,
       HttpStatusCode.BAD_REQUEST,
       HttpStatusCode.UNAUTHORIZED,
-      HttpStatusCode.NOT_FOUND
+      HttpStatusCode.NOT_FOUND,
+      HttpStatusCode.FORBIDDEN
     ]);
     if (err) {
       throw err;
@@ -75,7 +76,8 @@ export const oauthRegister = async (register, context) => {
     const err = convertErrorForRpcCall(error, [
       HttpStatusCode.BAD_REQUEST,
       HttpStatusCode.UNAUTHORIZED,
-      HttpStatusCode.CONFLICT
+      HttpStatusCode.CONFLICT,
+      HttpStatusCode.FORBIDDEN
     ]);
     if (err) {
       throw err;
@@ -96,7 +98,8 @@ export const oauthGuestLogin = async (guest, context) => {
     const err = convertErrorForRpcCall(error, [
       HttpStatusCode.BAD_REQUEST,
       HttpStatusCode.UNAUTHORIZED,
-      HttpStatusCode.CONFLICT
+      HttpStatusCode.CONFLICT,
+      HttpStatusCode.FORBIDDEN
     ]);
     if (err) {
       throw err;

package/dist/rpc/methods/user.cjs

@@ -19,17 +19,12 @@ const fetchUser = exports.fetchUser = async function fetchUser2(payload, context
     shopId
   } = context;
   const client = new _customer.CustomerAPIClient(context);
-  const user = await client.getMe(shopId);
-  return {
-    ...user,
-    authentication: {
-      ...user?.authentication,
-      storefrontAccessToken: accessToken
-    },
-    ...{
-      loginShopId: shopId
-    }
-  };
+  const user = await client.getMe(shopId, accessToken);
+  if (user.authentication) {
+    user.authentication.storefrontAccessToken = accessToken;
+  }
+  user.loginShopId = shopId;
+  return user;
 };
 const refreshUser = exports.refreshUser = async function refreshUser2(context) {
   (0, _types.assertSession)(context);
@@ -38,8 +33,8 @@ const refreshUser = exports.refreshUser = async function refreshUser2(context) {
     shopId
   } = context;
   const client = new _customer.CustomerAPIClient(context);
-  const user = await client.getMe(shopId);
-  if (user?.id) {
+  try {
+    const user = await client.getMe(shopId);
     context.updateUser({
       ...user,
       authentication: user.authentication ? {
@@ -53,9 +48,10 @@ const refreshUser = exports.refreshUser = async function refreshUser2(context) {
     return {
       user
     };
+  } catch {
+    await context.destroySession();
+    return {
+      user: void 0
+    };
   }
-  await context.destroySession();
-  return {
-    user: void 0
-  };
 };

package/dist/rpc/methods/user.mjs

@@ -9,22 +9,19 @@ const fetchUser = async function fetchUser2(payload, context) {
   const { accessToken } = payload;
   const { shopId } = context;
   const client = new CustomerAPIClient(context);
-  const user = await client.getMe(shopId);
-  return {
-    ...user,
-    authentication: {
-      ...user?.authentication,
-      storefrontAccessToken: accessToken
-    },
-    ...{ loginShopId: shopId }
-  };
+  const user = await client.getMe(shopId, accessToken);
+  if (user.authentication) {
+    user.authentication.storefrontAccessToken = accessToken;
+  }
+  user.loginShopId = shopId;
+  return user;
 };
 const refreshUser = async function refreshUser2(context) {
   assertSession(context);
   const { accessToken, shopId } = context;
   const client = new CustomerAPIClient(context);
-  const user = await client.getMe(shopId);
-  if (user?.id) {
+  try {
+    const user = await client.getMe(shopId);
     context.updateUser({
       ...user,
       authentication: user.authentication ? {
@@ -34,8 +31,9 @@ const refreshUser = async function refreshUser2(context) {
       ...{ loginShopId: shopId }
     });
     return { user };
+  } catch {
+    await context.destroySession();
+    return { user: void 0 };
   }
-  await context.destroySession();
-  return { user: void 0 };
 };
 export { getUser, fetchUser, refreshUser };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "7.38.0",
+  "version": "7.38.1",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",