@contember/engine-tenant-api 1.4.0-rc.3 → 1.4.0-rc.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-tenant-api",
-  "version": "1.4.0-rc.3",
+  "version": "1.4.0-rc.5",
   "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.4.0-rc.3",
-    "@contember/config-loader": "1.4.0-rc.3",
-    "@contember/database": "1.4.0-rc.3",
-    "@contember/database-migrations": "1.4.0-rc.3",
-    "@contember/dic": "1.4.0-rc.3",
-    "@contember/graphql-utils": "1.4.0-rc.3",
-    "@contember/logger": "1.4.0-rc.3",
-    "@contember/schema": "1.4.0-rc.3",
-    "@contember/schema-utils": "1.4.0-rc.3",
-    "@contember/typesafe": "1.4.0-rc.3",
+    "@contember/authorization": "1.4.0-rc.5",
+    "@contember/config-loader": "1.4.0-rc.5",
+    "@contember/database": "1.4.0-rc.5",
+    "@contember/database-migrations": "1.4.0-rc.5",
+    "@contember/dic": "1.4.0-rc.5",
+    "@contember/graphql-utils": "1.4.0-rc.5",
+    "@contember/logger": "1.4.0-rc.5",
+    "@contember/schema": "1.4.0-rc.5",
+    "@contember/schema-utils": "1.4.0-rc.5",
+    "@contember/typesafe": "1.4.0-rc.5",
     "@graphql-tools/utils": "^10.0.8",
     "graphql-tag": "^2.12.6",
     "jose": "^5.1.1",
