@ossy/workspaces 1.16.7 → 1.17.1

package/src/import-resource-templates.task.js

@@ -0,0 +1,26 @@
+import { Aggregate } from '@ossy/event-store'
+import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
+import { validateResourceTemplatesForImport } from '@ossy/platform'
+
+export const metadata = { id: 'workspaces/import-resource-templates' }
+
+export async function run({ payload, req }) {
+  const userId = payload?.userId ?? req?.userId
+  const workspaceId = payload?.workspaceId ?? req?.workspaceId
+  const templates = payload?.templates ?? payload
+
+  if (!Array.isArray(templates)) {
+    throw Object.assign(new Error('templates must be an array'), { status: 400 })
+  }
+
+  const reservedIds = new Set([])
+  const validation = validateResourceTemplatesForImport(templates, reservedIds)
+  if (!validation.ok) {
+    throw Object.assign(new Error(validation.message), { status: 400, type: validation.code })
+  }
+
+  const event = WorkspacesEvents.ResourceTemplatesImported({ createdBy: userId, templates })
+
+  await Aggregate.Of(Workspace, workspaceId).then(Aggregate.Add(event))
+  return event.payload.templates
+}

package/src/index.js

@@ -1,3 +1,17 @@
+export { metadata as ListWorkspaces } from './list.action.js'
+export { metadata as GetWorkspace } from './get.action.js'
+export { metadata as CreateWorkspace } from './create.action.js'
+export { metadata as InviteUser } from './invite-user.action.js'
+export { metadata as AcceptInvitation } from './accept-invitation.action.js'
+export { metadata as GetInvitations } from './get-invitations.action.js'
+export { metadata as GetUsers } from './get-users.action.js'
+export { metadata as RemoveMember } from './remove-member.action.js'
+export { metadata as CreateWorkspaceApiToken } from './create-api-token.action.js'
+export { metadata as GetWorkspaceApiTokens } from './get-api-tokens.action.js'
+export { metadata as GetResourceTemplates } from './get-resource-templates.action.js'
+export { metadata as ImportResourceTemplates } from './import-resource-templates.action.js'
+export { metadata as EnableService } from './enable-service.action.js'
+export { metadata as DisableService } from './disable-service.action.js'
 export { CreateWorkspacePage } from './CreateWorkspacePage.jsx'
 export { SelectWorkspacePage } from './SelectWorkspacePage.jsx'
 export { GeneralSettings } from './GeneralSettings.jsx'
@@ -7,5 +21,3 @@ export { Users } from './Users.jsx'
 export { AuthenticationGuard } from './AuthenticationGuard.jsx'
 export { patchUserWorkspaceId } from './patchUserWorkspaceId.js'
 export { Definition } from './Definition.js'
-export { Workspace } from './workspace.aggregate.js'
-export { WorkspacesEvents } from './workspaces.events.js'

package/src/invite-user.action.js

