High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
chore: use esm global import (#27408)
Daniel Dietzlera2e3635ac954
diff --git a/server/src/repositories/oauth.repository.ts b/server/src/repositories/oauth.repository.tsindex 5af5163f8f..b2e72e470a 100644--- a/server/src/repositories/oauth.repository.ts+++ b/server/src/repositories/oauth.repository.ts@@ -1,5 +1,19 @@import { Injectable, InternalServerErrorException } from '@nestjs/common';-import type { UserInfoResponse } from 'openid-client' with { 'resolution-mode': 'import' };+import {+ allowInsecureRequests,+ authorizationCodeGrant,+ buildAuthorizationUrl,+ calculatePKCECodeChallenge,+ ClientSecretBasic,+ ClientSecretPost,+ discovery,+ fetchUserInfo,+ None,+ randomPKCECodeVerifier,+ randomState,+ skipSubjectCheck,+ type UserInfoResponse,+} from 'openid-client';import { OAuthTokenEndpointAuthMethod } from 'src/enum';import { LoggingRepository } from 'src/repositories/logging.repository';@@ -24,8 +38,6 @@ export class OAuthRepository {}async authorize(config: OAuthConfig, redirectUrl: string, state?: string, codeChallenge?: string) {- const { buildAuthorizationUrl, randomState, randomPKCECodeVerifier, calculatePKCECodeChallenge } =- await import('openid-client');const client = await this.getClient(config);state ??= randomState();@@ -64,7 +76,6 @@ export class OAuthRepository {expectedState: string,codeVerifier: string,): Promise<OAuthProfile> {- const { authorizationCodeGrant, fetchUserInfo, ...oidc } = await import('openid-client');const client = await this.getClient(config);const pkceCodeVerifier = client.serverMetadata().supportsPKCE() ? codeVerifier : undefined;@@ -77,7 +88,7 @@ export class OAuthRepository {this.logger.debug('Using ID token claims instead of userinfo endpoint');profile = tokenClaims as OAuthProfile;} else {- profile = await fetchUserInfo(client, tokens.access_token, oidc.skipSubjectCheck);+ profile = await fetchUserInfo(client, tokens.access_token, skipSubjectCheck);}if (!profile.sub) {@@ -124,7 +135,6 @@ export class OAuthRepository {timeout,}: OAuthConfig) {try {- const { allowInsecureRequests, discovery } = await import('openid-client');return await discovery(new URL(issuerUrl),clientId,@@ -134,7 +144,7 @@ export class OAuthRepository {userinfo_signed_response_alg: profileSigningAlgorithm === 'none' ? undefined : profileSigningAlgorithm,id_token_signed_response_alg: signingAlgorithm,},- await this.getTokenAuthMethod(tokenEndpointAuthMethod, clientSecret),+ this.getTokenAuthMethod(tokenEndpointAuthMethod, clientSecret),{execute: [allowInsecureRequests],timeout,@@ -146,9 +156,7 @@ export class OAuthRepository {}}- private async getTokenAuthMethod(tokenEndpointAuthMethod: OAuthTokenEndpointAuthMethod, clientSecret?: string) {- const { None, ClientSecretPost, ClientSecretBasic } = await import('openid-client');-+ private getTokenAuthMethod(tokenEndpointAuthMethod: OAuthTokenEndpointAuthMethod, clientSecret?: string) {if (!clientSecret) {return None();}