@scayle/storefront-core 7.25.1 → 7.26.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @scayle/storefront-core
 
+## 7.26.0
+
+### Minor Changes
+
+- Don't return oauth tokens from RPC methods
+
 ## 7.25.1
 
 ### Patch Changes

package/dist/rpc/methods/session.cjs

@@ -26,7 +26,7 @@ function getOAuthSettings(context) {
     throw new MissingCredentialsError();
   }
   const BASIC_AUTH_HASH = (0, _hash.encodeBase64)(`${clientId}:${clientSecret}`);
-  const axiosInstance2 = _axios.default.create({
+  const axiosInstance = _axios.default.create({
     baseURL: `${apiHost}/v1`,
     headers: {
       Authorization: `Basic ${BASIC_AUTH_HASH}`
@@ -36,7 +36,7 @@ function getOAuthSettings(context) {
     clientId,
     clientSecret,
     apiHost,
-    axiosInstance: axiosInstance2
+    axiosInstance
   };
 }
 const saveUserOnSession = async (accessToken, context) => {
@@ -54,13 +54,13 @@ const saveUserOnSession = async (accessToken, context) => {
 const oauthLogin = async (login, context) => {
   const shopId = context.shopId;
   const {
-    axiosInstance: axiosInstance2
+    axiosInstance
   } = getOAuthSettings(context);
   if (!login.email || !login.password) {
     throw new Error("Login or password are missing, seems like validation has failed");
   }
   try {
-    const response = await axiosInstance2.post("/auth/login", {
+    const response = await axiosInstance.post("/auth/login", {
       ...login,
       shop_id: shopId
     });
@@ -74,27 +74,21 @@ const oauthLogin = async (login, context) => {
     } = (0, _jose.decodeJwt)(response.data.access_token);
     await Promise.all([(0, _user.mergeBaskets)(context.sessionId, await context.generateBasketKeyForUserId(customerId), _constants.DEFAULT_WITH_LISTING, context), (0, _user.mergeWishlists)(context.sessionId, await context.generateWishlistKeyForUserId(customerId), _constants.DEFAULT_WITH_LISTING, context)]);
     await context.createUserBoundSession();
-    return {
-      oauth: response.data
-    };
   } catch (error) {
     const err = (0, _rpc.convertErrorForRpcCall)(error, [_constants.HttpStatusCode.INTERNAL_SERVER_ERROR, _constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_FOUND]);
     if (err) {
       throw err;
     }
-    return {
-      oauth: null
-    };
   }
 };
 exports.oauthLogin = oauthLogin;
 const oauthRegister = async (register, context) => {
   const shopId = context.shopId;
   const {
-    axiosInstance: axiosInstance2
+    axiosInstance
   } = getOAuthSettings(context);
   try {
-    const response = await axiosInstance2.post("/auth/register", {
+    const response = await axiosInstance.post("/auth/register", {
       ...register,
       shop_id: shopId
     });
@@ -108,27 +102,21 @@ const oauthRegister = async (register, context) => {
     } = (0, _jose.decodeJwt)(response.data.access_token);
     await Promise.all([(0, _user.mergeBaskets)(context.sessionId, await context.generateBasketKeyForUserId(customerId), _constants.DEFAULT_WITH_LISTING, context), (0, _user.mergeWishlists)(context.sessionId, await context.generateWishlistKeyForUserId(customerId), _constants.DEFAULT_WITH_LISTING, context)]);
     await context.createUserBoundSession();
-    return {
-      oauth: response.data
-    };
   } catch (error) {
     const err = (0, _rpc.convertErrorForRpcCall)(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT]);
     if (err) {
       throw err;
     }
-    return {
-      oauth: null
-    };
   }
 };
 exports.oauthRegister = oauthRegister;
 const oauthGuestLogin = async (guest, context) => {
   const shopId = context.shopId;
   const {
-    axiosInstance: axiosInstance2
+    axiosInstance
   } = getOAuthSettings(context);
   try {
-    const response = await axiosInstance2.post("/auth/login/guest", {
+    const response = await axiosInstance.post("/auth/login/guest", {
       ...guest,
       shop_id: shopId
     });
@@ -142,44 +130,39 @@ const oauthGuestLogin = async (guest, context) => {
     } = (0, _jose.decodeJwt)(response.data.access_token);
     await Promise.all([(0, _user.mergeBaskets)(context.sessionId, await context.generateBasketKeyForUserId(customerId), _constants.DEFAULT_WITH_LISTING, context), (0, _user.mergeWishlists)(context.sessionId, await context.generateWishlistKeyForUserId(customerId), _constants.DEFAULT_WITH_LISTING, context)]);
     await context.createUserBoundSession();
-    return {
-      oauth: response.data
-    };
   } catch (error) {
     const err = (0, _rpc.convertErrorForRpcCall)(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.CONFLICT]);
     if (err) {
       throw err;
     }
-    return {
-      oauth: null
-    };
   }
 };
 exports.oauthGuestLogin = oauthGuestLogin;
 const refreshAccessToken = async context => {
   const refreshToken = context.refreshToken;
   const {
-    axiosInstance: axiosInstance2
+    axiosInstance
   } = getOAuthSettings(context);
   if (!refreshToken) {
     throw new Error("No app refresh token provided");
   }
   try {
-    const response = await axiosInstance2.post("/oauth/token", {
+    const response = await axiosInstance.post("/oauth/token", {
       grant_type: "refresh_token",
       refresh_token: refreshToken
     });
     context.updateTokens({
-      accessToken: response.data.access_token,
-      refreshToken: response.data.refresh_token
+      accessToken: response.data?.access_token,
+      refreshToken: response.data?.refresh_token
     });
-    return response.data;
+    return {
+      success: !!response.data
+    };
   } catch (error) {
     const err = (0, _rpc.convertErrorForRpcCall)(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED]);
     if (err) {
       throw err;
     }
-    return null;
   }
 };
 exports.refreshAccessToken = refreshAccessToken;
@@ -189,6 +172,9 @@ const oauthRevokeToken = async context => {
     throw new Error("No app oauth authentication credentials");
   }
   const decodedAccessToken = (0, _jose.decodeJwt)(accessToken);
+  const {
+    axiosInstance
+  } = getOAuthSettings(context);
   await context.destroySession();
   try {
     await axiosInstance.delete(`/oauth/tokens/${decodedAccessToken.jti}`, {
@@ -215,7 +201,7 @@ const oauthForgetPassword = async ({
 }, context) => {
   const shopId = context.shopId;
   const {
-    axiosInstance: axiosInstance2
+    axiosInstance
   } = getOAuthSettings(context);
   try {
     const resetUrl = new URL(context.auth.resetPasswordUrl);
@@ -224,7 +210,7 @@ const oauthForgetPassword = async ({
     } else {
       resetUrl.searchParams.set("hash", "{hash}");
     }
-    await axiosInstance2.post("/auth/password/send-reset-email", {
+    await axiosInstance.post("/auth/password/send-reset-email", {
       email,
       reset_url: decodeURI(resetUrl.toString()),
       shop_id: shopId
@@ -246,10 +232,10 @@ exports.oauthForgetPassword = oauthForgetPassword;
 const updatePasswordByHash = async (passwordHash, context) => {
   const shopId = context.shopId;
   const {
-    axiosInstance: axiosInstance2
+    axiosInstance
   } = getOAuthSettings(context);
   try {
-    const response = await axiosInstance2.put("/auth/password/update-by-hash", {
+    const response = await axiosInstance.put("/auth/password/update-by-hash", {
       ...passwordHash,
       shop_id: shopId
     });
@@ -258,17 +244,11 @@ const updatePasswordByHash = async (passwordHash, context) => {
       refreshToken: response.data.refresh_token
     });
     await context.createUserBoundSession();
-    return {
-      oauth: response.data
-    };
   } catch (error) {
     const err = (0, _rpc.convertErrorForRpcCall)(error, [_constants.HttpStatusCode.BAD_REQUEST, _constants.HttpStatusCode.UNAUTHORIZED, _constants.HttpStatusCode.NOT_ACCEPTABLE]);
     if (err) {
       throw err;
     }
-    return {
-      oauth: null
-    };
   }
 };
 exports.updatePasswordByHash = updatePasswordByHash;

package/dist/rpc/methods/session.d.ts

@@ -1,20 +1,14 @@
-import { GuestRequest, LoginRequest, Oauth, RegisterRequest, RpcHandler, SendResetPasswordEmailRequest, UpdatePasswordByHashRequest } from '../../types';
-export declare const oauthLogin: RpcHandler<LoginRequest, {
-    oauth: Oauth | null;
-}>;
-export declare const oauthRegister: RpcHandler<RegisterRequest, {
-    oauth: Oauth | null;
-}>;
-export declare const oauthGuestLogin: RpcHandler<GuestRequest, {
-    oauth: Oauth | null;
+import { GuestRequest, LoginRequest, ParamRpcHandler, RegisterRequest, RpcHandler, SendResetPasswordEmailRequest, UpdatePasswordByHashRequest } from '../../types';
+export declare const oauthLogin: ParamRpcHandler<LoginRequest, undefined>;
+export declare const oauthRegister: ParamRpcHandler<RegisterRequest, undefined>;
+export declare const oauthGuestLogin: ParamRpcHandler<GuestRequest, undefined>;
+export declare const refreshAccessToken: RpcHandler<{
+    success: boolean;
 }>;
-export declare const refreshAccessToken: RpcHandler<Oauth | null>;
 export declare const oauthRevokeToken: RpcHandler<{
     result: boolean;
 }>;
 export declare const oauthForgetPassword: RpcHandler<SendResetPasswordEmailRequest, {
     success: boolean;
 }>;
-export declare const updatePasswordByHash: RpcHandler<UpdatePasswordByHashRequest, {
-    oauth: Oauth | null;
-}>;
+export declare const updatePasswordByHash: ParamRpcHandler<UpdatePasswordByHashRequest, undefined>;

package/dist/rpc/methods/session.mjs

@@ -19,7 +19,7 @@ function getOAuthSettings(context) {
     throw new MissingCredentialsError();
   }
   const BASIC_AUTH_HASH = encodeBase64(`${clientId}:${clientSecret}`);
-  const axiosInstance2 = axios.create({
+  const axiosInstance = axios.create({
     baseURL: `${apiHost}/v1`,
     headers: {
       Authorization: `Basic ${BASIC_AUTH_HASH}`
@@ -29,7 +29,7 @@ function getOAuthSettings(context) {
     clientId,
     clientSecret,
     apiHost,
-    axiosInstance: axiosInstance2
+    axiosInstance
   };
 }
 const saveUserOnSession = async (accessToken, context) => {
@@ -46,14 +46,14 @@ const saveUserOnSession = async (accessToken, context) => {
 };
 export const oauthLogin = async (login, context) => {
   const shopId = context.shopId;
-  const { axiosInstance: axiosInstance2 } = getOAuthSettings(context);
+  const { axiosInstance } = getOAuthSettings(context);
   if (!login.email || !login.password) {
     throw new Error(
       "Login or password are missing, seems like validation has failed"
     );
   }
   try {
-    const response = await axiosInstance2.post(
+    const response = await axiosInstance.post(
       "/auth/login",
       {
         ...login,
@@ -81,9 +81,6 @@ export const oauthLogin = async (login, context) => {
       )
     ]);
     await context.createUserBoundSession();
-    return {
-      oauth: response.data
-    };
   } catch (error) {
     const err = convertErrorForRpcCall(error, [
       HttpStatusCode.INTERNAL_SERVER_ERROR,
@@ -94,14 +91,13 @@ export const oauthLogin = async (login, context) => {
     if (err) {
       throw err;
     }
-    return { oauth: null };
   }
 };
 export const oauthRegister = async (register, context) => {
   const shopId = context.shopId;
-  const { axiosInstance: axiosInstance2 } = getOAuthSettings(context);
+  const { axiosInstance } = getOAuthSettings(context);
   try {
-    const response = await axiosInstance2.post(
+    const response = await axiosInstance.post(
       "/auth/register",
       {
         ...register,
@@ -129,9 +125,6 @@ export const oauthRegister = async (register, context) => {
       )
     ]);
     await context.createUserBoundSession();
-    return {
-      oauth: response.data
-    };
   } catch (error) {
     const err = convertErrorForRpcCall(error, [
       HttpStatusCode.BAD_REQUEST,
@@ -141,14 +134,13 @@ export const oauthRegister = async (register, context) => {
     if (err) {
       throw err;
     }
-    return { oauth: null };
   }
 };
 export const oauthGuestLogin = async (guest, context) => {
   const shopId = context.shopId;
-  const { axiosInstance: axiosInstance2 } = getOAuthSettings(context);
+  const { axiosInstance } = getOAuthSettings(context);
   try {
-    const response = await axiosInstance2.post(
+    const response = await axiosInstance.post(
       "/auth/login/guest",
       {
         ...guest,
@@ -176,9 +168,6 @@ export const oauthGuestLogin = async (guest, context) => {
       )
     ]);
     await context.createUserBoundSession();
-    return {
-      oauth: response.data
-    };
   } catch (error) {
     const err = convertErrorForRpcCall(error, [
       HttpStatusCode.BAD_REQUEST,
@@ -188,17 +177,16 @@ export const oauthGuestLogin = async (guest, context) => {
     if (err) {
       throw err;
     }
-    return { oauth: null };
   }
 };
 export const refreshAccessToken = async (context) => {
   const refreshToken = context.refreshToken;
-  const { axiosInstance: axiosInstance2 } = getOAuthSettings(context);
+  const { axiosInstance } = getOAuthSettings(context);
   if (!refreshToken) {
     throw new Error("No app refresh token provided");
   }
   try {
-    const response = await axiosInstance2.post(
+    const response = await axiosInstance.post(
       "/oauth/token",
       {
         grant_type: "refresh_token",
@@ -206,10 +194,10 @@ export const refreshAccessToken = async (context) => {
       }
     );
     context.updateTokens({
-      accessToken: response.data.access_token,
-      refreshToken: response.data.refresh_token
+      accessToken: response.data?.access_token,
+      refreshToken: response.data?.refresh_token
     });
-    return response.data;
+    return { success: !!response.data };
   } catch (error) {
     const err = convertErrorForRpcCall(error, [
       HttpStatusCode.BAD_REQUEST,
@@ -218,7 +206,6 @@ export const refreshAccessToken = async (context) => {
     if (err) {
       throw err;
     }
-    return null;
   }
 };
 export const oauthRevokeToken = async (context) => {
@@ -227,6 +214,7 @@ export const oauthRevokeToken = async (context) => {
     throw new Error("No app oauth authentication credentials");
   }
   const decodedAccessToken = decodeJwt(accessToken);
+  const { axiosInstance } = getOAuthSettings(context);
   await context.destroySession();
   try {
     await axiosInstance.delete(`/oauth/tokens/${decodedAccessToken.jti}`, {
@@ -249,7 +237,7 @@ export const oauthRevokeToken = async (context) => {
 };
 export const oauthForgetPassword = async ({ email }, context) => {
   const shopId = context.shopId;
-  const { axiosInstance: axiosInstance2 } = getOAuthSettings(context);
+  const { axiosInstance } = getOAuthSettings(context);
   try {
     const resetUrl = new URL(context.auth.resetPasswordUrl);
     if (!resetUrl.searchParams.has("hash")) {
@@ -257,7 +245,7 @@ export const oauthForgetPassword = async ({ email }, context) => {
     } else {
       resetUrl.searchParams.set("hash", "{hash}");
     }
-    await axiosInstance2.post("/auth/password/send-reset-email", {
+    await axiosInstance.post("/auth/password/send-reset-email", {
       email,
       reset_url: decodeURI(resetUrl.toString()),
       shop_id: shopId
@@ -278,9 +266,9 @@ export const oauthForgetPassword = async ({ email }, context) => {
 };
 export const updatePasswordByHash = async (passwordHash, context) => {
   const shopId = context.shopId;
-  const { axiosInstance: axiosInstance2 } = getOAuthSettings(context);
+  const { axiosInstance } = getOAuthSettings(context);
   try {
-    const response = await axiosInstance2.put(
+    const response = await axiosInstance.put(
       "/auth/password/update-by-hash",
       {
         ...passwordHash,
@@ -292,9 +280,6 @@ export const updatePasswordByHash = async (passwordHash, context) => {
       refreshToken: response.data.refresh_token
     });
     await context.createUserBoundSession();
-    return {
-      oauth: response.data
-    };
   } catch (error) {
     const err = convertErrorForRpcCall(error, [
       HttpStatusCode.BAD_REQUEST,
@@ -304,6 +289,5 @@ export const updatePasswordByHash = async (passwordHash, context) => {
     if (err) {
       throw err;
     }
-    return { oauth: null };
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "7.25.1",
+  "version": "7.26.0",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -56,11 +56,11 @@
     "test:ci": "jest --passWithNoTests --runInBand --coverage --reporters=default --reporters=jest-junit"
   },
   "peerDependencies": {
-    "@aboutyou/backbone": "15.14.1",
+    "@aboutyou/backbone": "15.14.2",
     "axios": "^0.21.1 || ^0.27.0"
   },
   "dependencies": {
-    "@aboutyou/backbone": "15.14.1",
+    "@aboutyou/backbone": "15.14.2",
     "crypto-js": "4.2.0",
     "jose": "^4.14.4",
     "radash": "^11.0.0",