Skip to content

Commit f7b51c4

Browse files
committed
fix: android clerk sign-in redirect bug in router
1 parent 208c54b commit f7b51c4

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

app/(home)/settings/login-info.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ export default function LoginInfo(): JSX.Element {
9898
const {bottom} = useSafeAreaInsets();
9999
const {signOut} = useAuth();
100100
const {isSignedIn, user} = useUser();
101-
const [{pushToken}, setAuth] = useRecoilState(authRecoilState);
101+
const [{pushToken, authId}, setAuth] = useRecoilState(authRecoilState);
102102

103103
const handleSignOut = async (): Promise<void> => {
104104
if (isSignedIn && supabase) {
105-
if (pushToken && user?.id) {
105+
if (pushToken && authId) {
106106
await fetchDeletePushToken({
107107
supabase,
108-
authId: user?.id,
108+
authId,
109109
expoPushToken: pushToken,
110110
});
111111
}

app/[...unmatched].tsx

+9
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@ export default function Unmatched(): JSX.Element {
1717
const pathname = usePathname();
1818

1919
useEffect(() => {
20+
// Fix android clerk sign-in done bug
21+
if (pathname === '/oauth-native-callback') {
22+
if (canGoBack()) {
23+
back();
24+
}
25+
26+
replace('/');
27+
}
28+
2029
// Fix ios new install bug
2130
if (pathname === '/google/link') {
2231
if (canGoBack()) {

app/_layout.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ function App(): JSX.Element | null {
154154
}
155155

156156
const blockedUserIds = await fetchBlockUserIds({
157-
userId: user.id,
157+
userId: profile.id,
158158
supabase,
159159
});
160160

@@ -174,7 +174,7 @@ function App(): JSX.Element | null {
174174
}));
175175

176176
fetchAddPushToken({
177-
authId: user.id,
177+
authId: profile.id,
178178
expoPushToken: token,
179179
supabase,
180180
});

0 commit comments

Comments
 (0)