@@ -32,7 +32,7 @@
     "otpauth": "^9.1.5"
   },
   "devDependencies": {
-    "@contember/database-tester": "1.4.0-rc.3",
+    "@contember/database-tester": "1.4.0-rc.5",
     "@graphql-codegen/cli": "^5.0.0",
     "@graphql-codegen/typescript": "^4.0.1",
     "@graphql-codegen/typescript-operations": "^4.0.1",

package/src/TenantContainer.ts

@@ -218,8 +218,8 @@ export class TenantContainerFactory {
 				new ProjectQueryResolver(projectManager))
 			.addService('projectMembersQueryResolver', ({ projectManager, projectMemberManager }) =>
 				new ProjectMembersQueryResolver(projectManager, projectMemberManager))
-			.addService('mailTemplateQueryResolver', ({ mailTemplateManager }) =>
-				new MailTemplateQueryResolver(mailTemplateManager))
+			.addService('mailTemplateQueryResolver', () =>
+				new MailTemplateQueryResolver())
 			.addService('signUpMutationResolver', ({ signUpManager, apiKeyManager }) =>
 				new SignUpMutationResolver(signUpManager, apiKeyManager))
 			.addService('signInMutationResolver', ({ signInManager, signInResponseFactory }) =>

package/src/model/authorization/PermissionActions.ts

@@ -24,6 +24,7 @@ namespace PermissionActions {
 	export const PERSON_SIGN_UP = (roles?: readonly string[]) => Authorizator.createAction(Resources.person, 'signUp', { roles })
 	export const PERSON_SIGN_OUT = Authorizator.createAction(Resources.person, 'signOut')
 	export const PERSON_SETUP_OTP = Authorizator.createAction(Resources.person, 'setupOtp')
+	export const PERSON_CHANGE_PROFILE = Authorizator.createAction(Resources.person, 'changeProfile')
 	export const PERSON_CHANGE_MY_PROFILE = Authorizator.createAction(Resources.person, 'changeMyProfile')
 	export const PERSON_CHANGE_PASSWORD = Authorizator.createAction(Resources.person, 'changePassword')
 	export const PERSON_CHANGE_MY_PASSWORD = Authorizator.createAction(Resources.person, 'changeMyPassword')

package/src/model/service/PersonManager.ts

@@ -1,9 +1,8 @@
-import { ChangeMyProfileErrorCode } from '../../schema'
 import { ChangeProfileCommand, ChangeProfileData } from '../commands/person/ChangeProfileCommand'
 import { Response, ResponseError, ResponseOk } from '../utils/Response'
 import { PersonQuery, PersonRow } from '../queries'
 import { DatabaseContext } from '../utils'
-import { EmailValidator } from './EmailValidator'
+import { EmailValidator, EmailValidatorError } from './EmailValidator'
 
 class PersonManager {
 	constructor(
@@ -17,7 +16,7 @@ class PersonManager {
 		)
 	}
 
-	async changeMyProfile(dbContext: DatabaseContext, person: PersonRow, data: ChangeProfileData): Promise<PersonManager.ProfileChangeResponse> {
+	async changeProfile(dbContext: DatabaseContext, person: PersonRow, data: ChangeProfileData): Promise<PersonManager.ProfileChangeResponse> {
 		if (data.email !== undefined && person.email !== data.email) {
 			const validationError = await this.emailValidator.validateEmail(dbContext, data.email)
 			if (validationError !== null) {
@@ -31,7 +30,7 @@ class PersonManager {
 }
 
 namespace PersonManager {
-	export type ProfileChangeResponse = Response<null, ChangeMyProfileErrorCode>
+	export type ProfileChangeResponse = Response<null, EmailValidatorError>
 }
 
 export { PersonManager }

package/src/resolvers/ResolverFactory.ts

@@ -112,6 +112,7 @@ class ResolverFactory {
 				createSessionToken: this.resolvers.signInMutationResolver.createSessionToken.bind(this.resolvers.signInMutationResolver),
 				signOut: this.resolvers.signOutMutationResolver.signOut.bind(this.resolvers.signOutMutationResolver),
 
+				changeProfile: this.resolvers.changeProfileMutationResolver.changeProfile.bind(this.resolvers.changeProfileMutationResolver),
 				changeMyProfile: this.resolvers.changeProfileMutationResolver.changeMyProfile.bind(this.resolvers.changeProfileMutationResolver),
 				changePassword: this.resolvers.changePasswordMutationResolver.changePassword.bind(this.resolvers.changePasswordMutationResolver),
 				changeMyPassword: this.resolvers.changePasswordMutationResolver.changeMyPassword.bind(this.resolvers.changePasswordMutationResolver),

package/src/resolvers/mutation/person/ChangeProfileMutationResolver.ts

@@ -1,14 +1,52 @@
-import { ChangeMyProfileResponse, MutationChangeMyProfileArgs, MutationResolvers } from '../../../schema'
+import {
+	ChangeMyProfileResponse,
+	ChangeProfileResponse,
+	MutationChangeMyProfileArgs,
+	MutationChangeProfileArgs,
+	MutationResolvers,
+} from '../../../schema'
 import { GraphQLResolveInfo } from 'graphql'
 import { TenantResolverContext } from '../../TenantResolverContext'
-import { PermissionActions, PersonManager, PersonQuery } from '../../../model'
+import { IdentityScope, PermissionActions, PersonManager, PersonQuery } from '../../../model'
 import { createErrorResponse } from '../../errorUtils'
 
-export class ChangeProfileMutationResolver implements MutationResolvers {
+export class ChangeProfileMutationResolver implements Pick<MutationResolvers, 'changeMyProfile' | 'changeProfile'> {
 	constructor(
 		private readonly personManager: PersonManager,
 	) { }
 
+	async changeProfile(
+		parent: unknown,
+		args: MutationChangeProfileArgs,
+		context: TenantResolverContext,
+		info: GraphQLResolveInfo,
+	): Promise<ChangeProfileResponse> {
+		const person = await context.db.queryHandler.fetch(PersonQuery.byId(args.personId))
+		if (!person) {
+			return createErrorResponse('PERSON_NOT_FOUND', 'Person not found')
+		}
+		if (args.email === null) {
+			return createErrorResponse('INVALID_EMAIL_FORMAT', 'E-mail address cannot be null.')
+		}
+
+		await context.requireAccess({
+			scope: new IdentityScope(person.identity_id),
+			action: PermissionActions.PERSON_CHANGE_PROFILE,
+			message: 'You are not allowed to change a profile',
+		})
+		const result = await this.personManager.changeProfile(context.db, person, {
+			email: args.email,
+			name: args.name === '' ? null : args.name,
+		})
+
+		if (!result.ok) {
+			return createErrorResponse(result.error, result.errorMessage)
+		}
+
+		return { ok: true }
+	}
+
+
 	async changeMyProfile(
 		parent: unknown,
 		args: MutationChangeMyProfileArgs,
@@ -28,7 +66,7 @@ export class ChangeProfileMutationResolver implements MutationResolvers {
 			message: 'You are not allowed to change profile',
 		})
 
-		const result = await this.personManager.changeMyProfile(context.db, person, {
+		const result = await this.personManager.changeProfile(context.db, person, {
 			email: args.email,
 			name: args.name === '' ? null : args.name,
 		})

package/src/resolvers/query/MailTemplateQueryResolver.ts

@@ -1,18 +1,12 @@
 import { MailTemplateData, QueryResolvers } from '../../schema'
-import { MailTemplateListQuery, MailTemplateManager, mailTypeFromDbToSchema, PermissionActions } from '../../model'
+import { MailTemplateListQuery, mailTypeFromDbToSchema, PermissionActions } from '../../model'
 import { TenantResolverContext } from '../TenantResolverContext'
 
 export class MailTemplateQueryResolver implements QueryResolvers {
-
-	constructor(
-		private readonly mailTemplateManager: MailTemplateManager,
-	) {
-	}
-
 	async mailTemplates(parent: unknown, args: unknown, context: TenantResolverContext): Promise<MailTemplateData[]> {
 		await context.requireAccess({
-			action: PermissionActions.IDP_LIST,
-			message: 'You are not allowed to list IDP',
+			action: PermissionActions.MAIL_TEMPLATE_LIST,
+			message: 'You are not allowed to list mail templates',
 		})
 		return (await context.db.queryHandler.fetch(new MailTemplateListQuery())).map(it => ({
 			...it,

package/src/schema/index.ts

@@ -171,6 +171,23 @@ export type ChangePasswordResponse = {
 	readonly ok: Scalars['Boolean']['output']
 }
 
+export type ChangeProfileError = {
+	readonly __typename?: 'ChangeProfileError'
+	readonly code: ChangeProfileErrorCode
+	readonly developerMessage: Scalars['String']['output']
+}
+
+export type ChangeProfileErrorCode =
+  | 'EMAIL_ALREADY_EXISTS'
+  | 'INVALID_EMAIL_FORMAT'
+  | 'PERSON_NOT_FOUND'
+
+export type ChangeProfileResponse = {
+	readonly __typename?: 'ChangeProfileResponse'
+	readonly error?: Maybe<ChangeProfileError>
+	readonly ok: Scalars['Boolean']['output']
+}
+
 export type CheckResetPasswordTokenCode =
   | 'REQUEST_NOT_FOUND'
   | 'TOKEN_EXPIRED'
@@ -587,6 +604,7 @@ export type Mutation = {
 	readonly changeMyPassword?: Maybe<ChangeMyPasswordResponse>
 	readonly changeMyProfile?: Maybe<ChangeMyProfileResponse>
 	readonly changePassword?: Maybe<ChangePasswordResponse>
+	readonly changeProfile?: Maybe<ChangeProfileResponse>
 	readonly confirmOtp?: Maybe<ConfirmOtpResponse>
 	readonly createApiKey?: Maybe<CreateApiKeyResponse>
 	readonly createGlobalApiKey?: Maybe<CreateApiKeyResponse>
@@ -668,6 +686,13 @@ export type MutationChangePasswordArgs = {
 }
 
 
+export type MutationChangeProfileArgs = {
+	email?: InputMaybe<Scalars['String']['input']>
+	name?: InputMaybe<Scalars['String']['input']>
+	personId: Scalars['String']['input']
+}
+
+
 export type MutationConfirmOtpArgs = {
 	otpToken: Scalars['String']['input']
 }
@@ -1352,6 +1377,9 @@ export type ResolversTypes = {
 	ChangePasswordError: ResolverTypeWrapper<ChangePasswordError>
 	ChangePasswordErrorCode: ChangePasswordErrorCode
 	ChangePasswordResponse: ResolverTypeWrapper<ChangePasswordResponse>
+	ChangeProfileError: ResolverTypeWrapper<ChangeProfileError>
+	ChangeProfileErrorCode: ChangeProfileErrorCode
+	ChangeProfileResponse: ResolverTypeWrapper<ChangeProfileResponse>
 	CheckResetPasswordTokenCode: CheckResetPasswordTokenCode
 	CheckResetPasswordTokenResult: ResolverTypeWrapper<CheckResetPasswordTokenResult>
 	CommonSignInResult: ResolverTypeWrapper<ResolversInterfaceTypes<ResolversTypes>['CommonSignInResult']>
@@ -1500,6 +1528,8 @@ export type ResolversParentTypes = {
 	ChangeMyProfileResponse: ChangeMyProfileResponse
 	ChangePasswordError: ChangePasswordError
 	ChangePasswordResponse: ChangePasswordResponse
+	ChangeProfileError: ChangeProfileError
+	ChangeProfileResponse: ChangeProfileResponse
 	CheckResetPasswordTokenResult: CheckResetPasswordTokenResult
 	CommonSignInResult: ResolversInterfaceTypes<ResolversParentTypes>['CommonSignInResult']
 	ConfirmOtpError: ConfirmOtpError
@@ -1709,6 +1739,18 @@ export type ChangePasswordResponseResolvers<ContextType = any, ParentType extend
 	__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>
 }
 
+export type ChangeProfileErrorResolvers<ContextType = any, ParentType extends ResolversParentTypes['ChangeProfileError'] = ResolversParentTypes['ChangeProfileError']> = {
+	code?: Resolver<ResolversTypes['ChangeProfileErrorCode'], ParentType, ContextType>
+	developerMessage?: Resolver<ResolversTypes['String'], ParentType, ContextType>
+	__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>
+}
+
+export type ChangeProfileResponseResolvers<ContextType = any, ParentType extends ResolversParentTypes['ChangeProfileResponse'] = ResolversParentTypes['ChangeProfileResponse']> = {
+	error?: Resolver<Maybe<ResolversTypes['ChangeProfileError']>, ParentType, ContextType>
+	ok?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>
+	__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>
+}
+
 export type CheckResetPasswordTokenResultResolvers<ContextType = any, ParentType extends ResolversParentTypes['CheckResetPasswordTokenResult'] = ResolversParentTypes['CheckResetPasswordTokenResult']> = {
 	code?: Resolver<ResolversTypes['CheckResetPasswordTokenCode'], ParentType, ContextType>
 	__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>
@@ -1994,6 +2036,7 @@ export type MutationResolvers<ContextType = any, ParentType extends ResolversPar
 	changeMyPassword?: Resolver<Maybe<ResolversTypes['ChangeMyPasswordResponse']>, ParentType, ContextType, RequireFields<MutationChangeMyPasswordArgs, 'currentPassword' | 'newPassword'>>
 	changeMyProfile?: Resolver<Maybe<ResolversTypes['ChangeMyProfileResponse']>, ParentType, ContextType, Partial<MutationChangeMyProfileArgs>>
 	changePassword?: Resolver<Maybe<ResolversTypes['ChangePasswordResponse']>, ParentType, ContextType, RequireFields<MutationChangePasswordArgs, 'password' | 'personId'>>
+	changeProfile?: Resolver<Maybe<ResolversTypes['ChangeProfileResponse']>, ParentType, ContextType, RequireFields<MutationChangeProfileArgs, 'personId'>>
 	confirmOtp?: Resolver<Maybe<ResolversTypes['ConfirmOtpResponse']>, ParentType, ContextType, RequireFields<MutationConfirmOtpArgs, 'otpToken'>>
 	createApiKey?: Resolver<Maybe<ResolversTypes['CreateApiKeyResponse']>, ParentType, ContextType, RequireFields<MutationCreateApiKeyArgs, 'description' | 'memberships' | 'projectSlug'>>
 	createGlobalApiKey?: Resolver<Maybe<ResolversTypes['CreateApiKeyResponse']>, ParentType, ContextType, RequireFields<MutationCreateGlobalApiKeyArgs, 'description'>>
@@ -2311,6 +2354,8 @@ export type Resolvers<ContextType = any> = {
 	ChangeMyProfileResponse?: ChangeMyProfileResponseResolvers<ContextType>
 	ChangePasswordError?: ChangePasswordErrorResolvers<ContextType>
 	ChangePasswordResponse?: ChangePasswordResponseResolvers<ContextType>
+	ChangeProfileError?: ChangeProfileErrorResolvers<ContextType>
+	ChangeProfileResponse?: ChangeProfileResponseResolvers<ContextType>
 	CheckResetPasswordTokenResult?: CheckResetPasswordTokenResultResolvers<ContextType>
 	CommonSignInResult?: CommonSignInResultResolvers<ContextType>
 	ConfirmOtpError?: ConfirmOtpErrorResolvers<ContextType>

package/src/schema/tenant.graphql.ts

@@ -27,6 +27,7 @@ const schema: DocumentNode = gql`
 		signIn(email: String!, password: String!, expiration: Int, otpToken: String): SignInResponse
 		createSessionToken(email: String, personId: String, expiration: Int): CreateSessionTokenResponse
 		signOut(all: Boolean): SignOutResponse
+		changeProfile(personId: String!, email: String, name: String): ChangeProfileResponse
 		changeMyProfile(email: String, name: String): ChangeMyProfileResponse
 		changePassword(personId: String!, password: String!): ChangePasswordResponse
 		changeMyPassword(currentPassword: String!, newPassword: String!): ChangeMyPasswordResponse
@@ -206,6 +207,24 @@ const schema: DocumentNode = gql`
 	}
 
 	# === changeProfile ===
+	
+	type ChangeProfileResponse {
+		ok: Boolean!
+		error: ChangeProfileError
+	}
+	
+	type ChangeProfileError {
+		code: ChangeProfileErrorCode!
+		developerMessage: String!
+	}
+	
+	enum ChangeProfileErrorCode {
+		PERSON_NOT_FOUND
+		INVALID_EMAIL_FORMAT
+		EMAIL_ALREADY_EXISTS
+	}
+	
+	# === changeMyProfile ===
 
 	type ChangeMyProfileResponse {
 		ok: Boolean!
@@ -221,7 +240,7 @@ const schema: DocumentNode = gql`
 		NOT_A_PERSON
 		INVALID_EMAIL_FORMAT
 		EMAIL_ALREADY_EXISTS
-	}
+	}	
 
 	# === changePassword ===
 
@@ -243,6 +262,8 @@ const schema: DocumentNode = gql`
 	}
 
 
+	# === changeMyPassword ===
+	
 	type ChangeMyPasswordResponse {
 		ok: Boolean!
 		error: ChangeMyPasswordError

package/tests/cases/integration/mocked/changeProfileMutation.test.ts

@@ -0,0 +1,37 @@
+import { executeTenantTest } from '../../../src/testTenant'
+import { testUuid } from '../../../src/testUuid'
+import { test } from 'vitest'
+import { changeProfileMutation } from './gql/changeProfile'
+import { updatePersonProfileNameAndEmailSql } from './sql/updatePesonNameSql'
+import { authenticatedIdentityId } from '../../../src/testTenantDb'
+import { getPersonByIdentity } from './sql/getPersonByIdentity'
+import { getPersonByEmailSql } from './sql/getPersonByEmailSql'
+import { getPersonByIdSql } from './sql/getPersonByIdSql'
+
+test('changes my name and email', async () => {
+
+	const personId = testUuid(1)
+	const identityId = authenticatedIdentityId
+	const email = 'jane@doe.com'
+	const name = 'Jane Doe'
+	await executeTenantTest({
+		query: changeProfileMutation({ personId, email, name }),
+		executes: [
+			getPersonByIdSql({
+				personId,
+				response: { personId, email: 'john.doe@example.com', name: 'John Doe', roles: [], password: '123456', identityId },
+			}),
+			getPersonByEmailSql({ email, response: null }),
+			updatePersonProfileNameAndEmailSql({ personId, email, name }),
+		],
+		return: {
+			data: {
+				changeProfile: {
+					ok: true,
+					error: null,
+				},
+			},
+		},
+	})
+})
+

package/tests/cases/integration/mocked/gql/changeProfile.ts

@@ -0,0 +1,14 @@
+import { GraphQLTestQuery } from './types'
+import { GQL } from '../../../../src/tags'
+
+export const changeProfileMutation = (variables: { personId: string; email?: string; name?: string }): GraphQLTestQuery => ({
+	query: GQL`mutation($personId: String!, $email: String, $name: String) {
+          changeProfile(personId: $personId, email: $email, name: $name) {
+            ok
+            error {
+            	code
+            }
+          }
+        }`,
+	variables,
+})