Skip to content

fix(auth): refactor initializeAuth for improved token handling and us… #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
salehahmed99 merged 1 commit into from
Dec 16, 2025
Merged

fix(auth): refactor initializeAuth for improved token handling and us… #191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 45 additions & 70 deletions src/store/useAuthStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,90 +42,65 @@ export const useAuthStore = create<IAuthState>((set) => ({
/** Initialize auth on app start */
initializeAuth: async () => {
let authSuccessful = false;
const token = await getToken();
const refreshToken = await getRefreshToken();

if (token) {
try {
set({ token });
const data = await getMyUser();
set({ user: mapUser(data) });
try {
const token = await getToken();
const refreshToken = await getRefreshToken();
if (token) {
try {
set({ token });
const data = await getMyUser();
set({ user: mapUser(data) });

// Sync language
if (data.language && data.language !== i18n.language) {
await changeLanguage(data.language);
await AsyncStorage.setItem('app-language', data.language);
}
// Sync language
if (data.language && data.language !== i18n.language) {
await changeLanguage(data.language);
await AsyncStorage.setItem('app-language', data.language);
}

if (refreshToken) {
tokenRefreshService.start();
if (refreshToken) {
tokenRefreshService.start();
}
authSuccessful = true; // Auth succeeded with existing token
} catch {
await deleteToken();
await deleteRefreshToken();
set({ user: null, token: null });
}
authSuccessful = true; // Auth succeeded with existing token
} catch {
// Token invalid, try refresh if available
if (refreshToken) {
try {
const newToken = await tokenRefreshService.refreshToken();

if (newToken) {
await saveToken(newToken);
set({ token: newToken });
} else if (refreshToken) {
try {
const newToken = await tokenRefreshService.refreshToken();

const data = await getMyUser();
set({ user: mapUser(data) });
if (!newToken) {
await deleteRefreshToken();
set({ user: null, token: null });
} else {
await saveToken(newToken);
set({ token: newToken });

if (data.language && data.language !== i18n.language) {
await changeLanguage(data.language);
await AsyncStorage.setItem('app-language', data.language);
}
const data = await getMyUser();
set({ user: mapUser(data) });

tokenRefreshService.start();
authSuccessful = true;
} else {
await deleteRefreshToken();
set({ user: null, token: null });
if (data.language && data.language !== i18n.language) {
await changeLanguage(data.language);
await AsyncStorage.setItem('app-language', data.language);
}
} catch {
await deleteToken();
await deleteRefreshToken();
set({ user: null, token: null });

tokenRefreshService.start();
authSuccessful = true; // Auth succeeded with refreshed token
}
} else {
} catch {
await deleteToken();
set({ user: null, token: null });
}
}
} else if (refreshToken) {
try {
const newToken = await tokenRefreshService.refreshToken();

if (!newToken) {
await deleteRefreshToken();
set({ user: null, token: null });
} else {
await saveToken(newToken);
set({ token: newToken });

const data = await getMyUser();
set({ user: mapUser(data) });

if (data.language && data.language !== i18n.language) {
await changeLanguage(data.language);
await AsyncStorage.setItem('app-language', data.language);
}

tokenRefreshService.start();
authSuccessful = true; // Auth succeeded with refreshed token
}
} catch {
await deleteToken();
await deleteRefreshToken();
set({ user: null, token: null });
}
} catch {
await deleteToken();
await deleteRefreshToken();
set({ user: null, token: null });
} finally {
set({ isInitialized: true });
}

set({ isInitialized: true });

if (authSuccessful) {
try {
await socketService.connect();
Expand Down
Loading