amalia/11-mei-26 #47

Merged
amaliadwiy merged 5 commits from amalia/11-mei-26 into join 2026-05-11 17:34:53 +08:00
24 changed files with 910 additions and 24 deletions
Showing only changes of commit af2048b4cd - Show all commits

View File

@@ -46,6 +46,7 @@
"expo-modules-core": "^2.5.0",
"expo-notifications": "~0.31.3",
"expo-router": "~5.1.4",
"expo-secure-store": "~14.2.4",
"expo-sharing": "^13.1.5",
"expo-splash-screen": "~0.30.8",
"expo-status-bar": "~2.2.3",
@@ -1103,6 +1104,8 @@
"expo-router": ["expo-router@5.1.11", "", { "dependencies": { "@expo/metro-runtime": "5.0.5", "@expo/schema-utils": "^0.1.0", "@expo/server": "^0.6.3", "@radix-ui/react-slot": "1.2.0", "@react-navigation/bottom-tabs": "^7.3.10", "@react-navigation/native": "^7.1.6", "@react-navigation/native-stack": "^7.3.10", "client-only": "^0.0.1", "invariant": "^2.2.4", "react-fast-compare": "^3.2.2", "react-native-is-edge-to-edge": "^1.1.6", "semver": "~7.6.3", "server-only": "^0.0.1", "shallowequal": "^1.1.0" }, "peerDependencies": { "@react-navigation/drawer": "^7.3.9", "expo": "*", "expo-constants": "*", "expo-linking": "*", "react-native-reanimated": "*", "react-native-safe-area-context": "*", "react-native-screens": "*", "react-server-dom-webpack": "~19.0.4 || ~19.1.5 || ~19.2.4" }, "optionalPeers": ["@react-navigation/drawer", "react-native-reanimated", "react-server-dom-webpack"] }, "sha512-6YQGqQM2rviVSiU6++hrJDPMByHZ7Oiux4XmgoSaGdaHku5QOn9911f2puEUZh2H9ALKBipw5v3ZkrECBd6Zbw=="],
"expo-secure-store": ["expo-secure-store@14.2.4", "", { "peerDependencies": { "expo": "*" } }, "sha512-ePaz4fnTitJJZjAiybaVYGfLWWyaEtepZC+vs9ZBMhQMfG5HUotIcVsDaSo3FnwpHmgwsLVPY2qFeryI6AtULw=="],
"expo-sharing": ["expo-sharing@13.1.5", "", { "peerDependencies": { "expo": "*" } }, "sha512-X/5sAEiWXL2kdoGE3NO5KmbfcmaCWuWVZXHu8OQef7Yig4ZgHFkGD11HKJ5KqDrDg+SRZe4ISd6MxE7vGUgm4w=="],
"expo-splash-screen": ["expo-splash-screen@0.30.10", "", { "dependencies": { "@expo/prebuild-config": "^9.0.10" }, "peerDependencies": { "expo": "*" } }, "sha512-Tt9va/sLENQDQYeOQ6cdLdGvTZ644KR3YG9aRlnpcs2/beYjOX1LHT510EGzVN9ljUTg+1ebEo5GGt2arYtPjw=="],

View File

@@ -59,6 +59,7 @@
"expo-modules-core": "^2.5.0",
"expo-notifications": "~0.31.3",
"expo-router": "~5.1.4",
"expo-secure-store": "~14.2.4",
"expo-sharing": "^13.1.5",
"expo-splash-screen": "~0.30.8",
"expo-status-bar": "~2.2.3",

View File

@@ -2,6 +2,7 @@ import { ConstEnv } from '@/constants/ConstEnv';
import { apiRegisteredToken, apiUnregisteredToken } from '@/lib/api';
import { getToken } from '@/lib/useNotification';
import AsyncStorage from '@react-native-async-storage/async-storage';
import * as SecureStore from 'expo-secure-store';
import { useQueryClient } from '@tanstack/react-query';
import CryptoES from "crypto-es";
import { router } from "expo-router";
@@ -35,7 +36,7 @@ export default function AuthProvider({ children }: { children: ReactNode }): Rea
useEffect(() => {
(async (): Promise<void> => {
const token = await AsyncStorage.getItem('@token');
const token = await SecureStore.getItemAsync('@token');
tokenRef.current = token || '';
setIsLoading(false);
})()
@@ -62,14 +63,14 @@ export default function AuthProvider({ children }: { children: ReactNode }): Rea
} catch (error) {
console.error(error)
} finally {
await AsyncStorage.setItem('@token', token);
await SecureStore.setItemAsync('@token', token);
tokenRef.current = token;
router.replace('/home')
return true
}
} else {
await apiRegisteredToken({ user: hasil, token: "" })
await AsyncStorage.setItem('@token', token);
await SecureStore.setItemAsync('@token', token);
tokenRef.current = token;
router.replace('/home')
}
@@ -87,7 +88,7 @@ export default function AuthProvider({ children }: { children: ReactNode }): Rea
} catch (error) {
console.error(error)
} finally {
await AsyncStorage.setItem('@token', '');
await SecureStore.deleteItemAsync('@token');
tokenRef.current = null;
queryClient.clear();
router.replace('/');