@contember/engine-tenant-api 2.0.0-alpha.9 → 2.0.0-beta.1

package/src/schema/tenant.graphql.ts

@@ -20,6 +20,8 @@ const schema: DocumentNode = gql`
 
 		identityProviders: [IdentityProvider!]!
 		mailTemplates: [MailTemplateData!]!
+		
+		configuration: Config!
 	}
 
 	type Mutation {
@@ -45,6 +47,14 @@ const schema: DocumentNode = gql`
 			redirectUrl: String @deprecated(reason: "use data.redirectUrl"),
 			sessionData: Json @deprecated(reason: "use data.sessionData"),
 		): SignInIDPResponse
+		
+		# passwordless sign in
+		initSignInPasswordless(email: String!, options: InitSignInPasswordlessOptions): InitSignInPasswordlessResponse
+		signInPasswordless(requestId: String!, validationType: PasswordlessValidationType!, token: String!, expiration: Int, mfaOtp: String): SignInPasswordlessResponse
+		activatePasswordlessOtp(requestId: String!, token: String!, otpHash: String!): ActivatePasswordlessOtpResponse
+
+        enableMyPasswordless: ToggleMyPasswordlessResponse
+        disableMyPasswordless: ToggleMyPasswordlessResponse
 
 		# IDP management
 		addIDP(identityProvider: String!, type: String!, configuration: Json!, options: IDPOptions): AddIDPResponse
@@ -95,6 +105,8 @@ const schema: DocumentNode = gql`
 		): CreateProjectResponse
 		setProjectSecret(projectSlug: String!, key: String!, value: String!): SetProjectSecretResponse
 		updateProject(projectSlug: String!, name: String, config: Json, mergeConfig: Boolean): UpdateProjectResponse
+		
+		configure(config: ConfigInput!): ConfigureResponse
 
 		addProjectMailTemplate(template: MailTemplate!): AddMailTemplateResponse
 		@deprecated(reason: "use addMailTemplate")
@@ -103,6 +115,49 @@ const schema: DocumentNode = gql`
 		@deprecated(reason: "use removeMailTemplate")
 
 	}
+	
+	# === configure ===
+	
+	type Config {
+		passwordless: ConfigPasswordless!
+	}
+	
+	type ConfigPasswordless {
+		enabled: ConfigPolicy!
+		url: String
+		expirationMinutes: Int!
+	}
+	
+	input ConfigInput {
+		passwordless: ConfigPasswordlessInput
+	}
+	
+	enum ConfigPolicy {
+		always
+		never
+		optIn
+		optOut
+	}
+	
+	input ConfigPasswordlessInput {
+		enabled: ConfigPolicy
+		url: String
+		expirationMinutes: Int
+	}
+	
+	type ConfigureResponse {
+		ok: Boolean!
+		error: ConfigureError
+	}
+	
+	type ConfigureError {
+		code: ConfigureErrorCode!
+		developerMessage: String!
+	}
+	
+	enum ConfigureErrorCode {
+		INVALID_CONFIG
+	}
 
 	# === signUp ===
 	type SignUpResponse {
@@ -336,6 +391,7 @@ const schema: DocumentNode = gql`
 	type SignInIDPResult implements CommonSignInResult {
 		token: String!
 		person: Person!
+		idpResponse: Json
 	}
 
 	type AddIDPResponse {
@@ -418,6 +474,98 @@ const schema: DocumentNode = gql`
 		initReturnsConfig: Boolean
 	}
 
