Skip to content

Fixed small admin bug #614

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
davidbjorklund merged 2 commits into from
Sep 27, 2026
Merged

Fixed small admin bug #614

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
ba0b049
Fixed double login needed for admins on exhibitors
davidbjorklund Sep 27, 2026
87875e4
Merge branch '568-extra-orders'
davidbjorklund Sep 27, 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
1 change: 1 addition & 0 deletions src/server/api/routers/account.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ export const accountRouter = createTRPCRouter({
const user = await getSession(ctx.cookies);
const hasExhibitorSession = Boolean(ctx.session?.exhibitorId);

console.log("CHECK LOGGED IN", user, hasExhibitorSession);
if (user != null) {
return {
ok: true,
Expand Down
24 changes: 19 additions & 5 deletions src/shared/exhibitorLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,22 +120,36 @@ export default function ExhibitorLayout({
const [name, setName] = useState<string>("");
const [editNameState, setEditNameState] = useState<boolean>(false);

// States
const [isLoggedIn, setIsLoggedIn] = useState<boolean>(true);
const [isAdmin, setIsAdmin] = useState<boolean>(false);
const [hasExhibitorSession, setHasExhibitorSession] = useState<boolean>(false);
const [isLoaded, setIsLoaded] = useState<boolean>(false);

const logout = api.admin.logout.useMutation();

const getName = api.exhibitor.getName.useQuery();
const setNameMutation = api.exhibitor.setName.useMutation();


const getIsLoggedIn = api.account.isLoggedIn.useQuery();
const isAdmin = Boolean(getIsLoggedIn.data?.isAdmin);
const hasExhibitorSession = Boolean(getIsLoggedIn.data?.hasExhibitorSession);
const getIsLoggedIn = api.account.isLoggedIn.useQuery(undefined, {
onSuccess: (data: any) => {
setIsLoggedIn(data.ok);
setIsAdmin(data.isAdmin);
setHasExhibitorSession(data.hasExhibitorSession);
setIsLoaded(true);
},
});

useEffect(() => {
if (!getIsLoggedIn.isSuccess) return;
if (!isAdmin && !hasExhibitorSession) {
if (!isLoggedIn) handleLogout();

console.log("LOGGED IN", isAdmin, hasExhibitorSession);
if (isLoaded && !isAdmin && !hasExhibitorSession) {
void router.replace("/logga-in");
}
}, [getIsLoggedIn.isSuccess, hasExhibitorSession, isAdmin, router]);
}, [getIsLoggedIn.isSuccess, isLoggedIn, hasExhibitorSession, isAdmin, isLoaded, router]);

const handleLogout = () => {
//console.log("CALL LOGOUT")
Expand Down
Loading