@contember/engine-tenant-api 2.0.0-alpha.19 → 2.0.0-alpha.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-tenant-api",
-  "version": "2.0.0-alpha.19",
+  "version": "2.0.0-alpha.20",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -26,30 +26,30 @@
     "generate": "gql-gen --config graphql.codegen.yml"
   },
   "dependencies": {
-    "@contember/authorization": "2.0.0-alpha.19",
-    "@contember/config-loader": "2.0.0-alpha.19",
-    "@contember/database": "2.0.0-alpha.19",
-    "@contember/database-migrations": "2.0.0-alpha.19",
-    "@contember/dic": "2.0.0-alpha.19",
-    "@contember/graphql-utils": "2.0.0-alpha.19",
-    "@contember/logger": "2.0.0-alpha.19",
-    "@contember/schema": "2.0.0-alpha.19",
-    "@contember/schema-utils": "2.0.0-alpha.19",
-    "@contember/typesafe": "2.0.0-alpha.19",
-    "@graphql-tools/utils": "^10.5.4",
+    "@contember/authorization": "2.0.0-alpha.20",
+    "@contember/config-loader": "2.0.0-alpha.20",
+    "@contember/database": "2.0.0-alpha.20",
+    "@contember/database-migrations": "2.0.0-alpha.20",
+    "@contember/dic": "2.0.0-alpha.20",
+    "@contember/graphql-utils": "2.0.0-alpha.20",
+    "@contember/logger": "2.0.0-alpha.20",
+    "@contember/schema": "2.0.0-alpha.20",
+    "@contember/schema-utils": "2.0.0-alpha.20",
+    "@contember/typesafe": "2.0.0-alpha.20",
+    "@graphql-tools/utils": "^10.5.5",
     "graphql-tag": "^2.12.6",
     "jose": "^5.8.0",
     "mustache": "^4.2.0",
     "nodemailer": "^6.9.15",
     "openid-client": "^5.7.0",
-    "otpauth": "^9.3.2"
+    "otpauth": "^9.3.4"
   },
   "devDependencies": {
-    "@contember/database-tester": "2.0.0-alpha.19",
-    "@graphql-tools/schema": "^10.0.6",
+    "@contember/database-tester": "2.0.0-alpha.20",
+    "@graphql-tools/schema": "^10.0.7",
     "@types/mustache": "^4.2.5",
-    "@types/node": "^20.16.5",
-    "@types/nodemailer": "^6.4.15",
+    "@types/node": "^20.16.11",
+    "@types/nodemailer": "^6.4.16",
     "graphql": "^16.9.0"
   },
   "peerDependencies": {

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

@@ -25,7 +25,7 @@ export const initOIDCAuth = async (client: Client, { redirectUrl, scope, respons
 	}
 }
 
-export const handleOIDCResponse = async (client: Client, { sessionData, redirectUrl, ...otherData }: OIDCResponseData): Promise<IDPResponse> => {
+export const handleOIDCResponse = async (client: Client, { sessionData, redirectUrl, ...otherData }: OIDCResponseData, fetchUserInfo?: boolean): Promise<IDPResponse> => {
 	const params = 'parameters' in otherData ? otherData.parameters : client.callbackParams(otherData.url)
 	if (params.state && !sessionData?.state) {
 		throw new IDPValidationError(`state is present in parameters, but missing in session data`)
@@ -34,9 +34,12 @@ export const handleOIDCResponse = async (client: Client, { sessionData, redirect
 		const result = await client.callback(redirectUrl, params, sessionData)
 		const claims = result.claims()
 		const { at_hash, c_hash, nonce, ...claimsWithoutHashes } = claims
+		const userInfo = result.access_token && fetchUserInfo ? await client.userinfo(result) : {}
+
 		return {
 			externalIdentifier: claims.sub,
 			...claimsWithoutHashes,
+			...userInfo,
 		}
 	} catch (e: any) {
 		if (e instanceof errors.RPError) {

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

@@ -24,7 +24,7 @@ export class OIDCProvider implements IdentityProviderHandler<OIDCConfiguration>
 	public async processResponse(configuration: OIDCConfiguration, data: unknown): Promise<IDPResponse> {
 		const responseData = catchTypesafe(OIDCResponseData, IDPValidationError)(data)
 		const client = await this.createOIDCClient(configuration)
-		return await handleOIDCResponse(client, responseData)
+		return await handleOIDCResponse(client, responseData, configuration.fetchUserInfo)
 	}
 
 

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

@@ -12,6 +12,7 @@ export const OIDCConfigurationOptions = Typesafe.partial({
 	scope: Typesafe.string,
 	additionalAuthorizedParties: Typesafe.array(Typesafe.string),
 	idTokenSignedResponseAlg: Typesafe.string,
+	fetchUserInfo: Typesafe.boolean,
 })
 export const BaseOIDCConfiguration = Typesafe.intersection(
 	Typesafe.object({