fix: 2fa auth & wishlist check

Author: vascYT

.gitignore

@@ -61,6 +61,7 @@ yarn-error.log
 
 # Keystore infos
 key.properties
+release.jks
 
 # Firebase
 google-services.json

android/app/build.gradle

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vshop_mobile",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "private": true,
   "scripts": {
     "android": "react-native run-android",

src/screens/ReAuth.tsx

@@ -28,7 +28,7 @@ import { useFeatureStore } from "../stores/features";
 import { checkDonator } from "../utils/VShopAPI";
 
 const LOGIN_URL =
-  "https://auth.riotgames.com/login#client_id=play-valorant-web-prod&nonce=1&redirect_uri=https%3A%2F%2Fplayvalorant.com%2Fopt_in&response_type=token%20id_token&scope=openid%20account";
+  "https://auth.riotgames.com/authorize?redirect_uri=https%3A%2F%2Fplayvalorant.com%2Fopt_in&client_id=play-valorant-web-prod&response_type=token%20id_token&nonce=1&scope=account%20openid";
 
 export default function ReAuthScreen() {
   const { t } = useTranslation();

src/screens/Wizard.tsx

@@ -34,7 +34,7 @@ import { checkDonator } from "../utils/VShopAPI";
 
 const { width: windowWidth, height: windowHeight } = Dimensions.get("window");
 const LOGIN_URL =
-  "https://auth.riotgames.com/login#client_id=play-valorant-web-prod&nonce=1&redirect_uri=https%3A%2F%2Fplayvalorant.com%2Fopt_in&response_type=token%20id_token&scope=openid%20account";
+  "https://auth.riotgames.com/authorize?redirect_uri=https%3A%2F%2Fplayvalorant.com%2Fopt_in&client_id=play-valorant-web-prod&response_type=token%20id_token&nonce=1&scope=account%20openid";
 export default function WizardScreen() {
   const navigation = useNavigation<any>();
   const scrollViewRef = React.useRef<ScrollView>(null);

src/utils/VShopAPI.ts

@@ -1,7 +1,7 @@
 import axios from "axios";
 
 export const getBackendUrl = () => {
-  if (__DEV__) return "http://10.0.2.2:3333";
+  if (__DEV__) return "http://10.0.2.2:8787";
   return "https://api.vshop.one";
 };
 

src/utils/ValorantAPI.ts

@@ -44,7 +44,7 @@ export let offers: any = {};
 export let skins: ISkin[] = [];
 
 const extraHeaders = {
-  "X-Riot-ClientVersion": "",
+  "X-Riot-ClientVersion": "43.0.1.4195386.4190634",
   "X-Riot-ClientPlatform": btoa(
     JSON.stringify({
       platformType: "PC",
@@ -116,7 +116,7 @@ export async function getUsername(
     data: [userId],
   });
 
-  return res.data[0].GameName != "" ? res.data[0].GameName : "?";
+  return res.data[0].GameName !== "" ? res.data[0].GameName : "?";
 }
 
 export async function loadOffers(
@@ -197,7 +197,7 @@ export async function parseShop(shop: IStorefrontV2) {
         (item: any) => item.Item.ItemTypeID === VItemTypes.SkinLevel,
       ).map((item: any) => {
         const skin = skins.find(
-          (skin) => skin.levels[0].uuid == item.Item.ItemID,
+          (skin) => skin.levels[0].uuid === item.Item.ItemID,
         ) as ISkin;
 
         return {
@@ -214,7 +214,9 @@ export async function parseShop(shop: IStorefrontV2) {
     var bonusStore = shop.BonusStore.BonusStoreOffers;
     for (var i = 0; i < bonusStore.length; i++) {
       let itemid = bonusStore[i].Offer.Rewards[0].ItemID;
-      const skin = skins.find((skin) => skin.levels[0].uuid == itemid) as ISkin;
+      const skin = skins.find(
+        (skin) => skin.levels[0].uuid === itemid,
+      ) as ISkin;
 
       nightMarket[i] = {
         ...skin,
@@ -295,7 +297,7 @@ export const reAuth = () =>
     },
     data: {
       client_id: "play-valorant-web-prod",
-      nonce: 1,
+      nonce: "1",
       redirect_uri: "https://playvalorant.com/opt_in",
       response_type: "token id_token",
       response_mode: "query",

src/utils/WishlistServiceTask.ts

@@ -11,7 +11,6 @@ import PushNotification from "react-native-push-notification";
 import axios from "axios";
 import i18n from "./localization";
 import { useWishlistStore } from "../stores/wishlistNotification";
-import messaging from "@react-native-firebase/messaging";
 import { checkDonator } from "./VShopAPI";
 
 export default async function () {