@passlock/client 0.9.21 → 0.9.23

package/src/authentication/authenticate.test.ts

@@ -1,7 +1,7 @@
-import { AuthenticationClient } from '@passlock/shared/dist/rpc/authentication.js'
-import { Effect as E, Layer as L, Layer, LogLevel, Logger, pipe } from 'effect'
+import { Effect as E, Layer as L, Layer, LogLevel, Logger, Option as O, pipe } from 'effect'
 import { describe, expect, test, vi } from 'vitest'
 import { mock } from 'vitest-mock-extended'
+import { AuthenticationClient } from '../rpc/authentication.js'
 import { StorageService } from '../storage/storage.js'
 import * as Fixture from './authenticate.fixture.js'
 import { AuthenticateServiceLive, AuthenticationService, GetCredential } from './authenticate.js'
@@ -10,7 +10,13 @@ describe('authenticate should', () => {
   test('return a valid principal', async () => {
     const assertions = E.gen(function* (_) {
       const service = yield* _(AuthenticationService)
-      const result = yield* _(service.authenticatePasskey({ userVerification: 'preferred' }))
+
+      const result = yield* _(
+        service.authenticatePasskey({
+          email: O.none(),
+          userVerification: O.some('preferred'),
+        }),
+      )
 
       expect(result).toEqual(Fixture.principal)
     })
@@ -31,7 +37,13 @@ describe('authenticate should', () => {
   test('pass the authentication request to the backend', async () => {
     const assertions = E.gen(function* (_) {
       const service = yield* _(AuthenticationService)
-      yield* _(service.authenticatePasskey({ userVerification: 'preferred' }))
+
+      yield* _(
+        service.authenticatePasskey({
+          email: O.none(),
+          userVerification: O.some('preferred'),
+        }),
+      )
 
       const rpcClient = yield* _(AuthenticationClient)
       expect(rpcClient.getAuthenticationOptions).toHaveBeenCalledOnce()
@@ -44,7 +56,9 @@ describe('authenticate should', () => {
         const rpcMock = mock<AuthenticationClient['Type']>()
 
         rpcMock.getAuthenticationOptions.mockReturnValue(E.succeed(Fixture.rpcOptionsRes))
-        rpcMock.verifyAuthenticationCredential.mockReturnValue(E.succeed(Fixture.rpcVerificationRes))
+        rpcMock.verifyAuthenticationCredential.mockReturnValue(
+          E.succeed(Fixture.rpcVerificationRes),
+        )
 
         return rpcMock
       }),
@@ -67,11 +81,19 @@ describe('authenticate should', () => {
   test('send the credential to the backend', async () => {
     const assertions = E.gen(function* (_) {
       const service = yield* _(AuthenticationService)
-      yield* _(service.authenticatePasskey({ userVerification: 'preferred' }))
+
+      yield* _(
+        service.authenticatePasskey({
+          email: O.none(),
+          userVerification: O.some('preferred'),
+        }),
+      )
 
       const rpcClient = yield* _(AuthenticationClient)
       expect(rpcClient.getAuthenticationOptions).toHaveBeenCalledOnce()
-      expect(rpcClient.verifyAuthenticationCredential).toHaveBeenCalledWith(Fixture.rpcVerificationReq)
+      expect(rpcClient.verifyAuthenticationCredential).toHaveBeenCalledWith(
+        Fixture.rpcVerificationReq,
+      )
     })
 
     const rpcClientTest = L.effect(
@@ -80,7 +102,9 @@ describe('authenticate should', () => {
         const rpcMock = mock<AuthenticationClient['Type']>()
 
         rpcMock.getAuthenticationOptions.mockReturnValue(E.succeed(Fixture.rpcOptionsRes))
-        rpcMock.verifyAuthenticationCredential.mockReturnValue(E.succeed(Fixture.rpcVerificationRes))
+        rpcMock.verifyAuthenticationCredential.mockReturnValue(
+          E.succeed(Fixture.rpcVerificationRes),
+        )
 
         return rpcMock
       }),
@@ -103,7 +127,13 @@ describe('authenticate should', () => {
   test('store the credential in local storage', async () => {
     const assertions = E.gen(function* (_) {
       const service = yield* _(AuthenticationService)
-      yield* _(service.authenticatePasskey({ userVerification: 'preferred' }))
+
+      yield* _(
+        service.authenticatePasskey({
+          email: O.none(),
+          userVerification: O.some('preferred'),
+        }),
+      )
 
       const storageService = yield* _(StorageService)
       expect(storageService.storeToken).toHaveBeenCalledWith(Fixture.principal)
@@ -112,7 +142,7 @@ describe('authenticate should', () => {
     const storageServiceTest = L.effect(
       StorageService,
       E.sync(() => {
-        const storageMock = mock<StorageService>()
+        const storageMock = mock<StorageService['Type']>()
 
         storageMock.storeToken.mockReturnValue(E.void)
         storageMock.clearExpiredToken.mockReturnValue(E.void)
@@ -138,7 +168,13 @@ describe('authenticate should', () => {
   test('schedule deletion of the local token', async () => {
     const assertions = E.gen(function* (_) {
       const service = yield* _(AuthenticationService)
-      yield* _(service.authenticatePasskey({ userVerification: 'preferred' }))
+
+      yield* _(
+        service.authenticatePasskey({
+          email: O.none(),
+          userVerification: O.some('preferred'),
+        }),
+      )
 
       const storageService = yield* _(StorageService)
       expect(storageService.clearExpiredToken).toHaveBeenCalledWith('passkey')
@@ -147,7 +183,7 @@ describe('authenticate should', () => {
     const storageServiceTest = L.effect(
       StorageService,
       E.sync(() => {
-        const storageMock = mock<StorageService>()
+        const storageMock = mock<StorageService['Type']>()
 
         storageMock.storeToken.mockReturnValue(E.void)
         storageMock.clearExpiredToken.mockReturnValue(E.void)
@@ -173,20 +209,26 @@ describe('authenticate should', () => {
   test("return an error if the browser can't create a credential", async () => {
     const assertions = E.gen(function* (_) {
       const service = yield* _(AuthenticationService)
-      yield* _(service.authenticatePasskey({ userVerification: 'preferred' }))
 
-      const getCredential = yield* _(GetCredential)
+      yield* _(
+        service.authenticatePasskey({
+          email: O.none(),
+          userVerification: O.some('preferred'),
+        }),
+      )
+
+      const { getCredential } = yield* _(GetCredential)
       expect(getCredential).toHaveBeenCalledOnce()
     })
 
     const getCredentialTest = L.effect(
       GetCredential,
       E.sync(() => {
-        const getCredentialMock = vi.fn()
+        const getCredential = vi.fn()
 
-        getCredentialMock.mockReturnValue(E.succeed(Fixture.credential))
+        getCredential.mockReturnValue(E.succeed(Fixture.credential))
 
-        return getCredentialMock
+        return { getCredential }
       }),
     )
 

package/src/authentication/authenticate.ts

@@ -2,52 +2,51 @@
  * Passkey authentication effects
  */
 import {
-  parseRequestOptionsFromJSON,
   type CredentialRequestOptionsJSON,
+  parseRequestOptionsFromJSON,
 } from '@github/webauthn-json/browser-ponyfill'
+import { InternalBrowserError, type NotSupported } from '@passlock/shared/dist/error/error.js'
 import {
-  InternalBrowserError,
-  type NotSupported,
-} from '@passlock/shared/dist/error/error.js'
-import type { OptionsErrors, VerificationErrors } from '@passlock/shared/dist/rpc/authentication.js'
-import { AuthenticationClient, OptionsReq, VerificationReq } from '@passlock/shared/dist/rpc/authentication.js'
-import type {
-  AuthenticationCredential,
-  UserVerification,
-} from '@passlock/shared/dist/schema/passkey.js'
-import { Principal } from '@passlock/shared/dist/schema/principal.js'
+  type OptionsErrors,
+  type OptionsReq,
+  type VerificationErrors,
+  VerificationReq,
+} from '@passlock/shared/dist/rpc/authentication.js'
+import type { AuthenticationCredential } from '@passlock/shared/dist/schema/passkey.js'
+import type { Principal } from '@passlock/shared/dist/schema/principal.js'
 import { Context, Effect as E, Layer, flow, pipe } from 'effect'
 import { Capabilities } from '../capabilities/capabilities.js'
+import { AuthenticationClient } from '../rpc/authentication.js'
 import { StorageService } from '../storage/storage.js'
 
 /* Requests */
 
-export type AuthenticationRequest = { 
-  email?: string, 
-  userVerification?: UserVerification 
-}
-
+export type AuthenticationRequest = OptionsReq
 /* Errors */
 
 export type AuthenticationErrors = NotSupported | OptionsErrors | VerificationErrors
 
 /* Dependencies */
 
-export type GetCredential = (
-  request: CredentialRequestOptions,
-) => E.Effect<AuthenticationCredential, InternalBrowserError>
-
-export const GetCredential = Context.GenericTag<GetCredential>('@services/Get')
+export class GetCredential extends Context.Tag('@services/GetCredential')<
+  GetCredential,
+  {
+    getCredential: (
+      request: CredentialRequestOptions,
+    ) => E.Effect<AuthenticationCredential, InternalBrowserError>
+  }
+>() {}
 
 /* Service */
 
-export type AuthenticationService = {
-  authenticatePasskey: (request: AuthenticationRequest) => E.Effect<Principal, AuthenticationErrors>
-}
-
-export const AuthenticationService = Context.GenericTag<AuthenticationService>(
-  '@services/AuthenticationService',
-)
+export class AuthenticationService extends Context.Tag('@services/AuthenticationService')<
+  AuthenticationService,
+  {
+    authenticatePasskey: (
+      request: AuthenticationRequest,
+    ) => E.Effect<Principal, AuthenticationErrors>
+  }
+>() {}
 
 /* Utilities */
 
@@ -102,11 +101,12 @@ export const authenticatePasskey = (
     yield* _(capabilities.passkeySupport)
 
     yield* _(E.logInfo('Fetching authentication options from Passlock'))
-    const { options, session } = yield* _(fetchOptions(new OptionsReq(request)))
+
+    const { options, session } = yield* _(fetchOptions(request))
 
     yield* _(E.logInfo('Looking up credential'))
-    const get = yield* _(GetCredential)
-    const credential = yield* _(get(options))
+    const { getCredential } = yield* _(GetCredential)
+    const credential = yield* _(getCredential(options))
 
     yield* _(E.logInfo('Verifying credential with Passlock'))
     const principal = yield* _(verifyCredential(new VerificationReq({ credential, session })))
@@ -135,7 +135,9 @@ export const authenticatePasskey = (
 export const AuthenticateServiceLive = Layer.effect(
   AuthenticationService,
   E.gen(function* (_) {
-    const context = yield* _(E.context<GetCredential | AuthenticationClient | Capabilities | StorageService>())
+    const context = yield* _(
+      E.context<GetCredential | AuthenticationClient | Capabilities | StorageService>(),
+    )
 
     return AuthenticationService.of({
       authenticatePasskey: flow(authenticatePasskey, E.provide(context)),

package/src/capabilities/capabilities.ts

@@ -6,14 +6,15 @@ import { Context, Effect as E, Layer, identity, pipe } from 'effect'
 
 /* Service */
 
-export type Capabilities = {
-  passkeySupport: E.Effect<void, NotSupported>
-  isPasskeySupport: E.Effect<boolean>
-  autofillSupport: E.Effect<void, NotSupported>
-  isAutofillSupport: E.Effect<boolean>
-}
-
-export const Capabilities = Context.GenericTag<Capabilities>('@services/Capabilities')
+export class Capabilities extends Context.Tag('@services/Capabilities')<
+  Capabilities,
+  {
+    passkeySupport: E.Effect<void, NotSupported>
+    isPasskeySupport: E.Effect<boolean>
+    autofillSupport: E.Effect<void, NotSupported>
+    isAutofillSupport: E.Effect<boolean>
+  }
+>() {}
 
 /* Effects */
 

package/src/connection/connection.fixture.ts

@@ -1,5 +1,6 @@
-import { ConnectionClient, ConnectRes } from '@passlock/shared/dist/rpc/connection.js'
+import { ConnectRes } from '@passlock/shared/dist/rpc/connection.js'
 import { Effect as E, Layer as L } from 'effect'
+import { ConnectionClient } from '../rpc/connection.js'
 
 export const preConnectRes = new ConnectRes({ warmed: true })
 

package/src/connection/connection.test.ts

@@ -1,9 +1,9 @@
-import { RpcConfig } from '@passlock/shared/dist/rpc/config.js'
-import { ConnectionClient } from '@passlock/shared/dist/rpc/connection.js'
-import { Dispatcher } from '@passlock/shared/dist/rpc/dispatcher.js'
 import { Effect as E, Layer as L, Layer, LogLevel, Logger, pipe } from 'effect'
 import { describe, expect, test } from 'vitest'
 import { mock } from 'vitest-mock-extended'
+import { Dispatcher } from '../rpc/client.js'
+import { RpcConfig } from '../rpc/config.js'
+import { ConnectionClient } from '../rpc/connection.js'
 import * as Fixture from './connection.fixture.js'
 import { ConnectionService, ConnectionServiceLive } from './connection.js'
 

package/src/connection/connection.ts

@@ -1,18 +1,19 @@
 /**
  * Hits the rpc endpoint to warm up a lambda
  */
-import type { RpcConfig } from '@passlock/shared/dist/rpc/config.js'
-import { ConnectionClient } from '@passlock/shared/dist/rpc/connection.js'
-import { Dispatcher } from '@passlock/shared/dist/rpc/dispatcher.js'
 import { Context, Effect as E, Layer, flow, pipe } from 'effect'
+import { Dispatcher } from '../rpc/client.js'
+import type { RpcConfig } from '../rpc/config.js'
+import { ConnectionClient } from '../rpc/connection.js'
 
 /* Service */
 
-export type ConnectionService = {
-  preConnect: () => E.Effect<void>
-}
-
-export const ConnectionService = Context.GenericTag<ConnectionService>('@services/ConnectService')
+export class ConnectionService extends Context.Tag('@services/ConnectionService')<
+  ConnectionService,
+  {
+    preConnect: () => E.Effect<void>
+  }
+>() {}
 
 /* Effects */