Skip to content

feat(auth): makes sure correct session info is registered each time #93

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
sandragjacinto merged 2 commits into from
Feb 25, 2026
Merged

feat(auth): makes sure correct session info is registered each time #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c3cfe6
feat(auth): makes sure correct session info is registered each time
sandragjacinto Feb 25, 2026
551f1c2
user id is now really passed
sandragjacinto Feb 25, 2026
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
16 changes: 11 additions & 5 deletions src/stores/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,21 @@ const defaultOnboardingState: OnboardingState = {
};

export const useUserStore = defineStore('user', () => {
const userId: Ref<string | null> = ref(localStorage.getItem('userId'));
const sessionId: Ref<string | null> = ref(localStorage.getItem('sessionId'));
const userId: Ref<string | undefined> = ref(localStorage.getItem('userId') || undefined);
const sessionId: Ref<string | undefined> = ref(localStorage.getItem('sessionId') || undefined);

const setUserIdAndSessionId = async (referer: string | null) => {
const setUserIdAndSessionId = async (referer?: string) => {
const userAndSession = await getUserAndSession(userId.value, sessionId.value, referer);
userId.value = userAndSession?.userId;
sessionId.value = userAndSession?.sessionId;
localStorage.setItem('userId', userAndSession?.userId || '');
localStorage.setItem('sessionId', userAndSession?.sessionId || '');

if (userId.value !== localStorage.getItem('userId')) {
localStorage.setItem('userId', userId.value || '');
}

if (sessionId.value !== localStorage.getItem('sessionId')) {
localStorage.setItem('sessionId', sessionId.value || '');
}

return {
userId: userId.value,
Expand Down
54 changes: 31 additions & 23 deletions src/utils/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,48 @@ export const getUserAndSession = async (
userId?: string,
sessionId?: string,
referer?: string
): { userId: string; sessionId: string } => {
): Promise<{ userId: string; sessionId: string }> => {
try {
if (userId && sessionId) return { userId, sessionId };

if (!userId && sessionId) {
localStorage.removeItem('sessionId');
}

let newUserId = userId;
let newSessionId = sessionId;

if (!newUserId) {
const parts: string[] = [];
if (userId) parts.push(`user_id=${encodeURIComponent(userId)}`);
if (referer) parts.push(`referer=${encodeURIComponent(referer)}`);
const newUserId = await getUserId(userId, referer);
const newSessionId = await getSessionId(newUserId, sessionId, referer);

const query = parts.length ? `?${parts.join('&')}` : '';
const respUserId = await postAxios(`/user/user${query}`);
newUserId = respUserId.data.user_id;
if (!newUserId || !newSessionId) {
throw new Error('Failed to retrieve user ID or session ID');
}

if (newUserId) {
const parts: string[] = [];
parts.push(`user_id=${encodeURIComponent(newUserId)}`);
if (referer) parts.push(`referer=${encodeURIComponent(referer)}`);

const query = `?${parts.join('&')}`;
const respSessionId = await postAxios(`/user/session${query}`);

newSessionId = respSessionId.data.session_id;
}
return { userId: newUserId, sessionId: newSessionId };
} catch (error) {
console.warn('Failed to get user and session:', error);
throw error;
}
};

const getUserId = async (userId?: string, referer?: string): Promise<string> => {
const parts: string[] = [];

if (userId) parts.push(`user_id=${encodeURIComponent(userId)}`);
if (referer) parts.push(`referer=${encodeURIComponent(referer)}`);

const query = parts.length ? `?${parts.join('&')}` : '';
const respUserId = await postAxios(`/user/user${query}`);
return respUserId.data.user_id;
};

const getSessionId = async (
userId: string,
sessionId?: string,
referer?: string
): Promise<string> => {
const parts: string[] = [];
parts.push(`user_id=${encodeURIComponent(userId)}`);
if (sessionId) parts.push(`session_id=${encodeURIComponent(sessionId)}`);
if (referer) parts.push(`referer=${encodeURIComponent(referer)}`);

const query = `?${parts.join('&')}`;
const respSessionId = await postAxios(`/user/session${query}`);
return respSessionId.data.session_id;
};
Loading