@@ -1,85 +1 @@
-import jwt from 'jsonwebtoken'
-import { Aggregate } from '@ossy/event-store'
-import { Workspace, WorkspacesEvents } from '@ossy/workspaces'
-import { Token, TokenEvents } from '@ossy/tokens'
-import { EmailRenderer } from '@ossy/email'
-import { ConfigService } from '@ossy/platform'
-import { createLogger } from '@ossy/observability'
-import WorkspaceInvitationEmail, { subject as workspaceInvitationSubject } from './workspace-invitation.email.jsx'
-
-const log = createLogger('workspaces/invite-user')
-
-const isEmailLike = maybeEmail => /.@.+\.../.test(maybeEmail)
-
-function createVerificationToken(workspaceId) {
-  const expiresIn = ConfigService.TokenValidity
-  return jwt.sign({ aud: workspaceId }, ConfigService.TokenSecret, { expiresIn })
-}
-
-export const id = 'workspaces/invite-user'
-export const access = 'workspace'
-
-export async function run({ payload, integrations, req }) {
-  const createdBy = payload?.userId ?? req?.userId
-  const workspaceId = payload?.workspaceId ?? req?.workspaceId
-  const email = payload?.email ?? req?.body
-  const inviterEmail = payload?.inviterEmail ?? req?.user?.email
-
-  if (!isEmailLike(email)) {
-    throw Object.assign(new Error('Invalid email'), { status: 400 })
-  }
-
-  const workspace = await Aggregate.Of(Workspace, workspaceId).then(Aggregate.View())
-
-  const userInvitation = workspace.invitations.find(inv => inv.email === email)
-  if (userInvitation && userInvitation.expiresAt > Date.now()) {
-    throw Object.assign(new Error('User already invited'), { status: 400 })
-  }
-
-  const expiresIn = ConfigService.TokenValidity
-  const expiresAt = Date.now() + expiresIn * 1000
-  const inviteEvent = WorkspacesEvents.UserInvited({ createdBy, email, expiresAt })
-
-  const rawToken = createVerificationToken(workspaceId)
-  const tokenEvent = TokenEvents.Created({
-    type: 'Verification',
-    createdBy,
-    name: 'Workspace Invitation',
-    subject: email,
-    audience: workspace.id,
-    token: rawToken,
-    expiresAt,
-  })
-
-  const existingUser = await Aggregate.Collection.findOne({ type: 'User', 'state.email': email }).then(agg => agg?.state)
-  if (existingUser && workspace.users.includes(existingUser.id)) {
-    throw Object.assign(new Error('User already in workspace'), { status: 400 })
-  }
-
-  await Promise.all([
-    Aggregate.Of(Workspace, workspace.id).then(Aggregate.Add(inviteEvent)),
-    Aggregate.Of(Token, tokenEvent),
-  ])
-
-  const baseUrl = ConfigService.getWebClientBaseUrl(req)
-  const { html, text } = EmailRenderer.render(WorkspaceInvitationEmail, {
-    workspace,
-    verificationToken: rawToken,
-    invitedBy: inviterEmail,
-    baseUrl,
-  })
-
-  const emailClient = integrations?.get?.('email')
-  if (emailClient) {
-    await emailClient.send({ to: email, from: 'noreply@ossy.se', subject: workspaceInvitationSubject, html, text })
-  } else if (ConfigService.BuildEnvironment === 'local') {
-    log.info('-----------YOU GOT MAIL-----------')
-    log.info(`To: ${email}`)
-    log.info(`From: noreply@ossy.se`)
-    log.info(`Subject: ${workspaceInvitationSubject}`)
-    log.info(text || html)
-    log.info('----------------------------------')
-  }
-
-  return ''
-}
+export const metadata = { id: 'workspaces/invite-user', access: 'workspace' }

package/src/invite-user.task.js