+	# === passwordless sign in ===
+	
+	type InitSignInPasswordlessResponse {
+		ok: Boolean!
+		error: InitSignInPasswordlessError
+		result: InitSignInPasswordlessResult
+	}
+	
+	type InitSignInPasswordlessError {
+		code: InitSignInPasswordlessErrorCode!
+		developerMessage: String!
+	}
+	
+	enum InitSignInPasswordlessErrorCode {
+		PERSON_NOT_FOUND
+		
+		PASSWORDLESS_DISABLED
+	}
+	
+	type InitSignInPasswordlessResult {
+		requestId: String!
+		expiresAt: DateTime!
+	}
+
+	input InitSignInPasswordlessOptions {
+		mailVariant: String
+		mailProject: String
+	}
+	
+	type SignInPasswordlessResponse {
+		ok: Boolean!
+		error: SignInPasswordlessError
+		result: SignInPasswordlessResult
+	}
+	
+	enum PasswordlessValidationType {
+		otp
+		token
+	}
+	
+	type SignInPasswordlessError {
+		code: SignInPasswordlessErrorCode!
+		developerMessage: String!
+	}
+	
+	enum SignInPasswordlessErrorCode {
+		TOKEN_NOT_FOUND
+		TOKEN_INVALID
+		TOKEN_EXPIRED
+		TOKEN_USED
+		PERSON_DISABLED
+		OTP_REQUIRED
+		INVALID_OTP_TOKEN
+	}
+	
+	type SignInPasswordlessResult implements CommonSignInResult {
+		token: String!
+		person: Person!
+	}
+	
+	type ActivatePasswordlessOtpResponse {
+		ok: Boolean!
+		error: ActivatePasswordlessOtpError
+	}
+	
+	type ActivatePasswordlessOtpError {
+		code: ActivatePasswordlessOtpErrorCode!
+		developerMessage: String!
+	}
+	
+	enum ActivatePasswordlessOtpErrorCode {
+		TOKEN_NOT_FOUND
+		TOKEN_INVALID
+		TOKEN_EXPIRED
+		TOKEN_USED
+	}
+	
+	type ToggleMyPasswordlessResponse {
+		ok: Boolean!
+		error: ToggleMyPasswordlessError
+	}
+	
+	type ToggleMyPasswordlessError {
+		code: ToggleMyPasswordlessErrorCode!
+		developerMessage: String!
+	}
+	
+	enum ToggleMyPasswordlessErrorCode {
+		CANNOT_TOGGLE
+        NOT_A_PERSON
+	}
+	
 
 	# === invite ===
 
@@ -671,6 +819,7 @@ const schema: DocumentNode = gql`
 		email: String
 		name: String
 		otpEnabled: Boolean!
+		passwordlessEnabled: Boolean
 		identity: Identity!
 	}
 
@@ -831,15 +980,15 @@ const schema: DocumentNode = gql`
 
 	# === mails ===
 	
