fix: bump storefront v2 -> v3 (#22)

Co-authored-by: norhu1130 <norhu1130@naver.com>

Author: vascYT

android/app/build.gradle

@@ -118,7 +118,7 @@ android {
         applicationId "dev.vasc.vshop2"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 54
+        versionCode 55
         versionName npmVersion
     }
 

ios/vshop_mobile.xcodeproj/project.pbxproj

@@ -533,7 +533,7 @@
 				CODE_SIGN_ENTITLEMENTS = vshop_mobile/vshop_mobile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = H4F94U74J4;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = vshop_mobile/Info.plist;
@@ -542,7 +542,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.7.4;
+				MARKETING_VERSION = 2.7.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -566,15 +566,15 @@
 				CODE_SIGN_ENTITLEMENTS = vshop_mobile/vshop_mobile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 19;
+				CURRENT_PROJECT_VERSION = 20;
 				DEVELOPMENT_TEAM = H4F94U74J4;
 				INFOPLIST_FILE = vshop_mobile/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.7.4;
+				MARKETING_VERSION = 2.7.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vshop_mobile",
-  "version": "2.7.4",
+  "version": "2.7.5",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -116,5 +116,6 @@
     "http": "@tradle/react-native-http",
     "https": "https-browserify",
     "stream": "stream-browserify"
-  }
+  },
+  "packageManager": "yarn@1.22.19+sha1.4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447"
 }

src/screens/ReAuth.tsx

@@ -82,7 +82,7 @@ export default function ReAuthScreen() {
           region,
           userId,
         );
-        const shops = await parseShop(shop.data);
+        const shops = await parseShop(shop);
 
         setLoading(t("fetching.progress"));
         const progress = await getProgress(

src/screens/Wizard.tsx

@@ -86,7 +86,7 @@ export default function WizardScreen() {
           user.region,
           userId,
         );
-        const shops = await parseShop(shop.data);
+        const shops = await parseShop(shop);
 
         setLoading(t("fetching.progress"));
         const progress = await getProgress(

src/typings/StorefrontV2.d.ts src/typings/StorefrontV3.d.ts

@@ -1,6 +1,6 @@
 import type { VCurrencies } from "../utils/misc";
 
-export interface IStorefrontV2 {
+export interface IStorefrontV3 {
   FeaturedBundle: FeaturedBundle;
   SkinsPanelLayout: SkinsPanelLayout;
   BonusStore?: BonusStore;

src/utils/ValorantAPI.ts

@@ -2,7 +2,7 @@ import axios from "axios";
 import jwtDecode from "jwt-decode";
 import { getVAPILang, VCurrencies, VItemTypes } from "./misc";
 import { btoa } from "react-native-quick-base64";
-import { IStorefrontV2 } from "../typings/StorefrontV2";
+import { IStorefrontV3 } from "../typings/StorefrontV3";
 import https from "https-browserify";
 
 axios.interceptors.request.use(
@@ -146,22 +146,22 @@ export async function getShop(
   region: string,
   userId: string,
 ) {
-  const res = await axios.get<IStorefrontV2>(
-    getUrl("storefront", region, userId),
-    {
-      method: "GET",
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        "X-Riot-Entitlements-JWT": entitlementsToken,
-        ...extraHeaders,
-      },
+  const res = await axios.request<IStorefrontV3>({
+    url: getUrl("storefront", region, userId),
+    method: "POST",
+    headers: {
+      ...extraHeaders,
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${accessToken}`,
+      "X-Riot-Entitlements-JWT": entitlementsToken,
     },
-  );
+    data: {},
+  });
 
-  return res;
+  return res.data;
 }
 
-export async function parseShop(shop: IStorefrontV2) {
+export async function parseShop(shop: IStorefrontV3) {
   /* NORMAL SHOP */
   let singleItemOffers = shop.SkinsPanelLayout.SingleItemOffers;
   let main: IShopItem[] = [];
@@ -321,7 +321,7 @@ function getUrl(name: string, region?: string, userId?: string) {
     auth: "https://auth.riotgames.com/api/v1/authorization/",
     entitlements: "https://entitlements.auth.riotgames.com/api/token/v1/",
     userinfo: "https://auth.riotgames.com/userinfo/",
-    storefront: `https://pd.${region}.a.pvp.net/store/v2/storefront/${userId}`,
+    storefront: `https://pd.${region}.a.pvp.net/store/v3/storefront/${userId}`,
     wallet: `https://pd.${region}.a.pvp.net/store/v1/wallet/${userId}`,
     playerxp: `https://pd.${region}.a.pvp.net/account-xp/v1/players/${userId}`,
     weapons: "https://valorant-api.com/v1/weapons/",

src/utils/WishlistServiceTask.ts

@@ -55,9 +55,7 @@ export default async function () {
           const wishlist = useWishlistStore.getState().skinIds;
           var hit = false;
           for (let i = 0; i < wishlist.length; i++) {
-            if (
-              shop.data.SkinsPanelLayout.SingleItemOffers.includes(wishlist[i])
-            ) {
+            if (shop.SkinsPanelLayout.SingleItemOffers.includes(wishlist[i])) {
               const skinData = await axios.get<{
                 status: number;
                 data: ISkinLevel;