@@ -0,0 +1,84 @@
+import jwt from 'jsonwebtoken'
+import { Aggregate } from '@ossy/event-store'
+import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
+import { Token, TokenEvents } from '@ossy/tokens/server'
+import { EmailRenderer } from '@ossy/email'
+import { ConfigService } from '@ossy/platform'
+import { createLogger } from '@ossy/observability'
+import WorkspaceInvitationEmail, { subject as workspaceInvitationSubject } from './workspace-invitation.email.jsx'
+
+export const metadata = { id: 'workspaces/invite-user' }
+
+const log = createLogger('workspaces/invite-user')
+
+const isEmailLike = maybeEmail => /.@.+\.../.test(maybeEmail)
+
+function createVerificationToken(workspaceId) {
+  const expiresIn = ConfigService.TokenValidity
+  return jwt.sign({ aud: workspaceId }, ConfigService.TokenSecret, { expiresIn })
+}
+
+export async function run({ payload, integrations, req }) {
+  const createdBy = payload?.userId ?? req?.userId
+  const workspaceId = payload?.workspaceId ?? req?.workspaceId
+  const email = payload?.email ?? req?.body
+  const inviterEmail = payload?.inviterEmail ?? req?.user?.email
+
+  if (!isEmailLike(email)) {
+    throw Object.assign(new Error('Invalid email'), { status: 400 })
+  }
+
+  const workspace = await Aggregate.Of(Workspace, workspaceId).then(Aggregate.View())
+
+  const userInvitation = workspace.invitations.find(inv => inv.email === email)
+  if (userInvitation && userInvitation.expiresAt > Date.now()) {
+    throw Object.assign(new Error('User already invited'), { status: 400 })
+  }
+
+  const expiresIn = ConfigService.TokenValidity
+  const expiresAt = Date.now() + expiresIn * 1000
+  const inviteEvent = WorkspacesEvents.UserInvited({ createdBy, email, expiresAt })
+
+  const rawToken = createVerificationToken(workspaceId)
+  const tokenEvent = TokenEvents.Created({
+    type: 'Verification',
+    createdBy,
+    name: 'Workspace Invitation',
+    subject: email,
+    audience: workspace.id,
+    token: rawToken,
+    expiresAt,
+  })
+
+  const existingUser = await Aggregate.Collection.findOne({ type: 'User', 'state.email': email }).then(agg => agg?.state)
+  if (existingUser && workspace.users.includes(existingUser.id)) {
+    throw Object.assign(new Error('User already in workspace'), { status: 400 })
+  }
+
+  await Promise.all([
+    Aggregate.Of(Workspace, workspace.id).then(Aggregate.Add(inviteEvent)),
+    Aggregate.Of(Token, tokenEvent),
+  ])
+
+  const baseUrl = ConfigService.getWebClientBaseUrl(req)
+  const { html, text } = EmailRenderer.render(WorkspaceInvitationEmail, {
+    workspace,
+    verificationToken: rawToken,
+    invitedBy: inviterEmail,
+    baseUrl,
+  })
+
+  const emailClient = integrations?.get?.('email')
+  if (emailClient) {
+    await emailClient.send({ to: email, from: 'noreply@ossy.se', subject: workspaceInvitationSubject, html, text })
+  } else if (ConfigService.BuildEnvironment === 'local') {
+    log.info('-----------YOU GOT MAIL-----------')
+    log.info(`To: ${email}`)
+    log.info(`From: noreply@ossy.se`)
+    log.info(`Subject: ${workspaceInvitationSubject}`)
+    log.info(text || html)
+    log.info('----------------------------------')
+  }
+
+  return ''
+}

package/src/list.action.js

@@ -1,9 +1 @@
-import { WorkspacesQueries } from './workspaces.queries.js'
-
-export const id = 'workspaces/list'
-export const access = 'authenticated'
-
-export async function run({ payload, req }) {
-  const userId = payload?.userId ?? req?.userId
-  return WorkspacesQueries.getAllByUserIncluded(userId)
-}
+export const metadata = { id: 'workspaces/list', access: 'authenticated' }

package/src/list.task.js

@@ -0,0 +1,8 @@
+import { WorkspacesQueries } from './workspaces.queries.js'
+
+export const metadata = { id: 'workspaces/list' }
+
+export async function run({ payload, req }) {
+  const userId = payload?.userId ?? req?.userId
+  return WorkspacesQueries.getAllByUserIncluded(userId)
+}

package/src/remove-member.action.js

@@ -1,17 +1 @@
-import { Aggregate } from '@ossy/event-store'
-import { Workspace, WorkspacesEvents } from '@ossy/workspaces'
-
-export const id = 'workspaces/remove-member'
-export const access = 'workspace'
-
-export async function run({ payload, req }) {
-  const createdBy = payload?.userId ?? req?.userId
-  const workspaceId = payload?.workspaceId ?? req?.workspaceId
-  const memberId = payload?.memberId ?? req?.memberId
-
-  if (!memberId) throw Object.assign(new Error('memberId is required'), { status: 400 })
-
-  const event = WorkspacesEvents.UserRemoved({ createdBy, userId: memberId })
-  await Aggregate.Of(Workspace, workspaceId).then(Aggregate.Add(event))
-  return null
-}
+export const metadata = { id: 'workspaces/remove-member', access: 'workspace' }

package/src/remove-member.task.js

