chore(release): publish

- @standardnotes/[email protected].2
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].2

.github/workflows/publish.yml

@@ -67,9 +67,9 @@ jobs:
         uses: convictional/trigger-workflow-and-wait@master
         with:
           owner: standardnotes
-          repo: self-hosted
+          repo: server
           github_token: ${{ secrets.CI_PAT_TOKEN }}
-          workflow_file_name: testing-with-updating-client-and-server.yml
+          workflow_file_name: e2e-test-suite.yml
           wait_interval: 30
           client_payload: '{"snjs_image_tag": "${{ github.sha }}"}'
           propagate_failure: true

.github/workflows/snjs.pr.yml

@@ -43,9 +43,9 @@ jobs:
         uses: convictional/trigger-workflow-and-wait@master
         with:
           owner: standardnotes
-          repo: self-hosted
+          repo: server
           github_token: ${{ secrets.CI_PAT_TOKEN }}
-          workflow_file_name: testing-with-updating-client-and-server.yml
+          workflow_file_name: e2e-test-suite.yml
           wait_interval: 30
           client_payload: '{"snjs_image_tag": "${{ github.sha }}"}'
           propagate_failure: true

packages/api/CHANGELOG.md

@@ -3,6 +3,78 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.25.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-23)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.25.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-15)
+
+**Note:** Version bump only for package @standardnotes/api
+
+# [1.25.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-03)
+
+### Features
+
+* **dev:** add u2f ui for managing devices and signing in ([#2182](https://github.com/standardnotes/app/issues/2182)) ([9414774](https://github.com/standardnotes/app/commit/9414774e89c5c21b0c2178652ded72033065e8d2))
+
+## [1.24.16](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-02)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.15](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-01)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.14](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-02-01)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.13](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-31)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-31)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-24)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-24)
+
+### Bug Fixes
+
+* **api:** add u2f required error tag ([9bdda2b](https://github.com/standardnotes/app/commit/9bdda2b60a2a85d32b0896dc6e307d27b76d42a8))
+
+## [1.24.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-23)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-23)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-21)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-20)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-20)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-20)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.24.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-20)
+
+**Note:** Version bump only for package @standardnotes/api
+
 ## [1.24.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2023-01-19)
 
 **Note:** Version bump only for package @standardnotes/api

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api",
-  "version": "1.24.2",
+  "version": "1.25.2",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },
@@ -36,8 +36,8 @@
     "typescript": "*"
   },
   "dependencies": {
-    "@standardnotes/common": "^1.46.3",
-    "@standardnotes/domain-core": "^1.11.1",
+    "@standardnotes/common": "^1.46.4",
+    "@standardnotes/domain-core": "^1.11.3",
     "@standardnotes/encryption": "workspace:*",
     "@standardnotes/models": "workspace:*",
     "@standardnotes/responses": "workspace:*",

packages/api/src/Domain/Client/Authenticator/AuthenticatorApiOperations.ts

@@ -4,5 +4,4 @@ export enum AuthenticatorApiOperations {
   GenerateRegistrationOptions,
   GenerateAuthenticationOptions,
   VerifyRegistrationResponse,
-  VerifyAuthenticationResponse,
 }

packages/api/src/Domain/Client/Authenticator/AuthenticatorApiService.ts

@@ -9,7 +9,6 @@ import {
   GenerateAuthenticatorRegistrationOptionsResponse,
   VerifyAuthenticatorRegistrationResponseResponse,
   GenerateAuthenticatorAuthenticationOptionsResponse,
-  VerifyAuthenticatorAuthenticationResponseResponse,
 } from '../../Response'
 import { AuthenticatorServerInterface } from '../../Server/Authenticator/AuthenticatorServerInterface'
 
@@ -79,7 +78,7 @@ export class AuthenticatorApiService implements AuthenticatorApiServiceInterface
   async verifyRegistrationResponse(
     userUuid: string,
     name: string,
-    registrationCredential: Record<string, unknown>,
+    attestationResponse: Record<string, unknown>,
   ): Promise<VerifyAuthenticatorRegistrationResponseResponse> {
     if (this.operationsInProgress.get(AuthenticatorApiOperations.VerifyRegistrationResponse)) {
       throw new ApiCallError(ErrorMessage.GenericInProgress)
@@ -91,7 +90,7 @@ export class AuthenticatorApiService implements AuthenticatorApiServiceInterface
       const response = await this.authenticatorServer.verifyRegistrationResponse({
         userUuid,
         name,
-        registrationCredential,
+        attestationResponse,
       })
 
       return response
@@ -102,7 +101,7 @@ export class AuthenticatorApiService implements AuthenticatorApiServiceInterface
     }
   }
 
-  async generateAuthenticationOptions(): Promise<GenerateAuthenticatorAuthenticationOptionsResponse> {
+  async generateAuthenticationOptions(username: string): Promise<GenerateAuthenticatorAuthenticationOptionsResponse> {
     if (this.operationsInProgress.get(AuthenticatorApiOperations.GenerateAuthenticationOptions)) {
       throw new ApiCallError(ErrorMessage.GenericInProgress)
     }
@@ -110,7 +109,9 @@ export class AuthenticatorApiService implements AuthenticatorApiServiceInterface
     this.operationsInProgress.set(AuthenticatorApiOperations.GenerateAuthenticationOptions, true)
 
     try {
-      const response = await this.authenticatorServer.generateAuthenticationOptions()
+      const response = await this.authenticatorServer.generateAuthenticationOptions({
+        username,
+      })
 
       return response
     } catch (error) {
@@ -119,28 +120,4 @@ export class AuthenticatorApiService implements AuthenticatorApiServiceInterface
       this.operationsInProgress.set(AuthenticatorApiOperations.GenerateAuthenticationOptions, false)
     }
   }
-
-  async verifyAuthenticationResponse(
-    userUuid: string,
-    authenticationCredential: Record<string, unknown>,
-  ): Promise<VerifyAuthenticatorAuthenticationResponseResponse> {
-    if (this.operationsInProgress.get(AuthenticatorApiOperations.VerifyAuthenticationResponse)) {
-      throw new ApiCallError(ErrorMessage.GenericInProgress)
-    }
-
-    this.operationsInProgress.set(AuthenticatorApiOperations.VerifyAuthenticationResponse, true)
-
-    try {
-      const response = await this.authenticatorServer.verifyAuthenticationResponse({
-        authenticationCredential,
-        userUuid,
-      })
-
-      return response
-    } catch (error) {
-      throw new ApiCallError(ErrorMessage.GenericFail)
-    } finally {
-      this.operationsInProgress.set(AuthenticatorApiOperations.VerifyAuthenticationResponse, false)
-    }
-  }
 }

packages/api/src/Domain/Client/Authenticator/AuthenticatorApiServiceInterface.ts

@@ -4,7 +4,6 @@ import {
   GenerateAuthenticatorRegistrationOptionsResponse,
   VerifyAuthenticatorRegistrationResponseResponse,
   GenerateAuthenticatorAuthenticationOptionsResponse,
-  VerifyAuthenticatorAuthenticationResponseResponse,
 } from '../../Response'
 
 export interface AuthenticatorApiServiceInterface {
@@ -14,11 +13,7 @@ export interface AuthenticatorApiServiceInterface {
   verifyRegistrationResponse(
     userUuid: string,
     name: string,
-    registrationCredential: Record<string, unknown>,
+    attestationResponse: Record<string, unknown>,
   ): Promise<VerifyAuthenticatorRegistrationResponseResponse>
-  generateAuthenticationOptions(): Promise<GenerateAuthenticatorAuthenticationOptionsResponse>
-  verifyAuthenticationResponse(
-    userUuid: string,
-    authenticationCredential: Record<string, unknown>,
-  ): Promise<VerifyAuthenticatorAuthenticationResponseResponse>
+  generateAuthenticationOptions(username: string): Promise<GenerateAuthenticatorAuthenticationOptionsResponse>
 }

packages/api/src/Domain/Client/Workspace/Workspace.ts

@@ -1,10 +0,0 @@
-import { WorkspaceType } from '@standardnotes/common'
-
-export type Workspace = {
-  uuid: string
-  type: WorkspaceType
-  name: string | null
-  keyRotationIndex: number
-  createdAt: number
-  updatedAt: number
-}

packages/api/src/Domain/Client/Workspace/WorkspaceApiOperations.ts

@@ -1,8 +0,0 @@
-export enum WorkspaceApiOperations {
-  Creating,
-  Inviting,
-  Accepting,
-  ListingWorkspaces,
-  ListingWorkspaceUsers,
-  InitiatingKeyshare,
-}

packages/api/src/Domain/Client/Workspace/WorkspaceApiService.ts

@@ -1,156 +0,0 @@
-import { WorkspaceAccessLevel, WorkspaceType } from '@standardnotes/common'
-
-import { ErrorMessage } from '../../Error/ErrorMessage'
-import { ApiCallError } from '../../Error/ApiCallError'
-import { WorkspaceCreationResponse } from '../../Response/Workspace/WorkspaceCreationResponse'
-import { WorkspaceInvitationAcceptingResponse } from '../../Response/Workspace/WorkspaceInvitationAcceptingResponse'
-import { WorkspaceInvitationResponse } from '../../Response/Workspace/WorkspaceInvitationResponse'
-import { WorkspaceServerInterface } from '../../Server/Workspace/WorkspaceServerInterface'
-import { WorkspaceListResponse } from '../../Response/Workspace/WorkspaceListResponse'
-import { WorkspaceUserListResponse } from '../../Response/Workspace/WorkspaceUserListResponse'
-import { WorkspaceKeyshareInitiatingResponse } from '../../Response/Workspace/WorkspaceKeyshareInitiatingResponse'
-
-import { WorkspaceApiServiceInterface } from './WorkspaceApiServiceInterface'
-import { WorkspaceApiOperations } from './WorkspaceApiOperations'
-
-export class WorkspaceApiService implements WorkspaceApiServiceInterface {
-  private operationsInProgress: Map<WorkspaceApiOperations, boolean>
-
-  constructor(private workspaceServer: WorkspaceServerInterface) {
-    this.operationsInProgress = new Map()
-  }
-
-  async initiateKeyshare(dto: {
-    workspaceUuid: string
-    userUuid: string
-    encryptedWorkspaceKey: string
-  }): Promise<WorkspaceKeyshareInitiatingResponse> {
-    this.lockOperation(WorkspaceApiOperations.InitiatingKeyshare)
-
-    try {
-      const response = await this.workspaceServer.initiateKeyshare({
-        workspaceUuid: dto.workspaceUuid,
-        userUuid: dto.userUuid,
-        encryptedWorkspaceKey: dto.encryptedWorkspaceKey,
-      })
-
-      this.unlockOperation(WorkspaceApiOperations.InitiatingKeyshare)
-
-      return response
-    } catch (error) {
-      throw new ApiCallError(ErrorMessage.GenericFail)
-    }
-  }
-
-  async listWorkspaceUsers(dto: { workspaceUuid: string }): Promise<WorkspaceUserListResponse> {
-    this.lockOperation(WorkspaceApiOperations.ListingWorkspaceUsers)
-
-    try {
-      const response = await this.workspaceServer.listWorkspaceUsers({ workspaceUuid: dto.workspaceUuid })
-
-      this.unlockOperation(WorkspaceApiOperations.ListingWorkspaceUsers)
-
-      return response
-    } catch (error) {
-      throw new ApiCallError(ErrorMessage.GenericFail)
-    }
-  }
-
-  async listWorkspaces(): Promise<WorkspaceListResponse> {
-    this.lockOperation(WorkspaceApiOperations.ListingWorkspaces)
-
-    try {
-      const response = await this.workspaceServer.listWorkspaces({})
-
-      this.unlockOperation(WorkspaceApiOperations.ListingWorkspaces)
-
-      return response
-    } catch (error) {
-      throw new ApiCallError(ErrorMessage.GenericFail)
-    }
-  }
-
-  async acceptInvite(dto: {
-    inviteUuid: string
-    userUuid: string
-    publicKey: string
-    encryptedPrivateKey: string
-  }): Promise<WorkspaceInvitationAcceptingResponse> {
-    this.lockOperation(WorkspaceApiOperations.Accepting)
-
-    try {
-      const response = await this.workspaceServer.acceptInvite({
-        encryptedPrivateKey: dto.encryptedPrivateKey,
-        publicKey: dto.publicKey,
-        inviteUuid: dto.inviteUuid,
-        userUuid: dto.userUuid,
-      })
-
-      this.unlockOperation(WorkspaceApiOperations.Accepting)
-
-      return response
-    } catch (error) {
-      throw new ApiCallError(ErrorMessage.GenericFail)
-    }
-  }
-
-  async inviteToWorkspace(dto: {
-    inviteeEmail: string
-    workspaceUuid: string
-    accessLevel: WorkspaceAccessLevel
-  }): Promise<WorkspaceInvitationResponse> {
-    this.lockOperation(WorkspaceApiOperations.Inviting)
-
-    try {
-      const response = await this.workspaceServer.inviteToWorkspace({
-        inviteeEmail: dto.inviteeEmail,
-        workspaceUuid: dto.workspaceUuid,
-        accessLevel: dto.accessLevel,
-      })
-
-      this.unlockOperation(WorkspaceApiOperations.Inviting)
-
-      return response
-    } catch (error) {
-      throw new ApiCallError(ErrorMessage.GenericFail)
-    }
-  }
-
-  async createWorkspace(dto: {
-    workspaceType: WorkspaceType
-    encryptedWorkspaceKey?: string
-    encryptedPrivateKey?: string
-    publicKey?: string
-    workspaceName?: string
-  }): Promise<WorkspaceCreationResponse> {
-    this.lockOperation(WorkspaceApiOperations.Creating)
-
-    try {
-      const response = await this.workspaceServer.createWorkspace({
-        workspaceType: dto.workspaceType,
-        encryptedPrivateKey: dto.encryptedPrivateKey,
-        encryptedWorkspaceKey: dto.encryptedWorkspaceKey,
-        publicKey: dto.publicKey,
-        workspaceName: dto.workspaceName,
-      })
-
-      this.unlockOperation(WorkspaceApiOperations.Creating)
-
-      return response
-    } catch (error) {
-      throw new ApiCallError(ErrorMessage.GenericFail)
-    }
-  }
-
-  private lockOperation(operation: WorkspaceApiOperations): void {
-    if (this.operationsInProgress.get(operation)) {
-      throw new ApiCallError(ErrorMessage.GenericInProgress)
-    }
-
-    this.operationsInProgress.set(operation, true)
-  }
-
-  private unlockOperation(operation: WorkspaceApiOperations): void {
-    this.operationsInProgress.set(operation, false)
-  }
-}

packages/api/src/Domain/Client/Workspace/WorkspaceApiServiceInterface.ts

@@ -1,36 +0,0 @@
-import { WorkspaceAccessLevel, WorkspaceType } from '@standardnotes/common'
-
-import { WorkspaceKeyshareInitiatingResponse } from '../../Response/Workspace/WorkspaceKeyshareInitiatingResponse'
-import { WorkspaceCreationResponse } from '../../Response/Workspace/WorkspaceCreationResponse'
-import { WorkspaceInvitationAcceptingResponse } from '../../Response/Workspace/WorkspaceInvitationAcceptingResponse'
-import { WorkspaceInvitationResponse } from '../../Response/Workspace/WorkspaceInvitationResponse'
-import { WorkspaceListResponse } from '../../Response/Workspace/WorkspaceListResponse'
-import { WorkspaceUserListResponse } from '../../Response/Workspace/WorkspaceUserListResponse'
-
-export interface WorkspaceApiServiceInterface {
-  createWorkspace(dto: {
-    workspaceType: WorkspaceType
-    encryptedWorkspaceKey?: string
-    encryptedPrivateKey?: string
-    publicKey?: string
-    workspaceName?: string
-  }): Promise<WorkspaceCreationResponse>
-  inviteToWorkspace(dto: {
-    inviteeEmail: string
-    workspaceUuid: string
-    accessLevel: WorkspaceAccessLevel
-  }): Promise<WorkspaceInvitationResponse>
-  acceptInvite(dto: {
-    inviteUuid: string
-    userUuid: string
-    publicKey: string
-    encryptedPrivateKey: string
-  }): Promise<WorkspaceInvitationAcceptingResponse>
-  listWorkspaces(): Promise<WorkspaceListResponse>
-  listWorkspaceUsers(dto: { workspaceUuid: string }): Promise<WorkspaceUserListResponse>
-  initiateKeyshare(dto: {
-    workspaceUuid: string
-    userUuid: string
-    encryptedWorkspaceKey: string
-  }): Promise<WorkspaceKeyshareInitiatingResponse>
-}

packages/api/src/Domain/Client/Workspace/WorkspaceUser.ts

@@ -1,16 +0,0 @@
-import { WorkspaceAccessLevel, WorkspaceUserStatus } from '@standardnotes/common'
-
-export type WorkspaceUser = {
-  uuid: string
-  accessLevel: WorkspaceAccessLevel
-  userUuid: string
-  userDisplayName: string | null
-  workspaceUuid: string
-  encryptedWorkspaceKey: string | null
-  publicKey: string | null
-  encryptedPrivateKey: string | null
-  status: WorkspaceUserStatus
-  keyRotationIndex: number
-  createdAt: number
-  updatedAt: number
-}

packages/api/src/Domain/Client/index.ts

@@ -15,7 +15,3 @@ export * from './User/UserApiService'
 export * from './User/UserApiServiceInterface'
 export * from './WebSocket/WebSocketApiService'
 export * from './WebSocket/WebSocketApiServiceInterface'
-export * from './Workspace/WorkspaceApiService'
-export * from './Workspace/WorkspaceApiServiceInterface'
-export * from './Workspace/WorkspaceUser'
-export * from './Workspace/Workspace'

packages/api/src/Domain/Http/ErrorTag.ts

@@ -1,6 +1,7 @@
 export enum ErrorTag {
   MfaInvalid = 'mfa-invalid',
   MfaRequired = 'mfa-required',
+  U2FRequired = 'u2f-required',
   RefreshTokenInvalid = 'invalid-refresh-token',
   RefreshTokenExpired = 'expired-refresh-token',
   AccessTokenExpired = 'expired-access-token',

packages/api/src/Domain/Request/Authenticator/GenerateAuthenticatorAuthenticationOptionsRequestParams.ts

@@ -0,0 +1,3 @@
+export interface GenerateAuthenticatorAuthenticationOptionsRequestParams {
+  username: string
+}

packages/api/src/Domain/Request/Authenticator/VerifyAuthenticatorAuthenticationResponseRequestParams.ts

@@ -1,5 +0,0 @@
-export interface VerifyAuthenticatorAuthenticationResponseRequestParams {
-  userUuid: string
-  authenticationCredential: Record<string, unknown>
-  [additionalParam: string]: unknown
-}

packages/api/src/Domain/Request/Authenticator/VerifyAuthenticatorRegistrationResponseRequestParams.ts

@@ -1,6 +1,6 @@
 export interface VerifyAuthenticatorRegistrationResponseRequestParams {
   userUuid: string
   name: string
-  registrationCredential: Record<string, unknown>
+  attestationResponse: Record<string, unknown>
   [additionalParam: string]: unknown
 }

packages/api/src/Domain/Request/Workspace/WorkspaceCreationRequestParams.ts

@@ -1,10 +0,0 @@
-import { WorkspaceType } from '@standardnotes/common'
-
-export type WorkspaceCreationRequestParams = {
-  workspaceType: WorkspaceType
-  encryptedWorkspaceKey?: string
-  encryptedPrivateKey?: string
-  publicKey?: string
-  workspaceName?: string
-  [additionalParam: string]: unknown
-}

packages/api/src/Domain/Request/Workspace/WorkspaceInvitationAcceptingRequestParams.ts

@@ -1,7 +0,0 @@
-export type WorkspaceInvitationAcceptingRequestParams = {
-  inviteUuid: string
-  userUuid: string
-  publicKey: string
-  encryptedPrivateKey: string
-  [additionalParam: string]: unknown
-}

packages/api/src/Domain/Request/Workspace/WorkspaceInvitationRequestParams.ts

@@ -1,8 +0,0 @@
-import { WorkspaceAccessLevel } from '@standardnotes/common'
-
-export type WorkspaceInvitationRequestParams = {
-  workspaceUuid: string
-  inviteeEmail: string
-  accessLevel: WorkspaceAccessLevel
-  [additionalParam: string]: unknown
-}

packages/api/src/Domain/Request/Workspace/WorkspaceKeyshareInitiatingRequestParams.ts

@@ -1,6 +0,0 @@
-export type WorkspaceKeyshareInitiatingRequestParams = {
-  userUuid: string
-  workspaceUuid: string
-  encryptedWorkspaceKey: string
-  [additionalParam: string]: unknown
-}

packages/api/src/Domain/Request/Workspace/WorkspaceListRequestParams.ts

@@ -1,3 +0,0 @@
-export type WorkspaceListRequestParams = {
-  [additionalParam: string]: unknown
-}