Merge pull request 'more auth ree' (#16) from development into main
Reviewed-on: #16
This commit is contained in:
@@ -15,7 +15,7 @@ export const fetchMe = createServerFn()
|
|||||||
const request = getRequest();
|
const request = getRequest();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const context = await getSessionContext(request, { isServerFunction: true });
|
const context = await getSessionContext(request);
|
||||||
|
|
||||||
await pbAdmin.authPromise;
|
await pbAdmin.authPromise;
|
||||||
const result = await pbAdmin.getPlayerByAuthId(context.userAuthId);
|
const result = await pbAdmin.getPlayerByAuthId(context.userAuthId);
|
||||||
@@ -39,27 +39,6 @@ export const fetchMe = createServerFn()
|
|||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (error instanceof Response) {
|
|
||||||
const status = error.status;
|
|
||||||
if (status === 440) {
|
|
||||||
logger.info("FetchMe: Session refresh required (440)");
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (error?.response?.status === 440 || error?.response?.status === 401) {
|
|
||||||
const errorData = error?.response?.data;
|
|
||||||
if (errorData?.error === "SESSION_REFRESH_REQUIRED") {
|
|
||||||
logger.info("FetchMe: Session refresh required (legacy)");
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (error?.message === "SESSION_REFRESH_REQUIRED") {
|
|
||||||
logger.info("FetchMe: Session refresh required - returning empty auth (client will handle cleanup)");
|
|
||||||
return { user: undefined, roles: [], metadata: {}, phone: undefined };
|
|
||||||
}
|
|
||||||
|
|
||||||
if (error?.message === "Unauthenticated") {
|
if (error?.message === "Unauthenticated") {
|
||||||
logger.info("FetchMe: No authenticated user (expected when not logged in)");
|
logger.info("FetchMe: No authenticated user (expected when not logged in)");
|
||||||
return { user: undefined, roles: [], metadata: {}, phone: undefined };
|
return { user: undefined, roles: [], metadata: {}, phone: undefined };
|
||||||
|
|||||||
Reference in New Issue
Block a user