@ossy/workspaces 3.8.0 → 3.11.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ossy/workspaces",
   "description": "Workspaces feature package - create, select, and manage workspaces, users, and invitations",
-  "version": "3.8.0",
+  "version": "3.11.0",
   "type": "module",
   "main": "./src/index.js",
   "module": "./src/index.js",
@@ -11,7 +11,11 @@
     "./entitlements": "./src/entitlements.js",
     "./merge-workspace-schemas": "./src/merge-workspace-schemas.js",
     "./SchemasReadBootstrap": "./src/SchemasReadBootstrap.jsx",
-    "./workspace-invitation.email.jsx": "./src/workspace-invitation.email.jsx"
+    "./workspace-invitation.email.jsx": "./src/workspace-invitation.email.jsx",
+    "./create-workspace.flow.js": "./src/create-workspace.flow.js",
+    "./invite-user.flow.js": "./src/invite-user.flow.js",
+    "./remove-member.flow.js": "./src/remove-member.flow.js",
+    "./switch-workspace.flow.js": "./src/switch-workspace.flow.js"
   },
   "scripts": {
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --verbose",
@@ -27,6 +31,7 @@
     "@ossy/schema": "^3.8.0"
   },
   "peerDependencies": {
+    "@ossy/authentication": "*",
     "@ossy/design-system": ">=1.0.0",
     "@ossy/router-react": ">=1.0.0",
     "@ossy/sdk-react": ">=1.0.0",
@@ -45,5 +50,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "14548dfc2019e7258e8c75db527acbf66fe829bd"
+  "gitHead": "53ff8456920e09151c9d88df4a6c3ee958d811eb"
 }

package/src/CreateWorkspacePage.jsx

@@ -1,23 +1,31 @@
-import React, { useState } from 'react'
-import { ListWorkspaces, CreateWorkspace } from '@ossy/workspaces'
-import { useSdk, cacheKey } from '@ossy/sdk-react'
-import { Button, useInputValue, Input, View, useLocale } from '@ossy/design-system'
+import React, { useMemo, useState } from 'react'
+import { useSdk } from '@ossy/sdk-react'
+import { Button, Form, FieldFactory, Text, View, useLocale } from '@ossy/design-system'
 import { useRouter } from '@ossy/router-react'
+import { Schema, contentValidator } from '@ossy/schema'
 import { AuthenticationGuard } from './AuthenticationGuard.jsx'
 import { selectWorkspace } from './selectWorkspace.js'
