@contember/engine-tenant-api 1.3.0-rc.2 → 1.3.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-tenant-api",
-  "version": "1.3.0-rc.2",
+  "version": "1.3.0-rc.3",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -13,16 +13,16 @@
     "test": "vitest --dir ./tests/cases --no-threads"
   },
   "dependencies": {
-    "@contember/authorization": "1.3.0-rc.2",
-    "@contember/config-loader": "1.3.0-rc.2",
-    "@contember/database": "1.3.0-rc.2",
-    "@contember/database-migrations": "1.3.0-rc.2",
-    "@contember/dic": "1.3.0-rc.2",
-    "@contember/graphql-utils": "1.3.0-rc.2",
-    "@contember/logger": "1.3.0-rc.2",
-    "@contember/schema": "1.3.0-rc.2",
-    "@contember/schema-utils": "1.3.0-rc.2",
-    "@contember/typesafe": "1.3.0-rc.2",
+    "@contember/authorization": "1.3.0-rc.3",
+    "@contember/config-loader": "1.3.0-rc.3",
+    "@contember/database": "1.3.0-rc.3",
+    "@contember/database-migrations": "1.3.0-rc.3",
+    "@contember/dic": "1.3.0-rc.3",
+    "@contember/graphql-utils": "1.3.0-rc.3",
+    "@contember/logger": "1.3.0-rc.3",
+    "@contember/schema": "1.3.0-rc.3",
+    "@contember/schema-utils": "1.3.0-rc.3",
+    "@contember/typesafe": "1.3.0-rc.3",
     "@graphql-tools/utils": "^8.6.13",
     "graphql-tag": "^2.12.5",
     "jose": "^4.10",
@@ -32,7 +32,7 @@
     "otpauth": "^7.0.6"
   },
   "devDependencies": {
-    "@contember/database-tester": "1.3.0-rc.2",
+    "@contember/database-tester": "1.3.0-rc.3",
     "@graphql-codegen/cli": "^2.6.2",
     "@graphql-codegen/typescript": "^2.5.1",
     "@graphql-codegen/typescript-operations": "^2.4.2",

package/src/model/mailing/UserMailer.ts

@@ -11,11 +11,11 @@ export class UserMailer {
 	constructor(
 		private readonly mailer: Mailer,
 		private readonly templateRenderer: TemplateRenderer,
-	) {}
+	) { }
 
 	async sendNewUserInvitedMail(
 		dbContext: DatabaseContext,
-		mailArguments: { email: string; password: string | null; token: string | null; project: string },
+		mailArguments: { email: string; password: string | null; token: string | null; project: string; projectSlug: string },
 		customMailOptions: { projectId: string; variant: string },
 	): Promise<void> {
 		const template = (await this.getCustomTemplate(dbContext, { type: MailType.newUserInvited, ...customMailOptions })) || {
@@ -27,7 +27,7 @@ export class UserMailer {
 
 	async sendExistingUserInvitedEmail(
 		dbContext: DatabaseContext,
-		mailArguments: { email: string; project: string },
+		mailArguments: { email: string; project: string; projectSlug: string },
 		customMailOptions: { projectId: string; variant: string },
 	): Promise<void> {
 		const template = (await this.getCustomTemplate(dbContext, { type: MailType.existingUserInvited, ...customMailOptions })) || {
@@ -39,7 +39,7 @@ export class UserMailer {
 
 	async sendPasswordResetEmail(
 		dbContext: DatabaseContext,
-		mailArguments: { email: string; token: string; project?: string },
+		mailArguments: { email: string; token: string; project?: string; projectSlug?: string },
 		customMailOptions: { projectId?: string; variant: string },
 	): Promise<void> {
 		const template = (await this.getCustomTemplate(dbContext, { type: MailType.passwordReset, ...customMailOptions })) || {

package/src/model/service/InviteManager.ts

@@ -36,7 +36,7 @@ export class InviteManager {
 		private readonly providers: Providers,
 		private readonly mailer: UserMailer,
 		private readonly projectSchemaResolver: ProjectSchemaResolver,
-	) {}
+	) { }
 
 	async invite(
 		dbContext: DatabaseContext,
@@ -89,11 +89,11 @@ export class InviteManager {
 				if (isNew) {
 					await this.mailer.sendNewUserInvitedMail(
 						trx,
-						{ email, project: project.name, password: generatedPassword, token: resetToken },
+						{ email, project: project.name, projectSlug: project.slug, password: generatedPassword, token: resetToken },
 						customMailOptions,
 					)
 				} else {
-					await this.mailer.sendExistingUserInvitedEmail(trx, { email, project: project.name }, customMailOptions)
+					await this.mailer.sendExistingUserInvitedEmail(trx, { email, project: project.name, projectSlug: project.slug }, customMailOptions)
 				}
 			}
 			return new ResponseOk(new InviteResult(person, isNew))
@@ -110,5 +110,5 @@ export class InviteManager {
 export type InviteResponse = Response<InviteResult, InviteErrorCode>
 
 export class InviteResult {
-	constructor(public readonly person: Omit<PersonRow, 'roles'>, public readonly isNew: boolean) {}
+	constructor(public readonly person: Omit<PersonRow, 'roles'>, public readonly isNew: boolean) { }
 }

package/src/model/service/PasswordResetManager.ts

@@ -17,7 +17,7 @@ export class PasswordResetManager {
 	constructor(
 		private readonly mailer: UserMailer,
 		private readonly projectManager: ProjectManager,
-	) {}
+	) { }
 
 	public async createPasswordResetRequest(
 		dbContext: DatabaseContext,
@@ -45,6 +45,7 @@ export class PasswordResetManager {
 				email: person.email,
 				token: result.token,
 				project: project?.name,
+				projectSlug: project?.slug,
 			},
 			{
 				variant: mailOptions.mailVariant || '',

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

@@ -56,10 +56,16 @@ export class AppleProvider implements IdentityProviderHandler<AppleConfiguration
 			.setExpirationTime('10m')
 			.sign(privateKey)
 
-		return new this.issuer.Client({
-			client_id: configuration.clientId,
-			client_secret: jwt,
-			response_types: [configuration.responseType || 'code'],
-		})
+		return new this.issuer.Client(
+			{
+				client_id: configuration.clientId,
+				client_secret: jwt,
+				response_types: [configuration.responseType || 'code'],
+			},
+			undefined,
+			{
+				additionalAuthorizedParties: [...(configuration.additionalAuthorizedParties ?? [])],
+			},
+		)
 	}
 }

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

@@ -116,10 +116,16 @@ export class FacebookProvider implements IdentityProviderHandler<FacebookConfigu
 	}
 
 	private async createOIDCClient(configuration: FacebookConfiguration): Promise<Client> {
-		return new this.facebookIssuer.Client({
-			client_id: configuration.clientId,
-			client_secret: configuration.clientSecret,
-			response_types: [configuration.responseType || 'code'],
-		})
+		return new this.facebookIssuer.Client(
+			{
+				client_id: configuration.clientId,
+				client_secret: configuration.clientSecret,
+				response_types: [configuration.responseType || 'code'],
+			},
+			undefined,
+			{
+				additionalAuthorizedParties: [...(configuration.additionalAuthorizedParties ?? [])],
+			},
+		)
 	}
 }

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

@@ -31,10 +31,16 @@ 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({
-			client_id: configuration.clientId,
-			client_secret: configuration.clientSecret,
-			response_types: [configuration.responseType || 'code'],
-		})
+		return new this.issuerCache[configuration.url].Client(
+			{
+				client_id: configuration.clientId,
+				client_secret: configuration.clientSecret,
+				response_types: [configuration.responseType || 'code'],
+			},
+			undefined,
+			{
+				additionalAuthorizedParties: [...(configuration.additionalAuthorizedParties ?? [])],
+			},
+		)
 	}
 }

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

@@ -9,6 +9,7 @@ export interface OIDCSessionData {
 export const OIDCConfigurationOptions = Typesafe.partial({
 	responseType: Typesafe.enumeration<ResponseType>('code', 'code id_token', 'code id_token token', 'code token', 'id_token', 'id_token token', 'none'),
 	claims: Typesafe.string,
+	additionalAuthorizedParties: Typesafe.array(Typesafe.string),
 })
 export const BaseOIDCConfiguration = Typesafe.intersection(
 	Typesafe.object({