@@ -0,0 +1,16 @@
+import { Aggregate } from '@ossy/event-store'
+import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
+
+export const metadata = { id: 'workspaces/remove-member' }
+
+export async function run({ payload, req }) {
+  const createdBy = payload?.userId ?? req?.userId
+  const workspaceId = payload?.workspaceId ?? req?.workspaceId
+  const memberId = payload?.memberId ?? req?.memberId
+
+  if (!memberId) throw Object.assign(new Error('memberId is required'), { status: 400 })
+
+  const event = WorkspacesEvents.UserRemoved({ createdBy, userId: memberId })
+  await Aggregate.Of(Workspace, workspaceId).then(Aggregate.Add(event))
+  return null
+}

package/src/server.js

@@ -0,0 +1,3 @@
+export { Workspace } from './workspace.aggregate.js'
+export { WorkspacesEvents } from './workspaces.events.js'
+export * from './workspaces.queries.js'

package/src/sv.translations.json

@@ -0,0 +1,72 @@
+{
+  "profile/workspaces/create.documentTitle": "Skapa workspace",
+  "workspaces.create.title": "Skapa ett nytt workspace",
+  "workspaces.create.namePlaceholder": "Workspace-namn",
+  "workspaces.create.cancel": "Avbryt",
+  "workspaces.create.submit": "Skapa",
+  "profile/workspaces.documentTitle": "Välj workspace",
+  "workspaces.select.title": "Mina workspaces",
+  "workspaces.select.newWorkspace": "Nytt workspace",
+  "workspaces.select.loading": "Laddar...",
+  "workspaces.select.description": "Workspaces är separata miljöer där du kan hantera resurser, mallar, tjänster och fakturering.",
+  "workspaces.select.errorTitle": "Vi kunde inte ladda dina workspaces",
+  "workspaces.select.errorText": "Något gick fel när dina workspaces skulle laddas. Kanske har din session gått ut, eller så har vi klantat till det. Prova att börja om från startsidan.",
+  "workspaces.select.errorAction": "Gå till startsidan",
+  "workspaces.select.emptyTitle": "Nu sätter vi igång",
+  "workspaces.select.emptyText": "För att komma igång behöver vi skapa ett workspace. Ett workspace kapslar in resurser, resursmallar, faktureringsinformation och vilka användare som har tillgång.",
+  "workspaces.select.emptyAction": "Skapa ett workspace",
+  "workspaces/create.label": "Skapa workspace",
+  "workspaces/create.description": "Skapa ett nytt workspace för den inloggade användaren",
+  "workspaces/accept-invitation.label": "Acceptera inbjudan",
+  "workspaces/accept-invitation.description": "Acceptera en workspace-inbjudan",
+  "workspaces/create-api-token.label": "Skapa workspace API-nyckel",
+  "workspaces/create-api-token.description": "Skapa en API-nyckel kopplad till workspace",
+  "workspaces/disable-service.label": "Inaktivera tjänst",
+  "workspaces/disable-service.description": "Inaktivera en tjänst för workspace",
+  "workspaces/enable-service.label": "Aktivera tjänst",
+  "workspaces/enable-service.description": "Aktivera en tjänst för workspace",
+  "workspaces/get-api-tokens.label": "Hämta workspace API-nycklar",
+  "workspaces/get-api-tokens.description": "Lista API-nycklar för workspace",
+  "workspaces/get-invitations.label": "Hämta inbjudningar",
+  "workspaces/get-invitations.description": "Lista väntande workspace-inbjudningar",
+  "workspaces/get-resource-templates.label": "Hämta resursmallar",
+  "workspaces/get-resource-templates.description": "Lista resursmallar tillgängliga för workspace",
+  "workspaces/get-users.label": "Hämta workspace-användare",
+  "workspaces/get-users.description": "Lista medlemmar i workspace",
+  "workspaces/get.label": "Hämta workspace",
+  "workspaces/get.description": "Ladda ett workspace via id",
+  "workspaces/import-resource-templates.label": "Importera resursmallar",
+  "workspaces/import-resource-templates.description": "Importera resursmallar till workspace",
+  "workspaces/invite-user.label": "Bjud in användare",
+  "workspaces/invite-user.description": "Skicka en workspace-inbjudan till en användare",
+  "workspaces/remove-member.label": "Ta bort medlem",
+  "workspaces/remove-member.description": "Ta bort en användare från workspace",
+  "workspaces/list.label": "Lista workspaces",
+  "workspaces/list.description": "Lista workspaces för den inloggade användaren",
+  "workspace/settings.documentTitle": "Workspace-inställningar",
+  "workspace.settings.title": "Workspace-inställningar",
+  "workspace/users.documentTitle": "Användare",
+  "workspace.users.title": "Användare",
+  "workspace.users.description": "Hantera användare i ditt workspace.",
+  "workspace.users.invite": "Bjud in användare",
+  "workspace.users.loading": "Laddar",
+  "workspace/invitations.documentTitle": "Inbjudningar",
+  "workspace/invitations/add.documentTitle": "Bjud in användare",
+  "workspace.invitations.title": "Inbjudningar",
+  "workspace.settings.detailsTitle": "Workspace-detaljer",
+  "workspace.settings.edit": "Redigera",
+  "workspace.settings.name": "Namn",
+  "workspace.settings.created": "Skapad",
+  "workspace.settings.services": "Tjänster",
+  "workspace.settings.loading": "Laddar...",
+  "workspace.invitations.description": "Bjud in användare till ditt workspace för att samarbeta.",
+  "workspace.invitations.invite": "Bjud in användare",
+  "workspace.invitations.empty": "Inga inbjudningar",
+  "workspace.invite.title": "Bjud in användare",
+  "workspace.invite.description": "Bjud in en användare att hantera och bidra med innehåll i detta workspace",
+  "workspace.invite.emailPlaceholder": "E-postadress",
+  "workspace.invite.submit": "Skicka inbjudan",
+  "workspace.invite.successTitle": "Klart",
+  "workspace.invite.successBody": "Vi skickade en inbjudan via e-post. När de har accepterat visas de i användarlistan.",
+  "workspace.invite.error": "Något gick fel — försök igen om några minuter"
+}

