@contember/engine-tenant-api 2.0.0-rc.2 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-tenant-api",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.1",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -26,16 +26,16 @@
     "generate": "gql-gen --config graphql.codegen.yml"
   },
   "dependencies": {
-    "@contember/authorization": "2.0.0-rc.2",
-    "@contember/config-loader": "2.0.0-rc.2",
-    "@contember/database": "2.0.0-rc.2",
-    "@contember/database-migrations": "2.0.0-rc.2",
-    "@contember/dic": "2.0.0-rc.2",
-    "@contember/graphql-utils": "2.0.0-rc.2",
-    "@contember/logger": "2.0.0-rc.2",
-    "@contember/schema": "2.0.0-rc.2",
-    "@contember/schema-utils": "2.0.0-rc.2",
-    "@contember/typesafe": "2.0.0-rc.2",
+    "@contember/authorization": "2.0.1",
+    "@contember/config-loader": "2.0.1",
+    "@contember/database": "2.0.1",
+    "@contember/database-migrations": "2.0.1",
+    "@contember/dic": "2.0.1",
+    "@contember/graphql-utils": "2.0.1",
+    "@contember/logger": "2.0.1",
+    "@contember/schema": "2.0.1",
+    "@contember/schema-utils": "2.0.1",
+    "@contember/typesafe": "2.0.1",
     "@graphql-tools/utils": "^10.5.5",
     "graphql-tag": "^2.12.6",
     "jose": "^5.8.0",
@@ -45,7 +45,7 @@
     "otpauth": "^9.3.4"
   },
   "devDependencies": {
-    "@contember/database-tester": "2.0.0-rc.2",
+    "@contember/database-tester": "2.0.1",
     "@graphql-tools/schema": "^10.0.7",
     "@types/mustache": "^4.2.5",
     "@types/node": "^20.16.11",

package/src/model/service/idp/providers/OIDCHelpers.ts

@@ -4,10 +4,6 @@ import { IDPValidationError } from '../IDPValidationError'
 import { IDPResponseError } from '../IDPResponseError'
 import { IDPResponse, InitIDPAuthResult } from '../IdentityProviderHandler'
 
-custom.setHttpOptionsDefaults({
-	timeout: 5000,
-})
-
 export const initOIDCAuth = async (client: Client, { redirectUrl, scope, responseMode }: { redirectUrl: string; scope?: string; responseMode?: string }): Promise<InitIDPAuthResult> => {
 	const nonce = generators.nonce()
 	const state = generators.state()
@@ -36,7 +32,7 @@ export const handleOIDCResponse = async (client: Client, { sessionData, redirect
 		const { at_hash, c_hash, nonce, ...claimsWithoutHashes } = claims
 		const userInfo = result.access_token && fetchUserInfo ? await client.userinfo(result) : {}
 		const oidcResult = returnOIDCResult ? result : {}
-		
+
 		return {
 			externalIdentifier: claims.sub,
 			...oidcResult,

package/src/model/service/idp/providers/OIDCProvider.ts

@@ -1,4 +1,4 @@
-import { Client, Issuer } from 'openid-client'
+import { Client, custom, Issuer } from 'openid-client'
 import { IdentityProviderHandler, IDPResponse, InitIDPAuthResult } from '../IdentityProviderHandler'
 import { InvalidIDPConfigurationError } from '../InvalidIDPConfigurationError'
 import { catchTypesafe } from './helpers'
@@ -6,6 +6,7 @@ import { OIDCConfiguration, OIDCInitData, OIDCResponseData } from './OIDCTypes'
 import { handleOIDCResponse, initOIDCAuth } from './OIDCHelpers'
 import { IDPValidationError } from '../IDPValidationError'
 
+const DEFAULT_OIDC_TIMEOUT = 5000
 
 export class OIDCProvider implements IdentityProviderHandler<OIDCConfiguration> {
 	private issuerCache: Record<string, Issuer<Client>> = {}
@@ -40,7 +41,7 @@ export class OIDCProvider implements IdentityProviderHandler<OIDCConfiguration>
 	private async createOIDCClient(configuration: OIDCConfiguration): Promise<Client> {
 		this.issuerCache[configuration.url] ??= await Issuer.discover(configuration.url)
 
-		return new this.issuerCache[configuration.url].Client(
+		const client = new this.issuerCache[configuration.url].Client(
 			{
 				client_id: configuration.clientId,
 				client_secret: configuration.clientSecret,
@@ -52,5 +53,9 @@ export class OIDCProvider implements IdentityProviderHandler<OIDCConfiguration>
 				additionalAuthorizedParties: [...(configuration.additionalAuthorizedParties ?? [])],
 			},
 		)
+
+		client[custom.http_options] = () => ({ timeout: configuration.timeout ?? DEFAULT_OIDC_TIMEOUT })
+
+		return client
 	}
 }

package/src/model/service/idp/providers/OIDCTypes.ts

@@ -14,6 +14,7 @@ export const OIDCConfigurationOptions = Typesafe.partial({
 	idTokenSignedResponseAlg: Typesafe.string,
 	fetchUserInfo: Typesafe.boolean,
 	returnOIDCResult: Typesafe.boolean,
+	timeout: Typesafe.number,
 })
 export const BaseOIDCConfiguration = Typesafe.intersection(
 	Typesafe.object({