nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Improve client metadata used for OIDC dynamic registration (#12257)

Browse Source
This commit is contained in:
Michael Telatynski
2024-02-16 14:43:58 +00:00
committed by GitHub
parent e8ce9cb360
commit cd8679c172
7 changed files with 80 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Login.ts
View File

@@ -120,7 +120,6 @@ export default class Login {
try {
const oidcFlow = await tryInitOidcNativeFlow(
this.delegatedAuthentication,
SdkConfig.get().brand,
SdkConfig.get().oidc_static_clients,
isRegistration,
);
@@ -223,7 +222,6 @@ export interface OidcNativeFlow extends ILoginFlow {
* results.
*
* @param delegatedAuthConfig Auth config from ValidatedServerConfig
* @param clientName Client name to register with the OP, eg 'Element', used during client registration with OP
* @param staticOidcClientIds static client config from config.json, used during client registration with OP
* @param isRegistration true when we are attempting registration
* @returns Promise<OidcNativeFlow> when oidc native authentication flow is supported and correctly configured
@@ -231,15 +229,14 @@ export interface OidcNativeFlow extends ILoginFlow {
*/
const tryInitOidcNativeFlow = async (
delegatedAuthConfig: OidcClientConfig,
brand: string,
oidcStaticClients?: IConfigOptions["oidc_static_clients"],
staticOidcClientIds?: IConfigOptions["oidc_static_clients"],
isRegistration?: boolean,
): Promise<OidcNativeFlow> => {
// if registration is not supported, bail before attempting to get the clientId
if (isRegistration && !isUserRegistrationSupported(delegatedAuthConfig)) {
throw new Error("Registration is not supported by OP");
}
const clientId = await getOidcClientId(delegatedAuthConfig, brand, window.location.origin, oidcStaticClients);
const clientId = await getOidcClientId(delegatedAuthConfig, staticOidcClientIds);
const flow = {
type: "oidcNativeFlow",