package/src/sync-workspace-membership.task.js

@@ -1,5 +1,6 @@
 import { Aggregate } from '@ossy/event-store'
-import { User, UsersEvents } from '@ossy/users'
+import { User, UsersEvents } from '@ossy/users/server'
+import { JoinWorkspace, LeaveWorkspace } from '@ossy/users'
 
 export const metadata = {
   id: 'sync-workspace-membership',
@@ -17,7 +18,7 @@ export async function run ({ event, sdk }) {
     const userId = event.payload.userId
 
     if (sdk) {
-      await sdk.users.removeWorkspace({ userId, workspaceId })
+      await sdk.invoke(LeaveWorkspace, { userId, workspaceId })
       return
     }
 
@@ -30,7 +31,7 @@ export async function run ({ event, sdk }) {
   const userId = event.createdBy
 
   if (sdk) {
-    await sdk.users.addWorkspace({ userId, workspaceId, createdBy: userId })
+    await sdk.invoke(JoinWorkspace, { userId, workspaceId, createdBy: userId })
     return
   }
 

package/src/workspaces.spec.js

@@ -1,6 +1,13 @@
 import casual from 'casual'
 import { TestUtil } from '@ossy/platform/test'
 
+function authHeaders(token) {
+  return {
+    'Content-Type': 'application/json',
+    Authorization: token,
+  }
+}
+
 function workspaceHeaders(userToken, workspaceId) {
   return {
     'Content-Type': 'application/json',
@@ -9,12 +16,10 @@ function workspaceHeaders(userToken, workspaceId) {
   }
 }
 
-describe('[/workspaces][POST]', () => {
+describe('[workspaces/create]', () => {
 
-  TestUtil.AssertAuthenticationNeeded({
-    endpoint: '/workspaces',
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
+  TestUtil.AssertActionAuthenticationNeeded({
+    actionId: 'workspaces/create',
   })
 
   describe('given a workspace name', () => {
@@ -22,11 +27,10 @@ describe('[/workspaces][POST]', () => {
       const user = await TestUtil.GetAuthenticatedTestUser()
       const workspaceName = casual.word
 
-      const response = await TestUtil.MakeRequest({
-        endpoint: '/workspaces',
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json', 'Authorization': user.token },
-        body: JSON.stringify({ name: workspaceName }),
+      const response = await TestUtil.InvokeAction({
+        actionId: 'workspaces/create',
+        headers: authHeaders(user.token),
+        payload: { name: workspaceName },
       })
 
       const body = await response.json()
@@ -53,28 +57,24 @@ describe('[/workspaces][POST]', () => {
 
 })
 
-describe('[/workspaces][GET]', () => {
+describe('[workspaces/list]', () => {
 
-  TestUtil.AssertAuthenticationNeeded({
-    endpoint: '/workspaces',
-    method: 'GET',
-    headers: { 'Content-Type': 'application/json' },
+  TestUtil.AssertActionAuthenticationNeeded({
+    actionId: 'workspaces/list',
   })
 
   it('must return a minified list of workspaces the user have created', async () => {
     const user = await TestUtil.GetAuthenticatedTestUser()
 
-    const workspace = await TestUtil.MakeRequest({
-      endpoint: '/workspaces',
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json', 'Authorization': user.token },
-      body: JSON.stringify({ name: casual.word }),
+    const workspace = await TestUtil.InvokeAction({
+      actionId: 'workspaces/create',
+      headers: authHeaders(user.token),
+      payload: { name: casual.word },
     }).then(response => response.json())
 
-    const response = await TestUtil.MakeRequest({
-      endpoint: '/workspaces',
-      method: 'GET',
-      headers: { 'Content-Type': 'application/json', 'Authorization': user.token },
+    const response = await TestUtil.InvokeAction({
+      actionId: 'workspaces/list',
+      headers: authHeaders(user.token),
     })
 
     const responseBody = await response.json()
@@ -89,28 +89,26 @@ describe('[/workspaces][GET]', () => {
 
 })
 
-describe('[/workspaces/:workspaceId][GET]', () => {
+describe('[workspaces/get]', () => {
 
-  TestUtil.AssertAuthenticationNeeded({
-    endpoint: '/workspaces/123',
-    method: 'GET',
-    headers: { 'Content-Type': 'application/json' },
+  TestUtil.AssertWorkspaceActionAuthenticationNeeded({
+    actionId: 'workspaces/get',
+    payload: { workspaceId: '123' },
   })
 
   it('must return the requested workspace', async () => {
     const user = await TestUtil.GetAuthenticatedTestUser()
 
-    const workspace = await TestUtil.MakeRequest({
-      endpoint: '/workspaces',
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json', 'Authorization': user.token },
-      body: JSON.stringify({ name: casual.word }),
+    const workspace = await TestUtil.InvokeAction({
+      actionId: 'workspaces/create',
+      headers: authHeaders(user.token),
+      payload: { name: casual.word },
     }).then(response => response.json())
 
-    const response = await TestUtil.MakeRequest({
-      endpoint: `/workspaces/${workspace.id}`,
-      method: 'GET',
-      headers: { 'Content-Type': 'application/json', 'Authorization': user.token },
+    const response = await TestUtil.InvokeAction({
+      actionId: 'workspaces/get',
+      headers: workspaceHeaders(user.token, workspace.id),
+      payload: { workspaceId: workspace.id },
     })
 
     const responseBody = await response.json()
@@ -122,22 +120,21 @@ describe('[/workspaces/:workspaceId][GET]', () => {
 
 })
 
-describe('[/resource-templates][POST]', () => {
+describe('[workspaces/import-resource-templates]', () => {
 
-  TestUtil.AssertAuthenticationNeeded({
-    endpoint: '/resource-templates',
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json', 'workspaceId': 'ws-test' },
+  TestUtil.AssertWorkspaceActionAuthenticationNeeded({
+    actionId: 'workspaces/import-resource-templates',
+    payload: { templates: [] },
+    headers: { workspaceId: 'ws-test' },
   })
 
   it('must return the saved templates and create a ResourceTemplatesImported event', async () => {
     const user = await TestUtil.GetAuthenticatedTestUser()
 
-    const workspace = await TestUtil.MakeRequest({
-      endpoint: '/workspaces',
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json', 'Authorization': user.token },
-      body: JSON.stringify({ name: casual.word }),
+    const workspace = await TestUtil.InvokeAction({
+      actionId: 'workspaces/create',
+      headers: authHeaders(user.token),
+      payload: { name: casual.word },
     }).then(response => response.json())
 
     const imported = [
@@ -148,11 +145,10 @@ describe('[/resource-templates][POST]', () => {
       },
     ]
 
-    const response = await TestUtil.MakeRequest({
-      endpoint: '/resource-templates',
-      method: 'POST',
+    const response = await TestUtil.InvokeAction({
+      actionId: 'workspaces/import-resource-templates',
       headers: workspaceHeaders(user.token, workspace.id),
-      body: JSON.stringify(imported)
+      payload: { templates: imported },
     })
 
     const responseBody = await response.json()
@@ -172,22 +168,20 @@ describe('[/resource-templates][POST]', () => {
 
 })
 
-describe('[/resource-templates][GET]', () => {
+describe('[workspaces/get-resource-templates]', () => {
 
-  TestUtil.AssertAuthenticationNeeded({
-    endpoint: '/resource-templates',
-    method: 'GET',
-    headers: { 'Content-Type': 'application/json', 'workspaceId': 'ws-test' },
+  TestUtil.AssertWorkspaceActionAuthenticationNeeded({
+    actionId: 'workspaces/get-resource-templates',
+    headers: { workspaceId: 'ws-test' },
   })
 
   it('must return the saved templates event', async () => {
     const user = await TestUtil.GetAuthenticatedTestUser()
 
-    const workspace = await TestUtil.MakeRequest({
-      endpoint: '/workspaces',
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json', 'Authorization': user.token },
-      body: JSON.stringify({ name: casual.word }),
+    const workspace = await TestUtil.InvokeAction({
+      actionId: 'workspaces/create',
+      headers: authHeaders(user.token),
+      payload: { name: casual.word },
     }).then(response => response.json())
 
     const imported = [
@@ -198,11 +192,10 @@ describe('[/resource-templates][GET]', () => {
       },
     ]
 
-    const response = await TestUtil.MakeRequest({
-      endpoint: '/resource-templates',
-      method: 'POST',
+    const response = await TestUtil.InvokeAction({
+      actionId: 'workspaces/import-resource-templates',
       headers: workspaceHeaders(user.token, workspace.id),
-      body: JSON.stringify(imported)
+      payload: { templates: imported },
     })
 
     const responseBody = await response.json()
@@ -214,29 +207,27 @@ describe('[/resource-templates][GET]', () => {
 
 })
 
-describe('[/tokens][POST]', () => {
+describe('[workspaces/create-api-token]', () => {
 
-  TestUtil.AssertAuthenticationNeeded({
-    endpoint: '/tokens',
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json', 'workspaceId': 'ws-test' },
+  TestUtil.AssertWorkspaceActionAuthenticationNeeded({
+    actionId: 'workspaces/create-api-token',
+    payload: { description: 'Api token for GitHub Actions' },
+    headers: { workspaceId: 'ws-test' },
   })
 
   it('must return an api token and create an ApiTokenCreated event', async () => {
     const user = await TestUtil.GetAuthenticatedTestUser()
 
-    const workspace = await TestUtil.MakeRequest({
-      endpoint: '/workspaces',
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json', 'Authorization': user.token },
-      body: JSON.stringify({ name: casual.word }),
+    const workspace = await TestUtil.InvokeAction({
+      actionId: 'workspaces/create',
+      headers: authHeaders(user.token),
+      payload: { name: casual.word },
     }).then(response => response.json())
 
-    const response = await TestUtil.MakeRequest({
-      endpoint: '/tokens',
-      method: 'POST',
+    const response = await TestUtil.InvokeAction({
+      actionId: 'workspaces/create-api-token',
       headers: workspaceHeaders(user.token, workspace.id),
-      body: JSON.stringify({ description: 'Api token for GitHub Actions' })
+      payload: { description: 'Api token for GitHub Actions' },
     })
 
     const responseBody = await response.json()