08e941f8af
* Implemented workspace general page * Added notifications to user input * Allowed non-admins to view but not edit * Added redirect to homeroute * Fixed validation * Squashed commit of the following: commit 7bf14ab8af0f76b4c9d0aa87fc08085af7c34959 Author: Chuck Driesler <chuck@speckle.systems> Date: Tue Aug 6 19:40:50 2024 +0200 mob next [ci-skip] [ci skip] [skip ci] lastFile:packages/server/modules/workspacesCore/migrations/20240806160740_workspace_domains.ts commit 8aa3fb0cb052c10eeeb83bf9874ae0d1c065e480 Author: Alessandro Magionami <alessandro.magionami@gmail.com> Date: Tue Aug 6 18:54:15 2024 +0200 mob next [ci-skip] [ci skip] [skip ci] lastFile:packages/server/modules/core/domain/userEmails/operations.ts commit 66dfd0cf6c15a789c8f96a65a3168323e83a7b9e Author: Chuck Driesler <chuck@speckle.systems> Date: Tue Aug 6 18:30:22 2024 +0200 mob next [ci-skip] [ci skip] [skip ci] lastFile:packages/server/modules/workspacesCore/domain/types.ts Co-authored-by: Alessandro Magionami <alessandro.magionami@gmail.com> * Move General to workspaces folder * feat(workspaces): inputs on security section * feat(workspaces): add domain to workspace mutation * chore(workspaces): add blocked domains list * fix(workspaces): modals with buttons * feat(workspaceDomains): delete domain * fix(workspaces): use mutation * fix(workspaces): present user verified domains as options * Moved sidebar menu to a composable * Added coming soon tag back * feat(workspaces): create domains resolver for workspace * chore(workspaces): fix tests * chore(workspaces): fix types * chore(workspaces): fix linter * fix(workspaces): do some delete I think * chore(workspaces): add domainBasedMembershipProtectionEnabled field to workspace * chore(workspaces): improve validation for email domain * fix(workspace): query and do the thing * chore(workspaces): add graphql schema for domainBasedMembershipProtection * chore(workspaces): lint and test failures * fix(workspaces): test issues w new field * feat(workspaces): add discoverability flag * chore(workspaces): they made me do it * feat(workspaces): enable toggling domain protection * feat(workspaces): add discoverability toggle to workspace settings * feat(workspace): auto enable discoverability on first domain registration * feat(workspace): discoverability toggle fixes * fix(eventBus): fix tests * feat(workspaces): user discoverable workspaces (#2620) * feat(workspaces): it works just trust me * fix(workspaces): don't worry about it * fix(workspaces); happy path success * fix(workspaces): almost there * fix(workspaces): successful tests! * fix(workspaces): we have DISCOVERED (#2621) * Fixed linting issue * Updated query * Updated validation rules * Updated validation rules * Fix unsaved file with type export * Addressed PR comments * Updated cache * Updated item classes, add fragment back * Gergo/web 1574 join workspaces via discovery (#2623) * chore(useremails): add find verified emails by user function * chore(workspace): table helper for workspace domains * chore(workspace): get workspace with domains function * chore(workspace): test get workspace with domains function * feat(workspace): restrict workspace membership when updating workspace role * chore(workspaces): fix types * feat(workspaces): WIP join * feat(workspaces): join button makes u join * chore(useremails): fix type for find verified emails function * feat(workspaces): join * feat(workspace): prevent inviting user without email matching domain * chore(workspaces): fix linter * fix(workspaces): invoke join (gergo wrote this) * fuck * fix(workspaces): properly get discoverable workspaces * fix(workspaces): test --------- Co-authored-by: Gergő Jedlicska <gergo@jedlicska.com> Co-authored-by: Chuck Driesler <chuck@speckle.systems> * fix(workspaces): some query stuff * fix(workspaces): mutate cache instead of refetch * fix(workspaces): more adjustments to gql query and fragment structure * fix(workspaces): queries, style, structure * fix(workspaces): match discoverability with current styles * chore(workspaces): lint lint lint * fix(workspaces): got it twisted * chore(workspaces): fix test * fix(workspaces): route to joined workspace on join --------- Co-authored-by: Mike Tasset <mike.tasset@gmail.com> Co-authored-by: Chuck Driesler <chuck@speckle.systems> Co-authored-by: Alessandro Magionami <alessandro.magionami@gmail.com>
139 lines
5.0 KiB
TypeScript
139 lines
5.0 KiB
TypeScript
import { UserEmail } from '@/modules/core/domain/userEmails/types'
|
|
import { createRandomPassword } from '@/modules/core/helpers/testHelpers'
|
|
import {
|
|
WorkspaceJoinNotAllowedError,
|
|
WorkspaceNotDiscoverableError,
|
|
WorkspaceNotJoinableError
|
|
} from '@/modules/workspaces/errors/workspace'
|
|
import { joinWorkspaceFactory } from '@/modules/workspaces/services/join'
|
|
import { WorkspaceEvents } from '@/modules/workspacesCore/domain/events'
|
|
import {
|
|
WorkspaceAcl,
|
|
WorkspaceDomain,
|
|
WorkspaceWithDomains
|
|
} from '@/modules/workspacesCore/domain/types'
|
|
import { expectToThrow } from '@/test/assertionHelper'
|
|
import { Roles } from '@speckle/shared'
|
|
import { expect } from 'chai'
|
|
import { assign } from 'lodash'
|
|
|
|
const createTestWorkspaceWithDomains = (
|
|
arg?: Partial<WorkspaceWithDomains> | undefined
|
|
): WorkspaceWithDomains => {
|
|
const workspace: WorkspaceWithDomains = {
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
name: createRandomPassword(),
|
|
description: createRandomPassword(),
|
|
id: createRandomPassword(),
|
|
logo: null,
|
|
domains: [],
|
|
discoverabilityEnabled: false,
|
|
domainBasedMembershipProtectionEnabled: false,
|
|
defaultLogoIndex: 0
|
|
}
|
|
if (arg) assign(workspace, arg)
|
|
return workspace
|
|
}
|
|
|
|
describe('Workspace join services', () => {
|
|
describe('joinWorkspaceFactory returns a function, that', () => {
|
|
it('throws an error if the workspace is not discoverable', async () => {
|
|
const userId = createRandomPassword()
|
|
const workspaceId = createRandomPassword()
|
|
const error = await expectToThrow(async () => {
|
|
await joinWorkspaceFactory({
|
|
getUserEmails: async () => [],
|
|
getWorkspaceWithDomains: async () => {
|
|
return createTestWorkspaceWithDomains()
|
|
},
|
|
insertWorkspaceRole: async () => {
|
|
expect.fail()
|
|
},
|
|
emitWorkspaceEvent: async () => {
|
|
expect.fail()
|
|
}
|
|
})({ userId, workspaceId })
|
|
})
|
|
expect(error.message).to.be.equal(new WorkspaceNotDiscoverableError().message)
|
|
})
|
|
it('throws an error if the workspace has no verified domains', async () => {
|
|
const userId = createRandomPassword()
|
|
const workspaceId = createRandomPassword()
|
|
const error = await expectToThrow(async () => {
|
|
await joinWorkspaceFactory({
|
|
getUserEmails: async () => [],
|
|
getWorkspaceWithDomains: async () => {
|
|
return createTestWorkspaceWithDomains({
|
|
discoverabilityEnabled: true,
|
|
domains: [{ domain: 'example.com', verified: false }] as WorkspaceDomain[]
|
|
})
|
|
},
|
|
insertWorkspaceRole: async () => {
|
|
expect.fail()
|
|
},
|
|
emitWorkspaceEvent: async () => {
|
|
expect.fail()
|
|
}
|
|
})({ userId, workspaceId })
|
|
})
|
|
expect(error.message).to.be.equal(new WorkspaceNotJoinableError().message)
|
|
})
|
|
it('throws an error if the user has no verified email matching the domains', async () => {
|
|
const userId = createRandomPassword()
|
|
const workspaceId = createRandomPassword()
|
|
const error = await expectToThrow(async () => {
|
|
await joinWorkspaceFactory({
|
|
getUserEmails: async () =>
|
|
[{ email: 'test@example.com', verified: false }] as UserEmail[],
|
|
getWorkspaceWithDomains: async () => {
|
|
return createTestWorkspaceWithDomains({
|
|
discoverabilityEnabled: true,
|
|
domains: [{ domain: 'example.com', verified: true }] as WorkspaceDomain[]
|
|
})
|
|
},
|
|
insertWorkspaceRole: async () => {
|
|
expect.fail()
|
|
},
|
|
emitWorkspaceEvent: async () => {
|
|
expect.fail()
|
|
}
|
|
})({ userId, workspaceId })
|
|
})
|
|
expect(error.message).to.be.equal(new WorkspaceJoinNotAllowedError().message)
|
|
})
|
|
it('creates a workspace member role and emits workspace events', async () => {
|
|
const userId = createRandomPassword()
|
|
const workspaceId = createRandomPassword()
|
|
let storedWorkspaceRole: WorkspaceAcl | undefined = undefined
|
|
const firedEvents: string[] = []
|
|
await joinWorkspaceFactory({
|
|
getUserEmails: async () =>
|
|
[{ email: 'test@example.com', verified: true }] as UserEmail[],
|
|
getWorkspaceWithDomains: async () => {
|
|
return createTestWorkspaceWithDomains({
|
|
discoverabilityEnabled: true,
|
|
domains: [{ domain: 'example.com', verified: true }] as WorkspaceDomain[]
|
|
})
|
|
},
|
|
insertWorkspaceRole: async (workspaceRole) => {
|
|
storedWorkspaceRole = workspaceRole
|
|
},
|
|
emitWorkspaceEvent: async ({ eventName }) => {
|
|
firedEvents.push(eventName)
|
|
return []
|
|
}
|
|
})({ userId, workspaceId })
|
|
expect(storedWorkspaceRole).deep.equal({
|
|
userId,
|
|
workspaceId,
|
|
role: Roles.Workspace.Member
|
|
})
|
|
expect(firedEvents).deep.equal([
|
|
WorkspaceEvents.JoinedFromDiscovery,
|
|
WorkspaceEvents.RoleUpdated
|
|
])
|
|
})
|
|
})
|
|
})
|