-import { metadata as CreateWorkspaceMeta } from './create.action.js'
+import { metadata as CreateWorkspace } from './create.action.js'
+import { metadata as CreateWorkspaceForm } from './create-workspace.form.js'
+import workspaceTemplate from './workspace.schema.js'
 
 export const CreateWorkspacePage = () => {
   const router = useRouter()
   const { t } = useLocale()
   const [error, setError] = useState()
-  const [workspaceName, setWorkspaceName] = useInputValue()
   const sdk = useSdk()
+  const validate = useMemo(
+    () => contentValidator(Schema.of({ schemas: [workspaceTemplate] }), workspaceTemplate),
+    [],
+  )
 
-  const onCreateWorkspace = workspaceName => {
-    sdk.invoke(CreateWorkspace, { name: workspaceName })
+  const onCreateWorkspace = (data) => {
+    setError(undefined)
+    sdk.invoke(CreateWorkspace, { name: data.name })
       .then((workspace) => {
-        sdk.invalidate(cacheKey(ListWorkspaces))
+        // Do not invalidate ListWorkspaces before selectWorkspace: that schedules
+        // WorkspaceAppSettingsSync PATCH which can race and revert the workspace
+        // cookie written by /users/select-workspace (full reload refreshes the list).
         selectWorkspace(
           workspace.id,
           router.getHref({ id: '@storage/home', params: { workspaceId: workspace.id } })
@@ -29,38 +37,29 @@ export const CreateWorkspacePage = () => {
   return (
     <AuthenticationGuard>
       <View gap="m">
-
         <title>{t('profile/workspaces/create.documentTitle')}</title>
-        <Text variant="heading-primary" className="stack-m" as="h1" text="workspaces.create.title" />
-
-        <Input
-          id="workspaceName"
-          className={error ? 'stack-s' : 'stack-m'}
-          type="text"
-          placeholder={t('workspaces.create.namePlaceholder')}
-          required
-          onChange={setWorkspaceName}
-          style={{ width: '100%' }}
-        />
-
-        <div className={error ? 'stack-m' : ''}>{error}</div>
-
-        <View gap="m" layout="row" justifyContent="flex-end">
-
-          <Button
-            variant="link"
-            id="cancel"
-            href={() => router.back()}>{t('workspaces.create.cancel')}
-          </Button>
-
-          <Button
-            id="createWorkspace"
-            data-action={CreateWorkspaceMeta.id}
-            variant="cta"
-            onClick={() => onCreateWorkspace(workspaceName)}>{t('workspaces.create.submit')}
-          </Button>
-
-        </View>
+        <Form
+          id={CreateWorkspaceForm.id}
+          schemaId={CreateWorkspaceForm.schemaId}
+          fields={workspaceTemplate.fields}
+          defaultData={{}}
+          onSubmit={onCreateWorkspace}
+          validate={validate}
+          gap="m"
+        >
+          <Text variant="heading-primary" className="stack-m" as="h1" text="workspaces.create.title" />
+          <FieldFactory />
+          {error ? <View className="stack-m">{error}</View> : null}
+          <View gap="m" layout="row" justifyContent="flex-end">
+            <Button
+              variant="link"
+              id="cancel"
+              href={() => router.back()}
+              label="workspaces.create.cancel"
+            />
+            <Button {...CreateWorkspace} variant="cta" type="submit" />
+          </View>
+        </Form>
       </View>
     </AuthenticationGuard>
   )

package/src/GeneralSettings.jsx

@@ -17,7 +17,7 @@ function isServiceOn (services, packageName) {
 export const GeneralSettings = () => {
   const { t } = useLocale()
   const sdk = useSdk()
-  const { data: workspace, refetch: refetchWorkspace } = sdk.read(GetWorkspace)
+  const { data: workspace, status: workspaceStatus, refetch: refetchWorkspace } = sdk.read(GetWorkspace)
   const { status: userStatus } = sdk.read(GetCurrentUser)
   const [flowStage, setFlowStage] = useState(FlowStage.View)
   const [busyPackage, setBusyPackage] = useState(null)
@@ -49,10 +49,16 @@ export const GeneralSettings = () => {
           </Switch>
         )}
       />
-      {userStatus === AsyncStatus.Loading ? (
+      {userStatus === AsyncStatus.Loading
+        || workspaceStatus === AsyncStatus.Loading
+        || workspaceStatus === AsyncStatus.NotInitialized ? (
         <Text>{t('workspace.settings.loading')}</Text>
       ) : (
-        <View gap="s">
+        <View
+          gap="s"
+          data-active-workspace-id={workspace?.id}
+          data-active-workspace-name={workspace?.name}
+        >
           <View layout="row" gap="s"><Text style={{ fontWeight: 'bold' }} text="workspace.settings.name" /><Text>{workspace?.name}</Text></View>
           <View layout="row" gap="s"><Text style={{ fontWeight: 'bold' }} text="workspace.settings.created" /><Text>{formatDate(workspace?.created)}</Text></View>
           {MANAGED_SERVICES.length > 0 && (

package/src/Invitations.jsx

@@ -24,7 +24,16 @@ export const Invitations = () => {
       />
       <View gap="xs">
         {invitations.map(invite => (
-          <View layout="row" roundness="s" alignItems="center" inset="m" gap="m" selectable key={invite.email}>
+          <View
+            layout="row"
+            roundness="s"
+            alignItems="center"
+            inset="m"
+            gap="m"
+            selectable
+            key={invite.email}
+            data-invite-email={invite.email}
+          >
             <Icon name="mail" />
             <View><Text variant="small" as="span">{invite.email}</Text></View>
           </View>

package/src/Invite.jsx

@@ -1,13 +1,16 @@
-import React, { useState, useRef } from 'react'
+import React, { useMemo, useState } from 'react'
 import { InviteUser } from '@ossy/workspaces'
 import { useSdk } from '@ossy/sdk-react'
 import { useRouter } from '@ossy/router-react'
-import { useInputValue, Button, Input, Switch, Guide, Text, View, useLocale } from '@ossy/design-system'
+import { Schema, contentValidator } from '@ossy/schema'
+import { Button, Form, FieldFactory, Switch, Guide, Text, View, useLocale } from '@ossy/design-system'
+import { metadata as InviteUserForm } from './invite-user.form.js'
+import inviteUserTemplate from './invite-user.schema.js'
 
 const FlowStage = {
   EnterEmail: 'EnterEmail',
   Success: 'Success',
-  Error: 'Error'
+  Error: 'Error',
 }
 
 export const Invite = () => {
@@ -15,12 +18,13 @@ export const Invite = () => {
   const router = useRouter()
   const sdk = useSdk()
   const [flowStage, setFlowStage] = useState(FlowStage.EnterEmail)
-  const [email, setEmail] = useInputValue('')
-  const formRef = useRef()
+  const validate = useMemo(
+    () => contentValidator(Schema.of({ schemas: [inviteUserTemplate] }), inviteUserTemplate),
+    [],
+  )
 
-  const sendInvite = event => {
-    event.preventDefault()
-    formRef.current.reportValidity() && sdk.invoke(InviteUser, { email })
+  const sendInvite = (data) => {
+    sdk.invoke(InviteUser, { email: data.email })
       .then(() => setFlowStage(FlowStage.Success))
       .catch(() => setFlowStage(FlowStage.Error))
   }
@@ -34,43 +38,31 @@ export const Invite = () => {
         <View gap="m">
           <Text variant="heading-primary" as="h1" text="workspace.invite.title" />
           <Text text="workspace.invite.description" />
-          <form
-            ref={formRef}
+          <Form
+            id={InviteUserForm.id}
+            schemaId={InviteUserForm.schemaId}
+            fields={inviteUserTemplate.fields}
+            defaultData={{ email: '' }}
             onSubmit={sendInvite}
-            style={{ width: '100%', display: 'flex', flexDirection: 'column' }}
+            validate={validate}
+            gap="m"
           >
-            <View gap="m">
-
-              <Input
-                id="registerField"
-                className="stack-m"
-                type="email"
-                placeholder="workspace.invite.emailPlaceholder"
-                required
-                value={email}
-                onChange={e => setEmail(e.target.value)}
+            <FieldFactory />
+            <View gap="m" layout="row" justifyContent="flex-end">
+              <Button
+                variant="link"
+                id="cancelButton"
+                href={() => router.back()}
+                label="design-system.cancel"
+              />
+              <Button
+                {...InviteUser}
+                variant="cta"
+                type="submit"
+                label="workspace.invite.submit"
               />
-
-              <View gap="m" layout="row" justifyContent="flex-end">
-
-                <Button
-                  variant="link"
-                  id="cancelButton"
-                  href={() => router.back()}
-                  label="design-system.cancel"
-                />
-
-                <Button
-                  variant="cta"
-                  id="registerButton"
-                  data-action={InviteUser.id}
-                  type="submit"
-                  label="workspace.invite.submit"
-                  onClick={sendInvite}
-                />
-              </View>
             </View>
-          </form>
+          </Form>
         </View>
       </Switch.Case>
 
@@ -78,6 +70,7 @@ export const Invite = () => {
         <Guide
           title="workspace.invite.successTitle"
           titleVariant="primary"
+          data-flow-stage="invite-success"
         >
           <Text>
             <Text as="span" text="workspace.invite.successBody" />
@@ -88,7 +81,7 @@ export const Invite = () => {
       </Switch.Case>
 
       <Switch.Case match={[FlowStage.Error]}>
-        <Text text="workspace.invite.error" />
+        <Text text="workspace.invite.error" data-flow-stage="invite-error" />
       </Switch.Case>
 
     </Switch>

package/src/Invite.page.jsx

@@ -12,7 +12,7 @@ export const metadata = {
 
 export const InvitePage = () => {
   return (
-    <View layout="off-center-m" style={{ height: '100%' }}>
+    <View layout="off-center-l" style={{ height: '100%' }}>
       <View data-region="content" surface="primary" roundness="m" inset="m">
         <Invite />
       </View>

package/src/SelectWorkspacePage.jsx

@@ -99,6 +99,8 @@ export const SelectWorkspacePage = () => {
                   inset="m"
                   roundness="s"
                   selectable
+                  data-workspace-id={workspace.id}
+                  data-workspace-name={workspace.name}
                   onClick={() => setWorkspace(workspace.id)}
                 >
                   <View>

package/src/Users.jsx

@@ -1,17 +1,40 @@
-import React from 'react'
-import { GetUsers } from '@ossy/workspaces'
-import { useSdk, AsyncStatus } from '@ossy/sdk-react'
-import { Text, View, Icon, Button, ContentHeader, useLocale } from '@ossy/design-system'
+import React, { useState } from 'react'
+import { GetUsers, RemoveMember } from '@ossy/workspaces'
+import { GetCurrentUser } from '@ossy/authentication'
+import { useSdk, AsyncStatus, cacheKey } from '@ossy/sdk-react'
+import { Text, View, Icon, Button, ContentHeader, Overlay, Guide, useLocale } from '@ossy/design-system'
 import { useRouter } from '@ossy/router-react'
+import { metadata as OpenRemoveMember } from './open-remove-member.action.js'
 
 export const Users = () => {
   const { t } = useLocale()
   const router = useRouter()
   const sdk = useSdk()
-  const { status, data: users = [] } = sdk.read(GetUsers)
+  const { status, data: users = [], refetch } = sdk.read(GetUsers)
+  const { data: currentUser } = sdk.read(GetCurrentUser)
+  const [memberToRemove, setMemberToRemove] = useState(null)
+  const [removing, setRemoving] = useState(false)
+  const [error, setError] = useState(null)
 
   if (status === AsyncStatus.Loading) return <>{t('workspace.users.loading')}</>
 
+  const confirmRemove = async () => {
+    const member = memberToRemove
+    if (!member?.id) return
+    setRemoving(true)
+    setError(null)
+    try {
+      await sdk.invoke(RemoveMember, { memberId: member.id })
+      sdk.invalidate(cacheKey(GetUsers))
+      setMemberToRemove(null)
+      await refetch()
+    } catch {
+      setError(t('workspace.users.removeError'))
+    } finally {
+      setRemoving(false)
+    }
+  }
+
   return (
     <View gap="m">
       <ContentHeader
@@ -24,19 +47,78 @@ export const Users = () => {
         )}
       />
       <View gap="xs">
-        {users.map(user => (
-          <View layout="row" roundness="s" alignItems="center" inset="m" gap="m" selectable key={user.id}>
-            <Icon name={user.type === 'Bot' ? 'bot' : 'user'} />
-            <View>
-              <View layout="row" gap="s">
-                <Text as="span" style={{ fontWeight: 'bold' }}>{user.firstName}</Text>
-                <Text as="span" style={{ fontWeight: 'bold' }}>{user.lastName}</Text>
-              </View>
-              <Text variant="small" as="span">{user.email}</Text>
+        {users.map(user => {
+          const isSelf = currentUser?.id != null && user.id === currentUser.id
+          const isBot = user.type === 'Bot'
+          // System bot is auto-joined; owners must not remove it (or themselves).
+          const canRemove = !isSelf && !isBot
+          return (
+            <View
+              layout="row"
+              roundness="s"
+              alignItems="center"
+              inset="m"
+              gap="m"
+              selectable
+              key={user.id}
+              data-member-email={user.email}
+              data-member-id={user.id}
+            >
+              <Icon name={isBot ? 'bot' : 'user'} />
+              <View.Item fill style={{ minWidth: 0 }}>
+                <View layout="row" gap="s">
+                  <Text as="span" style={{ fontWeight: 'bold' }}>{user.firstName}</Text>
+                  <Text as="span" style={{ fontWeight: 'bold' }}>{user.lastName}</Text>
+                </View>
+                <Text variant="small" as="span">{user.email}</Text>
+              </View.Item>
+              {canRemove && (
+                <Button
+                  {...OpenRemoveMember}
+                  variant="command-danger"
+                  prefix="user-remove"
+                  label="workspace.users.remove"
+                  aria-label={t('workspace.users.remove')}
+                  data-member-email={user.email}
+                  onClick={() => {
+                    setError(null)
+                    setMemberToRemove(user)
+                  }}
+                />
+              )}
             </View>
-          </View>
-        ))}
+          )
+        })}
       </View>
+
+      <Overlay isVisible={Boolean(memberToRemove)} onClose={() => !removing && setMemberToRemove(null)}>
+        <View layout="off-center-s" style={{ height: '100%' }}>
+          <View data-region="content">
+            <View surface="primary" roundness="s" inset="l">
+              <Guide
+                title="workspace.users.removeTitle"
+                text="workspace.users.removeText"
+                textParams={{ email: memberToRemove?.email }}
+                actions={[
+                  {
+                    label: 'workspace.users.cancel',
+                    variant: 'command',
+                    disabled: removing,
+                    onClick: () => setMemberToRemove(null),
+                  },
+                  {
+                    ...RemoveMember,
+                    variant: 'command-danger',
+                    disabled: removing,
+                    onClick: confirmRemove,
+                  },
+                ]}
+              />
+              {error && <Text variant="small">{error}</Text>}
+            </View>
+          </View>
+        </View>
+      </Overlay>
     </View>
   )
 }

package/src/create-workspace.flow.js

@@ -0,0 +1,27 @@
+import signUpFlow from '@ossy/authentication/sign-up.flow.js'
+import { metadata as CreateWorkspace } from './create.action.js'
+import { metadata as CreateWorkspaceForm } from './create-workspace.form.js'
+
+export const metadata = {
+  id: '@ossy/workspaces/flows/create-workspace',
+  feature: 'workspaces',
+  requires: ['server', 'database'],
+  timeout: 90_000,
+}
+
+/**
+ * New user signs up, creates an additional workspace, and lands on storage home.
+ */
+export default {
+  title: 'Create workspace',
+  description:
+    'Signed-in user opens create-workspace, fills the name field, submits, and reaches storage home',
+  steps: [
+    ...signUpFlow.steps,
+    { page: '@profile/workspaces/create' },
+    { result: { action: CreateWorkspace, timeout: 15000 } },
+    { form: CreateWorkspaceForm },
+    { action: CreateWorkspace },
+    { result: { page: '@storage/home', timeout: 20000 } },
+  ],
+}

package/src/create-workspace.form.js

@@ -0,0 +1,5 @@
+export const metadata = {
+  id: '@ossy/workspaces/form/create-workspace',
+  schemaId: '@ossy/workspaces/schema/workspace',
+  label: '@ossy/workspaces/form/create-workspace.label',
+}

package/src/en.translations.json

@@ -17,6 +17,12 @@
   "workspaces.select.emptyAction": "Create a workspace",
   "@ossy/workspaces/actions/create.label": "Create workspace",
   "@ossy/workspaces/actions/create.description": "Create a new workspace for the authenticated user",
+  "@ossy/workspaces/form/create-workspace.label": "Create workspace",
+  "@ossy/workspaces/form/invite-user.label": "Invite user",
+  "@ossy/workspaces/schema/workspace.name.label": "Workspace name",
+  "@ossy/workspaces/schema/workspace.name.placeholder": "Workspace name",
+  "@ossy/workspaces/schema/invite-user.email.label": "Email address",
+  "@ossy/workspaces/schema/invite-user.email.placeholder": "Email address",
   "@ossy/workspaces/actions/accept-invitation.label": "Accept invitation",
   "@ossy/workspaces/actions/accept-invitation.description": "Accept a workspace invitation",
   "@ossy/workspaces/actions/create-api-token.label": "Create workspace API token",
@@ -50,6 +56,13 @@
   "workspace.users.description": "Manage users in your workspace.",
   "workspace.users.invite": "Invite user",
   "workspace.users.loading": "Loading",
+  "workspace.users.remove": "Remove",
+  "workspace.users.removeTitle": "Remove member?",
+  "workspace.users.removeText": "Remove {email} from this workspace. They will lose access immediately.",
+  "workspace.users.cancel": "Cancel",
+  "workspace.users.removeError": "Could not remove that member. Try again in a moment.",
+  "@ossy/workspaces/actions/open-remove-member.label": "Remove member",
+  "@ossy/workspaces/actions/open-remove-member.description": "Open the remove-member confirmation dialog",
   "workspace/invitations.documentTitle": "Invitations",
   "workspace/invitations/add.documentTitle": "Invite user",
   "workspace.invitations.title": "Invitations",

package/src/index.js

@@ -1,11 +1,14 @@
 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 CreateWorkspaceForm } from './create-workspace.form.js'
 export { metadata as InviteUser } from './invite-user.action.js'
+export { metadata as InviteUserForm } from './invite-user.form.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 OpenRemoveMember } from './open-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 GetSchemas } from './get-schemas.action.js'

package/src/invite-token.js

@@ -0,0 +1,20 @@
+import jwt from 'jsonwebtoken'
+import { ConfigService } from '@ossy/config'
+
+/**
+ * Signed token for workspace invitation email links.
+ * `sub` = invitee email (required by accept-invitation); `aud` = workspace id.
+ *
+ * @param {{ workspaceId: string, email: string }} args
+ * @returns {string}
+ */
+export function createWorkspaceInvitationToken ({ workspaceId, email }) {
+  if (!workspaceId) throw new Error('workspaceId is required')
+  if (!email) throw new Error('email is required')
+  const expiresIn = ConfigService.TokenValidity
+  return jwt.sign(
+    { aud: workspaceId, sub: email },
+    ConfigService.TokenSecret,
+    { expiresIn, algorithm: 'HS256' },
+  )
+}

package/src/invite-token.spec.js

@@ -0,0 +1,20 @@
+import jwt from 'jsonwebtoken'
+import { ConfigService } from '@ossy/config'
+import { createWorkspaceInvitationToken } from './invite-token.js'
+
+describe('createWorkspaceInvitationToken', () => {
+  it('embeds invitee email as sub and workspace id as aud', () => {
+    const token = createWorkspaceInvitationToken({
+      workspaceId: 'ws-123',
+      email: 'invitee@example.com',
+    })
+    const payload = jwt.verify(token, ConfigService.TokenSecret, { algorithms: ['HS256'] })
+    expect(payload.sub).toBe('invitee@example.com')
+    expect(payload.aud).toBe('ws-123')
+  })
+
+  it('rejects missing email or workspaceId', () => {
+    expect(() => createWorkspaceInvitationToken({ workspaceId: 'ws-123' })).toThrow(/email/)
+    expect(() => createWorkspaceInvitationToken({ email: 'a@b.c' })).toThrow(/workspaceId/)
+  })
+})

package/src/invite-user.flow.js

@@ -0,0 +1,40 @@
+import signUpFlow from '@ossy/authentication/sign-up.flow.js'
+import { InviteUser } from '@ossy/workspaces'
+import { metadata as InviteUserForm } from './invite-user.form.js'
+
+export const metadata = {
+  id: '@ossy/workspaces/flows/invite-user',
+  feature: 'workspaces',
+  requires: ['server', 'database'],
+  timeout: 120_000,
+}
+
+/**
+ * Happy path for issue #5 — invite a teammate, then accept via invitation email.
+ */
+export default {
+  title: 'Invite and accept workspace invitation',
+  description:
+    'Signed-in user invites another email, asserts pending invite, invitee accepts via email and lands on workspaces',
+  steps: [
+    ...signUpFlow.steps,
+    // Keep the inviter address before the invite form overwrites `$email`.
+    { capture: { inviterEmail: '$email' } },
+    { page: '@workspace/invitations/add' },
+    { result: { action: InviteUser, timeout: 15000 } },
+    { form: InviteUserForm },
+    { action: InviteUser },
+    { result: { selector: '[data-flow-stage="invite-success"]', timeout: 15000 } },
+    { page: '@workspace/invitations' },
+    { result: { selector: '[data-invite-email="$email"]', timeout: 15000 } },
+    {
+      email: {
+        to: '$email',
+        id: '@ossy/workspaces/emails/invitation',
+        click: 'Accept invitation',
+      },
+    },
+    { result: { selector: '[data-flow-stage="invite-verify-success"]', timeout: 15000 } },
+    { result: { page: '@profile/workspaces', timeout: 20000 } },
+  ],
+}

package/src/invite-user.form.js

@@ -0,0 +1,5 @@
+export const metadata = {
+  id: '@ossy/workspaces/form/invite-user',
+  schemaId: '@ossy/workspaces/schema/invite-user',
+  label: '@ossy/workspaces/form/invite-user.label',
+}

package/src/invite-user.schema.js

@@ -0,0 +1,9 @@
+/** Invite-user form schema — email for workspace invitation. */
+export default {
+  id: '@ossy/workspaces/schema/invite-user',
+  name: 'Invite user',
+  icon: 'user-add',
+  fields: [
+    { name: 'email', type: 'email', required: true },
+  ],
+}

package/src/invite-user.task.js

@@ -1,4 +1,3 @@
-import jwt from 'jsonwebtoken'
 import { Aggregate } from '@ossy/event-store'
 import { UserSchema } from '@ossy/users/server'
 import { Workspace, WorkspacesEvents } from '@ossy/workspaces/server'
@@ -6,19 +5,17 @@ import { Token, TokenEvents } from '@ossy/tokens/server'
 import { EmailRenderer } from '@ossy/email'
 import { ConfigService } from '@ossy/config'
 import { isEmailLike } from '@ossy/schema'
-import WorkspaceInvitationEmail, { subject as workspaceInvitationSubject } from './workspace-invitation.email.jsx'
+import WorkspaceInvitationEmail, { id as workspaceInvitationEmailId, subject as workspaceInvitationSubject } from './workspace-invitation.email.jsx'
+import { createWorkspaceInvitationToken } from './invite-token.js'
 
 export const metadata = { id: '@ossy/workspaces/tasks/invite-user' }
 
-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 email = typeof payload?.email === 'string'
+    ? payload.email.trim()
+    : (typeof req?.body?.email === 'string' ? req.body.email.trim() : undefined)
   const inviterEmail = payload?.inviterEmail ?? req?.user?.email
 
   if (!isEmailLike(email)) {
@@ -36,7 +33,7 @@ export async function run({ payload, integrations, req }) {
   const expiresAt = Date.now() + expiresIn * 1000
   const inviteEvent = WorkspacesEvents.UserInvited({ createdBy, email, expiresAt })
 
-  const rawToken = createVerificationToken(workspaceId)
+  const rawToken = createWorkspaceInvitationToken({ workspaceId, email })
   const tokenEvent = TokenEvents.Created({
     type: 'Verification',
     createdBy,
@@ -67,7 +64,14 @@ export async function run({ payload, integrations, req }) {
 
   const emailClient = integrations?.get?.('email')
   if (emailClient) {
-    await emailClient.send({ to: email, from: 'noreply@ossy.se', subject: workspaceInvitationSubject, html, text })
+    await emailClient.send({
+      to: email,
+      from: 'noreply@ossy.se',
+      subject: workspaceInvitationSubject,
+      html,
+      text,
+      templateId: workspaceInvitationEmailId,
+    })
   }
 
   return ''

package/src/open-remove-member.action.js

@@ -0,0 +1,7 @@
+/** Client-only — opens the remove-member confirmation dialog. */
+export const metadata = {
+  id: '@ossy/workspaces/actions/open-remove-member',
+  access: 'workspace',
+  label: 'workspace.users.remove',
+  icon: 'user-remove',
+}

package/src/remove-member.action.js

@@ -1 +1,6 @@
-export const metadata = { id: '@ossy/workspaces/actions/remove-member', access: 'workspace' }
+export const metadata = {
+  id: '@ossy/workspaces/actions/remove-member',
+  access: 'workspace',
+  label: '@ossy/workspaces/actions/remove-member.label',
+  icon: 'user-remove',
+}

package/src/remove-member.flow.js

@@ -0,0 +1,61 @@
+import inviteUserFlow from './invite-user.flow.js'
+import { SignOut, OpenSignIn, RequestSignIn, SignInForm } from '@ossy/authentication'
+import { RemoveMember } from '@ossy/workspaces'
+import { metadata as OpenRemoveMember } from './open-remove-member.action.js'
+
+export const metadata = {
+  id: '@ossy/workspaces/flows/remove-member',
+  feature: 'workspaces',
+  requires: ['server', 'database'],
+  timeout: 180_000,
+}
+
+/**
+ * Happy path for issue #5 — after inviting and accepting, the owner signs back
+ * in, removes the new member from Users, and sees them gone from the list.
+ */
+export default {
+  title: 'Remove workspace member',
+  description:
+    'Owner invites a teammate, invitee accepts, owner signs back in and removes the member from the users list',
+  steps: [
+    ...inviteUserFlow.steps,
+    // Invite form overwrote `$email` with the invitee — keep it before sign-in.
+    { capture: { inviteeEmail: '$email' } },
+    { page: '@profile' },
+    { result: { action: SignOut, timeout: 10000 } },
+    { action: SignOut },
+    { result: { action: OpenSignIn, timeout: 15000 } },
+    { action: OpenSignIn },
+    { form: SignInForm, fields: { email: '$inviterEmail' } },
+    { action: RequestSignIn },
+    { result: { selector: '[data-flow-stage="sign-in-success"]', timeout: 15000 } },
+    {
+      email: {
+        to: '$inviterEmail',
+        id: '@ossy/authentication/emails/verify-sign-in',
+        click: 'Complete sign in',
+      },
+    },
+    { result: { selector: '[data-flow-stage="verify-success"]', timeout: 10000 } },
+    { result: { page: '@home', timeout: 15000 } },
+    { page: '@workspace/users' },
+    { result: { selector: '[data-member-email="$inviteeEmail"]', timeout: 15000 } },
+    {
+      result: {
+        action: { ...OpenRemoveMember, memberEmail: '$inviteeEmail' },
+        timeout: 10000,
+      },
+    },
+    { action: { ...OpenRemoveMember, memberEmail: '$inviteeEmail' } },
+    { result: { action: RemoveMember, timeout: 10000 } },
+    { action: RemoveMember },
+    {
+      result: {
+        selector: '[data-member-email="$inviteeEmail"]',
+        hidden: true,
+        timeout: 20000,
+      },
+    },
+  ],
+}

package/src/remove-member.task.js

@@ -11,6 +11,8 @@ export async function run({ payload, req }) {
   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))
+  await Aggregate.Of(Workspace, workspaceId)
+    .then(Aggregate.Add(event))
+    .then(Aggregate.Save())
   return null
 }

package/src/sv.translations.json

@@ -17,6 +17,12 @@
   "workspaces.select.emptyAction": "Skapa ett workspace",
   "@ossy/workspaces/actions/create.label": "Skapa workspace",
   "@ossy/workspaces/actions/create.description": "Skapa ett nytt workspace för den inloggade användaren",
+  "@ossy/workspaces/form/create-workspace.label": "Skapa workspace",
+  "@ossy/workspaces/form/invite-user.label": "Bjud in användare",
+  "@ossy/workspaces/schema/workspace.name.label": "Workspace-namn",
+  "@ossy/workspaces/schema/workspace.name.placeholder": "Workspace-namn",
+  "@ossy/workspaces/schema/invite-user.email.label": "E-postadress",
+  "@ossy/workspaces/schema/invite-user.email.placeholder": "E-postadress",
   "@ossy/workspaces/actions/accept-invitation.label": "Acceptera inbjudan",
   "@ossy/workspaces/actions/accept-invitation.description": "Acceptera en workspace-inbjudan",
   "@ossy/workspaces/actions/create-api-token.label": "Skapa workspace API-nyckel",
@@ -50,6 +56,13 @@
   "workspace.users.description": "Hantera användare i ditt workspace.",
   "workspace.users.invite": "Bjud in användare",
   "workspace.users.loading": "Laddar",
+  "workspace.users.remove": "Ta bort",
+  "workspace.users.removeTitle": "Ta bort medlem?",
+  "workspace.users.removeText": "Ta bort {email} från detta workspace. De förlorar åtkomst direkt.",
+  "workspace.users.cancel": "Avbryt",
+  "workspace.users.removeError": "Kunde inte ta bort medlemmen. Försök igen om en stund.",
+  "@ossy/workspaces/actions/open-remove-member.label": "Ta bort medlem",
+  "@ossy/workspaces/actions/open-remove-member.description": "Öppna bekräftelsedialogen för att ta bort en medlem",
   "workspace/invitations.documentTitle": "Inbjudningar",
   "workspace/invitations/add.documentTitle": "Bjud in användare",
   "workspace.invitations.title": "Inbjudningar",

package/src/switch-workspace.flow.js

@@ -0,0 +1,58 @@
+import signUpFlow from '@ossy/authentication/sign-up.flow.js'
+import { metadata as CreateWorkspace } from './create.action.js'
+import { metadata as CreateWorkspaceForm } from './create-workspace.form.js'
+
+export const metadata = {
+  id: '@ossy/workspaces/flows/switch-workspace',
+  feature: 'workspaces',
+  requires: ['server', 'database'],
+  timeout: 150_000,
+}
+
+/**
+ * Happy path for issue #5 — create a second workspace, then switch back to the
+ * primary one from the workspaces list.
+ */
+export default {
+  title: 'Switch workspace',
+  description:
+    'Signed-in user creates a second workspace, then switches back to the primary workspace from the profile list',
+  steps: [
+    ...signUpFlow.steps,
+    { page: '@profile/workspaces' },
+    { result: { selector: '[data-workspace-id]', timeout: 15000 } },
+    {
+      capture: {
+        primaryWorkspaceId: { selector: '[data-workspace-id]', attr: 'data-workspace-id' },
+      },
+    },
+    { page: '@profile/workspaces/create' },
+    { result: { action: CreateWorkspace, timeout: 15000 } },
+    { form: CreateWorkspaceForm, fields: { name: 'e2e-second-workspace' } },
+    { action: CreateWorkspace },
+    { result: { page: '@storage/home', timeout: 20000 } },
+    { page: '@workspace/settings' },
+    {
+      result: {
+        selector: '[data-active-workspace-name="e2e-second-workspace"]',
+        timeout: 20000,
+      },
+    },
+    { page: '@profile/workspaces' },
+    {
+      result: {
+        selector: '[data-workspace-id="$primaryWorkspaceId"]',
+        timeout: 15000,
+      },
+    },
+    { click: { selector: '[data-workspace-id="$primaryWorkspaceId"]' } },
+    { result: { page: '@home', timeout: 20000 } },
+    { page: '@workspace/settings' },
+    {
+      result: {
+        selector: '[data-active-workspace-id="$primaryWorkspaceId"]',
+        timeout: 20000,
+      },
+    },
+  ],
+}

package/src/workspace.schema.js

@@ -4,6 +4,6 @@ export default {
   categoryName: 'Workspaces',
   icon: 'building',
   fields: [
-    { name: 'name', type: 'text' },
+    { name: 'name', type: 'text', required: true },
   ],
 }