Ryan/drop
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop.git synced 2025-11-14 08:41:15 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: openid redirect auth query

Browse Source
This commit is contained in:
DecDuck
2025-05-15 21:22:24 +10:00
parent 8e3ae01a30
commit ce27f76856
4 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/routes/auth/callback/oidc.get.ts
View File

@ -21,15 +21,19 @@ export default defineEventHandler(async (h3) => {
statusMessage: "No state in query params.",
});
const user = await manager.authorize(code, state);
const result = await manager.authorize(code, state);
if (typeof user === "string")
if (typeof result === "string")
throw createError({
statusCode: 403,
statusMessage: `Failed to sign in: "${user}". Please try again.`,
statusMessage: `Failed to sign in: "${result}". Please try again.`,
});
await sessionHandler.signin(h3, user.id, true);
await sessionHandler.signin(h3, result.user.id, true);
if (result.options.redirect) {
return sendRedirect(h3, result.options.redirect);
}
return sendRedirect(h3, "/");
});

10
server/routes/auth/oidc.get.ts
View File

@ -1,10 +1,16 @@
import { enabledAuthManagers } from "~/server/plugins/04.auth-init";
export default defineEventHandler((h3) => {
if (!enabledAuthManagers.OpenID) return sendRedirect(h3, "/auth/signin");
const redirect = getQuery(h3).redirect?.toString();
if (!enabledAuthManagers.OpenID)
return sendRedirect(
h3,
`/auth/signin${redirect ? `?redirect=${encodeURIComponent(redirect)}` : ""}`,
);
const manager = enabledAuthManagers.OpenID;
const { redirectUrl } = manager.generateAuthSession();
const { redirectUrl } = manager.generateAuthSession({ redirect });
return sendRedirect(h3, redirectUrl);
});