-    type MailTemplateData {
-        projectSlug: String
-        type: MailType!
-        variant: String
-        subject: String!
-        content: String!
-        useLayout: Boolean!
-        replyTo: String
-    }
+	type MailTemplateData {
+		projectSlug: String
+		type: MailType!
+		variant: String
+		subject: String!
+		content: String!
+		useLayout: Boolean!
+		replyTo: String
+	}
 	
 	input MailTemplate {
 		projectSlug: String
@@ -856,6 +1005,7 @@ const schema: DocumentNode = gql`
 		EXISTING_USER_INVITED
 		NEW_USER_INVITED
 		RESET_PASSWORD_REQUEST
+		PASSWORDLESS_SIGN_IN
 	}
 
 	input MailTemplateIdentifier {
@@ -879,7 +1029,7 @@ const schema: DocumentNode = gql`
 	enum AddMailTemplateErrorCode {
 		MISSING_VARIABLE
 		PROJECT_NOT_FOUND
-        INVALID_REPLY_EMAIL_FORMAT
+		INVALID_REPLY_EMAIL_FORMAT
 	}
 
 	type RemoveMailTemplateResponse {
@@ -908,6 +1058,7 @@ const schema: DocumentNode = gql`
 	enum CheckResetPasswordTokenCode {
 		REQUEST_NOT_FOUND
 		TOKEN_NOT_FOUND
+		TOKEN_INVALID
 		TOKEN_USED
 		TOKEN_EXPIRED
 	}
@@ -941,6 +1092,7 @@ const schema: DocumentNode = gql`
 
 	enum ResetPasswordErrorCode {
 		TOKEN_NOT_FOUND
+		TOKEN_INVALID
 		TOKEN_USED
 		TOKEN_EXPIRED
 

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

@@ -6,7 +6,7 @@ import { createMembershipSql } from './sql/createMembershipSql'
 import { createMembershipVariableSql } from './sql/createMembershipVariableSql'
 import { getProjectMembershipSql } from './sql/getProjectMembershipSql'
 import { sqlTransaction } from './sql/sqlTransaction'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 
 test('add project member', async () => {
 	const languageId = testUuid(999)

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

@@ -1,10 +1,10 @@
 import { executeTenantTest } from '../../../src/testTenant'
 import { testUuid } from '../../../src/testUuid'
 import { updatePersonPasswordSql } from './sql/updatePesonPasswordSql'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 import { changeMyPasswordMutation } from './gql/changeMyPassword'
 import { getPersonByIdentity } from './sql/getPersonByIdentity'
-import { authenticatedIdentityId } from '../../../src/testTenantDb'
+import { authenticatedIdentityId } from '../../../src/testTenant'
 
 test('changes my password', async () => {
 	const personId = testUuid(1)

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

@@ -1,10 +1,10 @@
 import { executeTenantTest } from '../../../src/testTenant'
 import { testUuid } from '../../../src/testUuid'
 import { updatePersonProfileNameSql, updatePersonProfileEmailSql, updatePersonProfileNameAndEmailSql } from './sql/updatePesonNameSql'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 import { changeMyProfileMutation } from './gql/changeMyProfile'
 import { getPersonByIdentity } from './sql/getPersonByIdentity'
-import { authenticatedIdentityId } from '../../../src/testTenantDb'
+import { authenticatedIdentityId } from '../../../src/testTenant'
 import { getPersonByEmailSql } from './sql/getPersonByEmailSql'
 
 test('changes my name', async () => {

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

@@ -3,7 +3,7 @@ import { testUuid } from '../../../src/testUuid'
 import { changePasswordMutation } from './gql/changePassword'
 import { getPersonByIdSql } from './sql/getPersonByIdSql'
 import { updatePersonPasswordSql } from './sql/updatePesonPasswordSql'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 
 test('changes a password', async () => {
 	const personId = testUuid(1)

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

@@ -1,9 +1,9 @@
 import { executeTenantTest } from '../../../src/testTenant'
 import { testUuid } from '../../../src/testUuid'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 import { changeProfileMutation } from './gql/changeProfile'
 import { updatePersonProfileNameAndEmailSql } from './sql/updatePesonNameSql'
-import { authenticatedIdentityId } from '../../../src/testTenantDb'
+import { authenticatedIdentityId } from '../../../src/testTenant'
 import { getPersonByIdentity } from './sql/getPersonByIdentity'
 import { getPersonByEmailSql } from './sql/getPersonByEmailSql'
 import { getPersonByIdSql } from './sql/getPersonByIdSql'

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

@@ -3,7 +3,7 @@ import { testUuid } from '../../../src/testUuid'
 import { getPersonByIdentity } from './sql/getPersonByIdentity'
 import { confirmOtpMutation } from './gql/confirmOtp'
 import { ConfirmOtpErrorCode } from '../../../../src/schema'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 import { OtpAuthenticator } from '../../../../src'
 import { Buffer } from 'buffer'
 

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

@@ -10,7 +10,7 @@ import { createIdentitySql } from './sql/createIdentitySql'
 import { createApiKeySql } from './sql/createApiKeySql'
 import { getProjectMembershipSql } from './sql/getProjectMembershipSql'
 import { sqlTransaction } from './sql/sqlTransaction'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 
 test('create api key', async () => {
 	const languageId = testUuid(999)

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

@@ -3,7 +3,7 @@ import { SQL } from '../../../src/tags'
 import { testUuid } from '../../../src/testUuid'
 import { selectMembershipsSql } from './sql/selectMembershipsSql'
 import { getPersonByEmailSql } from './sql/getPersonByEmailSql'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 import { getIdentityProjectsSql } from './sql/getIdentityProjectsSql'
 import { createSessionTokenMutation } from './gql/createSessionToken'
 import { createSessionKeySql } from './sql/createSessionKeySql'

package/tests/cases/integration/mocked/disableApiKeyMutation.ts

@@ -2,7 +2,7 @@ import { executeTenantTest } from '../../../src/testTenant'
 import { GQL } from '../../../src/tags'
 import { testUuid } from '../../../src/testUuid'
 import { disableApiKey } from './sql/disableApiKeySql'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 
 test('disable api key', async () => {
 	const apiKeyId = testUuid(1)

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

@@ -10,8 +10,8 @@ import { createIdentitySql } from './sql/createIdentitySql'
 import { createMembershipSql } from './sql/createMembershipSql'
 import { createPersonSql } from './sql/createPersonSql'
 import { disableOneOffKeySql } from './sql/disableOneOffKeySql'
-import { test } from 'vitest'
-import { createPasswordResetSql } from './sql/createPasswordResetSql'
+import { test } from 'bun:test'
+import { createPersonTokenSql } from './sql/createPersonTokenSql'
 import { getMailTemplateSql } from './sql/getMailTemplateSql'
 
 test('invite a new person', async () => {
@@ -125,7 +125,7 @@ test('invite a new person with password reset', async () => {
 				getPersonByEmailSql({ email, response: null }),
 				createIdentitySql({ roles: ['person'], identityId }),
 				createPersonSql({ identityId, personId, email }),
-				createPasswordResetSql({ personId, tokenHash: '9692e67b8378a6f6753f97782d458aa757e947eab2fbdf6b5c187b74561eb78f', resetId: passwordTokenId }),
+				createPersonTokenSql({ personId, tokenHash: '9692e67b8378a6f6753f97782d458aa757e947eab2fbdf6b5c187b74561eb78f', resetId: passwordTokenId, type: 'password_reset' }),
 				createMembershipSql({ membershipId, projectId, identityId, role: 'editor' }),
 				patchVariablesSql({
 					id: variableId,

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

@@ -1,7 +1,7 @@
 import { executeTenantTest } from '../../../src/testTenant'
 import { GQL } from '../../../src/tags'
 import { testUuid } from '../../../src/testUuid'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 import { sqlTransaction } from './sql/sqlTransaction'
 
 test('list project members by email query', async () => {

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

@@ -1,7 +1,7 @@
 import { executeTenantTest } from '../../../src/testTenant'
 import { GQL } from '../../../src/tags'
 import { testUuid } from '../../../src/testUuid'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 import { getPersonByIdSql } from './sql/getPersonByIdSql'
 
 test('get person by id query', async () => {

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

@@ -2,7 +2,7 @@ import { authenticatedIdentityId, executeTenantTest } from '../../../src/testTen
 import { testUuid } from '../../../src/testUuid'
 import { prepareOtpMutation } from './gql/prepareOtp'
 import { getPersonByIdentity } from './sql/getPersonByIdentity'
-import { test, assert } from 'vitest'
+import { test, expect } from 'bun:test'
 
 test('prepare otp', async () => {
 	const personId = testUuid(1)
@@ -27,8 +27,8 @@ test('prepare otp', async () => {
 			},
 		],
 		return: (response: any) => {
-			assert.ok(response.data.prepareOtp.ok)
-			assert.match(response.data.prepareOtp.result.otpUri, /otpauth:.+/)
+			expect(response.data.prepareOtp.ok).toEqual(true)
+			expect(response.data.prepareOtp.result.otpUri).toMatch(/otpauth:.+/)
 		},
 	})
 })

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

@@ -4,7 +4,7 @@ import { executeTenantTest } from '../../../src/testTenant'
 import { selectMembershipsSql } from './sql/selectMembershipsSql'
 import { getProjectBySlugSql } from './sql/getProjectBySlugSql'
 import { sqlTransaction } from './sql/sqlTransaction'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 
 test('removes a project member', async () => {
 	const identityId = testUuid(6)

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

@@ -1,6 +1,6 @@
 import { executeTenantTest } from '../../../src/testTenant'
 import { testUuid } from '../../../src/testUuid'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 import { signInIDP } from './gql/signInIdp'
 import { sqlTransaction } from './sql/sqlTransaction'
 import { getIdpBySlugSql } from './sql/getIdpBySlugSql'

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

@@ -5,7 +5,7 @@ import { selectMembershipsSql } from './sql/selectMembershipsSql'
 import { signInMutation } from './gql/signIn'
 import { getPersonByEmailSql } from './sql/getPersonByEmailSql'
 import { SignInErrorCode } from '../../../../src/schema'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 import { OtpAuthenticator } from '../../../../src'
 import { Buffer } from 'buffer'
 import { createSessionKeySql } from './sql/createSessionKeySql'

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

@@ -3,7 +3,7 @@ import { testUuid } from '../../../src/testUuid'
 import { GQL, SQL } from '../../../src/tags'
 import { disableApiKey } from './sql/disableApiKeySql'
 import { getPersonByIdentity } from './sql/getPersonByIdentity'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 import { getApiKeySql } from './sql/getApiKeySql'
 import { ApiKey } from '../../../../src'
 

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

@@ -7,7 +7,7 @@ import { createIdentitySql } from './sql/createIdentitySql'
 import { getPersonByEmailSql } from './sql/getPersonByEmailSql'
 import { sqlTransaction } from './sql/sqlTransaction'
 import { disableOneOffKeySql } from './sql/disableOneOffKeySql'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 
 test('signs up a new user', async () => {
 	const email = 'john@doe.com'

package/tests/cases/integration/mocked/sql/{createPasswordResetSql.ts → createPersonTokenSql.ts}

@@ -1,13 +1,14 @@
 import { SQL } from '../../../../src/tags'
 import { ExpectedQuery } from '@contember/database-tester'
 
-export const createPasswordResetSql = (args: {
+export const createPersonTokenSql = (args: {
 	resetId: string
 	tokenHash: string
 	personId: string
+	type: string
 }): ExpectedQuery => ({
-	sql: SQL`INSERT INTO "tenant"."person_password_reset" ("id", "token_hash", "person_id", "expires_at", "created_at", "used_at")
-	         VALUES (?, ?, ?, ?, ?, ?)`,
+	sql: SQL`INSERT INTO "tenant"."person_token" ("id", "token_hash", "person_id", "expires_at", "created_at", "used_at", "type")
+	         VALUES (?, ?, ?, ?, ?, ?, ?)`,
 	parameters: [
 		args.resetId,
 		args.tokenHash,
@@ -15,6 +16,7 @@ export const createPasswordResetSql = (args: {
 		(val: any) => val instanceof Date,
 		(val: any) => val instanceof Date,
 		null,
+		args.type,
 	],
 	response: { rowCount: 1 },
 })

package/tests/cases/integration/mocked/sql/getPersonByEmailSql.ts

@@ -5,7 +5,7 @@ export const getPersonByEmailSql = (args: {
 	email: string
 	response: null | { personId: string; password: string; identityId: string; roles: string[]; otpUri?: string }
 }): ExpectedQuery => ({
-	sql: SQL`SELECT "person"."id", "person"."password_hash", "person"."otp_uri", "person"."otp_activated_at", "person"."identity_id", "person"."email", "person"."name", "person"."disabled_at", "identity"."roles"
+	sql: SQL`SELECT "person"."id", "person"."password_hash", "person"."otp_uri", "person"."otp_activated_at", "person"."identity_id", "person"."email", "person"."name", "person"."disabled_at", "person"."passwordless_enabled", "identity"."roles"
 	         FROM "tenant"."person"
 		              INNER JOIN "tenant"."identity" AS "identity" ON "identity"."id" = "person"."identity_id"
 	         WHERE "person"."email" = ?`,
@@ -22,6 +22,7 @@ export const getPersonByEmailSql = (args: {
 					otp_uri: args.response.otpUri,
 					otp_activated_at: args.response.otpUri ? new Date() : null,
 					disabled_at: null,
+					passwordless_enabled: null,
 				},
 			  ]
 			: [],

package/tests/cases/integration/mocked/sql/getPersonByIdSql.ts

@@ -5,7 +5,7 @@ export const getPersonByIdSql = (args: {
 	personId: string
 	response: { personId: string; password: string; identityId: string; roles: string[]; email: string; name?: string }
 }): ExpectedQuery => ({
-	sql: SQL`SELECT "person"."id", "person"."password_hash", "person"."otp_uri", "person"."otp_activated_at", "person"."identity_id", "person"."email", "person"."name", "person"."disabled_at", "identity"."roles"
+	sql: SQL`SELECT "person"."id", "person"."password_hash", "person"."otp_uri", "person"."otp_activated_at", "person"."identity_id", "person"."email", "person"."name", "person"."disabled_at", "person"."passwordless_enabled", "identity"."roles"
 	         FROM "tenant"."person"
 		              INNER JOIN "tenant"."identity" AS "identity" ON "identity"."id" = "person"."identity_id"
 	         WHERE "person"."id" = ?`,

package/tests/cases/integration/mocked/sql/getPersonByIdentity.ts

@@ -5,7 +5,7 @@ export const getPersonByIdentity = (args: {
 	identityId: string
 	response: null | { personId: string; password: string; roles: string[]; email: string; name?: string; otpUri?: string }
 }): ExpectedQuery => ({
-	sql: SQL`SELECT "person"."id", "person"."password_hash", "person"."otp_uri", "person"."otp_activated_at", "person"."identity_id", "person"."email", "person"."name", "person"."disabled_at", "identity"."roles"
+	sql: SQL`SELECT "person"."id", "person"."password_hash", "person"."otp_uri", "person"."otp_activated_at", "person"."identity_id", "person"."email", "person"."name", "person"."disabled_at", "person"."passwordless_enabled", "identity"."roles"
 	         FROM "tenant"."person"
 		              INNER JOIN "tenant"."identity" AS "identity" ON "identity"."id" = "person"."identity_id"
 	         WHERE "person"."identity_id" = ?`,

package/tests/cases/integration/mocked/sql/getPersonByIdpSql.ts

@@ -6,7 +6,7 @@ export const getPersonByIdpSql = (args: {
 	externalIdentifier: string
 	response: null | { personId: string; password?: string; identityId: string; email: string; roles: string[]; otpUri?: string }
 }): ExpectedQuery => ({
-	sql: SQL`SELECT "person"."id", "person"."password_hash", "person"."otp_uri", "person"."otp_activated_at", "person"."identity_id", "person"."email", "person"."name", "person"."disabled_at", "identity"."roles"
+	sql: SQL`SELECT "person"."id", "person"."password_hash", "person"."otp_uri", "person"."otp_activated_at", "person"."identity_id", "person"."email", "person"."name", "person"."disabled_at", "person"."passwordless_enabled", "identity"."roles"
 	         FROM "tenant"."person"
 		        INNER JOIN "tenant"."identity" AS "identity" ON "identity"."id" = "person"."identity_id"
 				INNER JOIN  "tenant"."person_identity_provider" as "idp" on  "idp"."person_id" = "person"."id"

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

@@ -7,7 +7,7 @@ import { sqlTransaction } from './sql/sqlTransaction'
 import { getProjectMembershipSql } from './sql/getProjectMembershipSql'
 import { createMembershipSql } from './sql/createMembershipSql'
 import { updateProjectMemberMutation } from './gql/updateProjectMember'
-import { test } from 'vitest'
+import { test } from 'bun:test'
 
 test('update project member', async () => {
 	const identityId = testUuid(6)

package/tests/cases/migrations/2020-06-08-134000-tenant-credentials.test.ts

@@ -1,6 +1,6 @@
 import migration from '../../../src/migrations/2020-06-08-134000-tenant-credentials'
 import { createMigrationBuilder } from '@contember/database-migrations'
-import { test, assert } from 'vitest'
+import { test, expect } from 'bun:test'
 
 let uuidNum = 0
 export const testUuid = () => '123e4567-e89b-12d3-a456-' + (uuidNum++).toString().padStart(12, '0')
@@ -15,8 +15,9 @@ test('generate sql with root token and login token', async () => {
 			uuid: testUuid,
 		},
 	})
-	assert.equal(
+	expect(
 		builder.getSql(),
+	).toEqual(
 		`
 			WITH identity AS (
 			    INSERT INTO identity(id, parent_id, roles, description, created_at)
@@ -69,8 +70,9 @@ test('generate sql with both root user and token', async () => {
 			uuid: testUuid,
 		},
 	})
-	assert.equal(
+	expect(
 		builder.getSql(),
+	).toEqual(
 		`
 			WITH identity AS (
 				INSERT INTO identity(id, parent_id, roles, description, created_at)

package/tests/cases/unit/authorization/membershipAwareAccessNode.test.ts

@@ -1,4 +1,4 @@
-import { test, assert } from 'vitest'
+import { test, expect } from 'bun:test'
 import { testUuid } from '../../../src/testUuid'
 import { AclSchemaAccessNodeFactory, PermissionActions } from '../../../../src'
 import { Acl } from '@contember/schema'
@@ -35,18 +35,18 @@ const aclEvaluator = { evaluate: () => Promise.reject() }
 test('admin can assign editor role with matching variable', async () => {
 	const node = new AclSchemaAccessNodeFactory().create(aclSchemaAdminCanManageEditorWithMatchingVariables, adminOfSiteA)
 
-	assert.ok(await node.isAllowed(aclEvaluator, PermissionActions.PROJECT_ADD_MEMBER(editorOfSiteA)))
+	expect(await node.isAllowed(aclEvaluator, PermissionActions.PROJECT_ADD_MEMBER(editorOfSiteA))).toBeTrue()
 })
 
 test('admin cannot assign editor role with different variable', async () => {
 	const node = new AclSchemaAccessNodeFactory().create(aclSchemaAdminCanManageEditorWithMatchingVariables, adminOfSiteA)
-	assert.notOk(await node.isAllowed(aclEvaluator, PermissionActions.PROJECT_ADD_MEMBER(editorOfSiteB)))
+	expect(await node.isAllowed(aclEvaluator, PermissionActions.PROJECT_ADD_MEMBER(editorOfSiteB))).toBeFalse()
 })
 
 test('admin can invite editor role with matching variable', async () => {
 	const node = new AclSchemaAccessNodeFactory().create(aclSchemaAdminCanManageEditorWithMatchingVariables, adminOfSiteA)
 
-	assert.ok(await node.isAllowed(aclEvaluator, PermissionActions.PERSON_INVITE(editorOfSiteA)))
+	expect(await node.isAllowed(aclEvaluator, PermissionActions.PERSON_INVITE(editorOfSiteA))).toBeTrue()
 })
 
 
@@ -71,11 +71,11 @@ const aclSchemaForInviteOnly: Acl.Schema = {
 test('admin can invite public. cannot manage public, cannot invite lorem', async () => {
 	const node = new AclSchemaAccessNodeFactory().create(aclSchemaForInviteOnly, [{ role: 'admin', variables: [] }])
 
-	assert.ok(await node.isAllowed(aclEvaluator, PermissionActions.PERSON_INVITE([{ role: 'public', variables: [] }])))
+	expect(await node.isAllowed(aclEvaluator, PermissionActions.PERSON_INVITE([{ role: 'public', variables: [] }]))).toBeTrue()
 
-	assert.notOk(await node.isAllowed(aclEvaluator, PermissionActions.PERSON_INVITE([{ role: 'lorem', variables: [] }])))
+	expect(await node.isAllowed(aclEvaluator, PermissionActions.PERSON_INVITE([{ role: 'lorem', variables: [] }]))).toBeFalse()
 
-	assert.notOk(await node.isAllowed(aclEvaluator, PermissionActions.PROJECT_REMOVE_MEMBER([{ role: 'public', variables: [] }])))
+	expect(await node.isAllowed(aclEvaluator, PermissionActions.PROJECT_REMOVE_MEMBER([{ role: 'public', variables: [] }]))).toBeFalse()
 })
 
 
@@ -97,7 +97,7 @@ const aclSchemaForViewOnly: Acl.Schema = {
 test('admin can view lorem, but cannot manage it', async () => {
 	const node = new AclSchemaAccessNodeFactory().create(aclSchemaForViewOnly, [{ role: 'admin', variables: [] }])
 
-	assert.ok(await node.isAllowed(aclEvaluator, PermissionActions.PROJECT_VIEW_MEMBER([{ role: 'lorem', variables: [] }])))
+	expect(await node.isAllowed(aclEvaluator, PermissionActions.PROJECT_VIEW_MEMBER([{ role: 'lorem', variables: [] }]))).toBeTrue()
 
-	assert.notOk(await node.isAllowed(aclEvaluator, PermissionActions.PROJECT_REMOVE_MEMBER([{ role: 'lorem', variables: [] }])))
+	expect(await node.isAllowed(aclEvaluator, PermissionActions.PROJECT_REMOVE_MEMBER([{ role: 'lorem', variables: [] }]))).toBeFalse()
 })