generated from openmcp-project/repository-template
-
Notifications
You must be signed in to change notification settings - Fork 3
feature: move oidc config to frontend-config #77
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.
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
Merged
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
8124a44
move oidc config to frontend-config
enrico-kaack-comp afca90f
Merge branch 'main' into feature/oidc-config-change
enrico-kaack-comp bc2f675
add frontend config validation
enrico-kaack-comp 6ad76f7
refactor
enrico-kaack-comp 5b35e2a
fix frontend config
enrico-kaack-comp edbdc97
use zod for validation
enrico-kaack-comp 4f42b4e
add suggestions
enrico-kaack-comp 60853c5
Merge branch 'main' into feature/oidc-config-change
enrico-kaack-comp 29534a2
Merge branch 'main' into feature/oidc-config-change
enrico-kaack-comp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,17 @@ | ||
import { ReactNode, use } from 'react'; | ||
import { AuthProvider, AuthProviderProps } from 'react-oidc-context'; | ||
import { ReactNode } from 'react'; | ||
import { AuthProvider } from 'react-oidc-context'; | ||
import { useFrontendConfig } from './FrontendConfigContext.tsx'; | ||
import { LoadCrateKubeConfig } from '../lib/oidc/crate.ts'; | ||
import { buildAuthProviderProps } from '../lib/oidc/onboardingApi.ts'; | ||
|
||
interface AuthProviderOnboardingProps { | ||
children?: ReactNode; | ||
} | ||
|
||
// Promise needs to be cached | ||
// https://react.dev/blog/2024/12/05/react-19#use-does-not-support-promises-created-in-render | ||
const fetchAuthPromiseCache = new Map<string, Promise<AuthProviderProps>>(); | ||
|
||
export function AuthProviderOnboarding({ | ||
children, | ||
}: AuthProviderOnboardingProps) { | ||
const { backendUrl } = useFrontendConfig(); | ||
|
||
const fetchAuthConfigPromise = | ||
fetchAuthPromiseCache.get(backendUrl) ?? LoadCrateKubeConfig(backendUrl); | ||
fetchAuthPromiseCache.set(backendUrl, fetchAuthConfigPromise); | ||
|
||
const authConfig = use(fetchAuthConfigPromise); | ||
const { oidcConfig } = useFrontendConfig(); | ||
|
||
const authConfig = buildAuthProviderProps(oidcConfig); | ||
return <AuthProvider {...authConfig}>{children}</AuthProvider>; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
import { WebStorageStateStore } from "oidc-client-ts"; | ||
import { AuthProviderProps } from "react-oidc-context"; | ||
|
||
export interface OIDCConfig { | ||
clientId: string; | ||
issuerUrl: string; | ||
scopes: string[]; | ||
} | ||
enrico-kaack-comp marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
||
export function buildAuthProviderProps(oidcConfig: OIDCConfig) { | ||
const userStore = new WebStorageStateStore({ store: window.localStorage }); | ||
|
||
const props: AuthProviderProps = { | ||
authority: oidcConfig.issuerUrl, | ||
client_id: oidcConfig.clientId, | ||
redirect_uri: getDefaultRedirectUri(), | ||
scope: oidcConfig.scopes.join(' '), | ||
userStore: userStore, | ||
automaticSilentRenew: false, // we show a window instead that asks the user to renew the token | ||
onSigninCallback: () => { | ||
window.history.replaceState({}, document.title, window.location.pathname); | ||
}, | ||
}; | ||
return props; | ||
} | ||
enrico-kaack-comp marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
||
function getDefaultRedirectUri() { | ||
enrico-kaack-comp marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
return window.location.origin; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.