style: cleanup oidc spaghetti

This commit is contained in:
Aarnav Tale 2024-05-21 23:57:03 -04:00
parent 84855d9d51
commit 694b22f205
No known key found for this signature in database
3 changed files with 70 additions and 56 deletions

View file

@ -27,11 +27,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
// Only set if OIDC is properly enabled anyways
if (context.oidc?.disableKeyLogin) {
return startOidc(
context.oidc.issuer,
context.oidc.client,
request,
)
return startOidc(context.oidc, request)
}
return {
@ -46,16 +42,13 @@ export async function action({ request }: ActionFunctionArgs) {
if (oidcStart) {
const context = await loadContext()
const issuer = context.oidc?.issuer
const id = context.oidc?.client
if (!issuer || !id) {
if (!context.oidc) {
throw new Error('An invalid OIDC configuration was provided')
}
// We know it exists here because this action only happens on OIDC
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
return startOidc(issuer, id, request)
return startOidc(context.oidc, request)
}
const apiKey = String(formData.get('api-key'))

View file

@ -9,10 +9,5 @@ export async function loader({ request }: LoaderFunctionArgs) {
throw new Error('An invalid OIDC configuration was provided')
}
return finishOidc(
context.oidc.issuer,
context.oidc.client,
context.oidc.secret,
request,
)
return finishOidc(context.oidc, request)
}