8ec0d364cb
* fix(workspaces): transact all simultaneous workspace-project role changes * fix(workspaces): more correct usage of transactions * fix(workspaces): add tests for transaction-based role changes * fix(workspaces): do not leak knex into domain * fix(workspaces): transaction-ify factory functions * fix(workspaces): factory-ify some old functions * fix(workspaces): missed a resolver * chore(workspaces): get tests in order * park it * chore(workspaces): failing tests * WHAT DO YOU WANT * fix(workspaces): i lived bitch * fix(workspaces): remove test that is no longer true * fix(workspaces): better repo/service boundaries * right * fix(workspaces): service in injected * fix(workspaces): repair references * refactor(workspaces): role management rework * chore(workspaces): adjust tests to match new behaviour * lint lint lint * fix(workspaces): fix tests --------- Co-authored-by: Gergő Jedlicska <gergo@jedlicska.com>
202 lines
6.4 KiB
TypeScript
202 lines
6.4 KiB
TypeScript
import { db } from '@/db/knex'
|
|
import {
|
|
deleteProjectRoleFactory,
|
|
getStream,
|
|
upsertProjectRoleFactory
|
|
} from '@/modules/core/repositories/streams'
|
|
import { findVerifiedEmailsByUserIdFactory } from '@/modules/core/repositories/userEmails'
|
|
import { getStreams } from '@/modules/core/services/streams'
|
|
import {
|
|
findUserByTargetFactory,
|
|
insertInviteAndDeleteOldFactory
|
|
} from '@/modules/serverinvites/repositories/serverInvites'
|
|
import { createAndSendInviteFactory } from '@/modules/serverinvites/services/creation'
|
|
import { getEventBus } from '@/modules/shared/services/eventBus'
|
|
import { mapWorkspaceRoleToInitialProjectRole } from '@/modules/workspaces/domain/logic'
|
|
import {
|
|
getWorkspaceRolesFactory,
|
|
upsertWorkspaceFactory,
|
|
upsertWorkspaceRoleFactory,
|
|
deleteWorkspaceRoleFactory as dbDeleteWorkspaceRoleFactory,
|
|
getWorkspaceFactory,
|
|
getWorkspaceWithDomainsFactory,
|
|
getWorkspaceDomainsFactory
|
|
} from '@/modules/workspaces/repositories/workspaces'
|
|
import {
|
|
buildWorkspaceInviteEmailContentsFactory,
|
|
collectAndValidateWorkspaceTargetsFactory,
|
|
createWorkspaceInviteFactory
|
|
} from '@/modules/workspaces/services/invites'
|
|
import {
|
|
createWorkspaceFactory,
|
|
updateWorkspaceRoleFactory,
|
|
deleteWorkspaceRoleFactory,
|
|
updateWorkspaceFactory
|
|
} from '@/modules/workspaces/services/management'
|
|
import { queryAllWorkspaceProjectsFactory } from '@/modules/workspaces/services/projects'
|
|
import { BasicTestUser } from '@/test/authHelper'
|
|
import { CreateWorkspaceInviteMutationVariables } from '@/test/graphql/generated/graphql'
|
|
import { MaybeNullOrUndefined, Roles, WorkspaceRoles } from '@speckle/shared'
|
|
|
|
export type BasicTestWorkspace = {
|
|
/**
|
|
* Leave empty, will be filled on creation
|
|
*/
|
|
id: string
|
|
/**
|
|
* Leave empty, will be filled on creation
|
|
*/
|
|
ownerId: string
|
|
name: string
|
|
description?: string
|
|
logo?: string
|
|
discoverabilityEnabled?: boolean
|
|
domainBasedMembershipProtectionEnabled?: boolean
|
|
}
|
|
|
|
export const createTestWorkspace = async (
|
|
workspace: BasicTestWorkspace,
|
|
owner: BasicTestUser
|
|
) => {
|
|
const createWorkspace = createWorkspaceFactory({
|
|
upsertWorkspace: upsertWorkspaceFactory({ db }),
|
|
upsertWorkspaceRole: upsertWorkspaceRoleFactory({ db }),
|
|
emitWorkspaceEvent: (...args) => getEventBus().emit(...args)
|
|
})
|
|
|
|
const newWorkspace = await createWorkspace({
|
|
userId: owner.id,
|
|
workspaceInput: {
|
|
name: workspace.name,
|
|
description: workspace.description || null,
|
|
logo: workspace.logo || null,
|
|
defaultLogoIndex: 0
|
|
},
|
|
userResourceAccessLimits: null
|
|
})
|
|
|
|
workspace.id = newWorkspace.id
|
|
if (workspace.discoverabilityEnabled) {
|
|
const updateWorkspace = updateWorkspaceFactory({
|
|
getWorkspace: getWorkspaceFactory({ db }),
|
|
upsertWorkspace: upsertWorkspaceFactory({ db }),
|
|
emitWorkspaceEvent: (...args) => getEventBus().emit(...args)
|
|
})
|
|
|
|
await updateWorkspace({
|
|
workspaceId: newWorkspace.id,
|
|
workspaceInput: {
|
|
discoverabilityEnabled: true
|
|
}
|
|
})
|
|
}
|
|
|
|
if (workspace.domainBasedMembershipProtectionEnabled) {
|
|
await updateWorkspaceFactory({
|
|
getWorkspace: getWorkspaceFactory({ db }),
|
|
upsertWorkspace: upsertWorkspaceFactory({ db }),
|
|
emitWorkspaceEvent: getEventBus().emit
|
|
})({
|
|
workspaceId: newWorkspace.id,
|
|
workspaceInput: { domainBasedMembershipProtectionEnabled: true }
|
|
})
|
|
}
|
|
|
|
workspace.ownerId = owner.id
|
|
}
|
|
|
|
export const assignToWorkspace = async (
|
|
workspace: BasicTestWorkspace,
|
|
user: BasicTestUser,
|
|
role?: WorkspaceRoles
|
|
) => {
|
|
const updateWorkspaceRole = updateWorkspaceRoleFactory({
|
|
getWorkspaceWithDomains: getWorkspaceWithDomainsFactory({ db }),
|
|
findVerifiedEmailsByUserId: findVerifiedEmailsByUserIdFactory({ db }),
|
|
getWorkspaceRoles: getWorkspaceRolesFactory({ db }),
|
|
upsertWorkspaceRole: upsertWorkspaceRoleFactory({ db }),
|
|
getDefaultWorkspaceProjectRoleMapping: mapWorkspaceRoleToInitialProjectRole,
|
|
upsertProjectRole: upsertProjectRoleFactory({ db }),
|
|
deleteProjectRole: deleteProjectRoleFactory({ db }),
|
|
queryAllWorkspaceProjects: queryAllWorkspaceProjectsFactory({ getStreams }),
|
|
emitWorkspaceEvent: (...args) => getEventBus().emit(...args)
|
|
})
|
|
|
|
await updateWorkspaceRole({
|
|
userId: user.id,
|
|
workspaceId: workspace.id,
|
|
role: role || Roles.Workspace.Member
|
|
})
|
|
}
|
|
|
|
export const unassignFromWorkspace = async (
|
|
workspace: BasicTestWorkspace,
|
|
user: BasicTestUser
|
|
) => {
|
|
const deleteWorkspaceRole = deleteWorkspaceRoleFactory({
|
|
getWorkspaceRoles: getWorkspaceRolesFactory({ db }),
|
|
deleteWorkspaceRole: dbDeleteWorkspaceRoleFactory({ db }),
|
|
deleteProjectRole: deleteProjectRoleFactory({ db }),
|
|
queryAllWorkspaceProjects: queryAllWorkspaceProjectsFactory({ getStreams }),
|
|
emitWorkspaceEvent: (...args) => getEventBus().emit(...args)
|
|
})
|
|
|
|
await deleteWorkspaceRole({
|
|
userId: user.id,
|
|
workspaceId: workspace.id
|
|
})
|
|
}
|
|
|
|
export const unassignFromWorkspaces = async (
|
|
pairs: [BasicTestWorkspace, BasicTestUser][]
|
|
) => {
|
|
await Promise.all(pairs.map((p) => unassignFromWorkspace(p[0], p[1])))
|
|
}
|
|
|
|
export const assignToWorkspaces = async (
|
|
pairs: [BasicTestWorkspace, BasicTestUser, MaybeNullOrUndefined<WorkspaceRoles>][]
|
|
) => {
|
|
await Promise.all(pairs.map((p) => assignToWorkspace(p[0], p[1], p[2] || undefined)))
|
|
}
|
|
|
|
export const createTestWorkspaces = async (
|
|
pairs: [BasicTestWorkspace, BasicTestUser][]
|
|
) => {
|
|
await Promise.all(pairs.map((p) => createTestWorkspace(p[0], p[1])))
|
|
}
|
|
|
|
export const createWorkspaceInviteDirectly = async (
|
|
args: CreateWorkspaceInviteMutationVariables,
|
|
inviterId: string
|
|
) => {
|
|
const createAndSendInvite = createAndSendInviteFactory({
|
|
findUserByTarget: findUserByTargetFactory(),
|
|
insertInviteAndDeleteOld: insertInviteAndDeleteOldFactory({ db }),
|
|
collectAndValidateResourceTargets: collectAndValidateWorkspaceTargetsFactory({
|
|
getStream,
|
|
getWorkspace: getWorkspaceFactory({ db }),
|
|
getWorkspaceDomains: getWorkspaceDomainsFactory({ db }),
|
|
findVerifiedEmailsByUserId: findVerifiedEmailsByUserIdFactory({ db })
|
|
}),
|
|
buildInviteEmailContents: buildWorkspaceInviteEmailContentsFactory({
|
|
getStream,
|
|
getWorkspace: getWorkspaceFactory({ db })
|
|
}),
|
|
emitEvent: ({ eventName, payload }) =>
|
|
getEventBus().emit({
|
|
eventName,
|
|
payload
|
|
})
|
|
})
|
|
|
|
const createInvite = createWorkspaceInviteFactory({
|
|
createAndSendInvite
|
|
})
|
|
|
|
return await createInvite({
|
|
...args,
|
|
inviterId,
|
|
inviterResourceAccessRules: null
|
|
})
|
|
}
|