@passlock/client 0.9.30 → 0.9.32

package/dist/user/user.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/user/user.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAG1D,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAGrF,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAW3C,aAAa;AAEb,MAAM,OAAO,WAAY,SAAQ,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,EAMlE;CAAG;AAMN,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAc,EAA+C,EAAE;IAC5F,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC,CAAA;QACnD,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;QAEtC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,CAAA;QAC1C,MAAM,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAE3F,OAAO,YAAY,CAAA;IACrB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,OAAoB,EAC6B,EAAE;IACnD,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC,CAAA;QACnD,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;QAEtC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,CAAA;QAC1C,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,GAAG,OAAO,CAAA;QAC1C,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,IAAI,cAAc,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAA;IAC1F,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,UAAU;AAEV,qBAAqB;AACrB,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC,MAAM,CACzC,WAAW,EACX,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;IAChB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAc,CAAC,CAAA;IACjD,OAAO,WAAW,CAAC,EAAE,CAAC;QACpB,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxD,uBAAuB,EAAE,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KAC3E,CAAC,CAAA;AACJ,CAAC,CAAC,CACH,CAAA;AACD,oBAAoB"}
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/user/user.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAI1D,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAWrC,aAAa;AAEb,MAAM,OAAO,WAAY,SAAQ,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,EAMlE;CAAG;AAMN,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAc,EAA+C,EAAE;IAC5F,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC,CAAA;QACnD,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAE1C,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,CAAA;QAC1C,MAAM,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAEnG,OAAO,YAAY,CAAA;IACrB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,OAAoB,EAC6B,EAAE;IACnD,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC,CAAA;QACnD,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAE1C,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,CAAA;QAC1C,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,GAAG,OAAO,CAAA;QAC1C,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,IAAI,GAAG,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAA;IAClG,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,UAAU;AAEV,qBAAqB;AACrB,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC,MAAM,CACzC,WAAW,EACX,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;IAChB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAkB,CAAC,CAAA;IACrD,OAAO,WAAW,CAAC,EAAE,CAAC;QACpB,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACxD,uBAAuB,EAAE,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KAC3E,CAAC,CAAA;AACJ,CAAC,CAAC,CACH,CAAA;AACD,oBAAoB"}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const PASSLOCK_CLIENT_VERSION = "0.9.30";
+export declare const PASSLOCK_CLIENT_VERSION = "0.9.32";

package/dist/version.js

@@ -1,2 +1,2 @@
-export const PASSLOCK_CLIENT_VERSION = '0.9.30';
+export const PASSLOCK_CLIENT_VERSION = '0.9.32';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@passlock/client",
-  "version": "0.9.30",
+  "version": "0.9.32",
   "description": "Passkey authentication and social login for web apps (Typescript). Framework agnostic",
   "keywords": [
     "passkey",
@@ -48,7 +48,7 @@
     "@effect/schema": "0.74.1",
     "@github/webauthn-json": "^2.1.1",
     "effect": "3.8.4",
-    "@passlock/shared": "0.9.30"
+    "@passlock/shared": "0.9.32"
   },
   "devDependencies": {
     "@qetza/replacetokens": "^1.7.0",

package/src/authentication/authenticate.fixture.ts

@@ -1,15 +1,15 @@
 import { Effect as E, Layer as L, Option as O } from 'effect'
 
 import {
-  OptionsRes,
-  VerificationReq,
-  VerificationRes,
-} from '@passlock/shared/dist/rpc/authentication.js'
-import { IsExistingUserRes, VerifyEmailRes } from '@passlock/shared/dist/rpc/user.js'
+  OptionsResponse,
+  VerificationRequest,
+  VerificationResponse,
+} from '@passlock/shared/dist/rpc/passkey/authentication.js'
+import { IsExistingUserResponse, VerifyEmailResponse } from '@passlock/shared/dist/rpc/user.js'
 import type { AuthenticationCredential } from '@passlock/shared/dist/schema/passkey.js'
 
 import * as Fixtures from '../test/fixtures.js'
-import { AuthenticationClient } from '../rpc/authentication.js'
+import { AuthenticationClient } from '../rpc/passkey/authentication.js'
 import { type AuthenticationRequest, GetCredential } from './authenticate.js'
 
 export const session = 'session'
@@ -23,7 +23,7 @@ export const request: AuthenticationRequest = {
   email: O.none(),
 }
 
-export const rpcOptionsRes = new OptionsRes({
+export const rpcOptionsRes = new OptionsResponse({
   session,
   publicKey: {
     rpId: 'passlock.dev',
@@ -47,13 +47,13 @@ export const credential: AuthenticationCredential = {
   authenticatorAttachment: null,
 }
 
-export const rpcVerificationReq = new VerificationReq({ session, credential })
+export const rpcVerificationReq = new VerificationRequest({ session, credential })
 
-export const rpcVerificationRes = new VerificationRes({ principal: Fixtures.principal })
+export const rpcVerificationRes = new VerificationResponse({ principal: Fixtures.principal })
 
-export const rpcIsExistingUserRes = new IsExistingUserRes({ existingUser: true, detail: O.none() })
+export const rpcIsExistingUserRes = new IsExistingUserResponse({ existingUser: true, detail: O.none() })
 
-export const rpcVerifyEmailRes = new VerifyEmailRes({ principal: Fixtures.principal })
+export const rpcVerifyEmailRes = new VerifyEmailResponse({ principal: Fixtures.principal })
 
 export const getCredentialTest = L.succeed(
   GetCredential,

package/src/authentication/authenticate.test.ts

@@ -3,7 +3,7 @@ import { describe, expect, test, vi } from 'vitest'
 import { mock } from 'vitest-mock-extended'
 
 import * as Fixture from './authenticate.fixture.js'
-import { AuthenticationClient } from '../rpc/authentication.js'
+import { AuthenticationClient } from '../rpc/passkey/authentication.js'
 import { StorageService } from '../storage/storage.js'
 import { AuthenticateServiceLive, AuthenticationService, GetCredential } from './authenticate.js'
 

package/src/authentication/authenticate.ts

@@ -8,25 +8,19 @@ import {
 import { Context, Effect as E, Layer, flow, pipe } from 'effect'
 
 import { InternalBrowserError, type NotSupported } from '@passlock/shared/dist/error/error.js'
-import {
-  type OptionsErrors,
-  type OptionsReq,
-  type VerificationErrors,
-  VerificationReq,
-} from '@passlock/shared/dist/rpc/authentication.js'
+import * as RPC from '../rpc/passkey/authentication.js'
 import type { AuthenticationCredential } from '@passlock/shared/dist/schema/passkey.js'
 import type { Principal } from '@passlock/shared/dist/schema/principal.js'
 
 import { Capabilities } from '../capabilities/capabilities.js'
-import { AuthenticationClient } from '../rpc/authentication.js'
 import { StorageService } from '../storage/storage.js'
 
 /* Requests */
 
-export type AuthenticationRequest = OptionsReq
+export type AuthenticationRequest = RPC.OptionsRequest
 /* Errors */
 
-export type AuthenticationErrors = NotSupported | OptionsErrors | VerificationErrors
+export type AuthenticationErrors = NotSupported | RPC.OptionsErrors | RPC.VerificationErrors
 
 /* Dependencies */
 
@@ -52,11 +46,11 @@ export class AuthenticationService extends Context.Tag('@services/Authentication
 
 /* Utilities */
 
-const fetchOptions = (request: OptionsReq) => {
+const fetchOptions = (request: RPC.OptionsRequest) => {
   return E.gen(function* (_) {
     yield* _(E.logDebug('Making request'))
 
-    const rpcClient = yield* _(AuthenticationClient)
+    const rpcClient = yield* _(RPC.AuthenticationClient)
     const { publicKey, session } = yield* _(rpcClient.getAuthenticationOptions(request))
 
     yield* _(E.logDebug('Converting Passlock options to CredentialRequestOptions'))
@@ -79,11 +73,11 @@ const toRequestOptions = (request: CredentialRequestOptionsJSON) => {
   )
 }
 
-const verifyCredential = (request: VerificationReq) => {
+const verifyCredential = (request: RPC.VerificationRequest) => {
   return E.gen(function* (_) {
     yield* _(E.logDebug('Making request'))
 
-    const rpcClient = yield* _(AuthenticationClient)
+    const rpcClient = yield* _(RPC.AuthenticationClient)
     const { principal } = yield* _(rpcClient.verifyAuthenticationCredential(request))
 
     return principal
@@ -92,7 +86,7 @@ const verifyCredential = (request: VerificationReq) => {
 
 /* Effects */
 
-type Dependencies = GetCredential | Capabilities | StorageService | AuthenticationClient
+type Dependencies = GetCredential | Capabilities | StorageService | RPC.AuthenticationClient
 
 export const authenticatePasskey = (
   request: AuthenticationRequest,
@@ -111,7 +105,7 @@ export const authenticatePasskey = (
     const credential = yield* _(getCredential(options))
 
     yield* _(E.logInfo('Verifying credential with Passlock'))
-    const principal = yield* _(verifyCredential(new VerificationReq({ credential, session })))
+    const principal = yield* _(verifyCredential(new RPC.VerificationRequest({ credential, session })))
 
     const storageService = yield* _(StorageService)
     yield* _(storageService.storeToken(principal))
@@ -138,7 +132,7 @@ export const AuthenticateServiceLive = Layer.effect(
   AuthenticationService,
   E.gen(function* (_) {
     const context = yield* _(
-      E.context<GetCredential | AuthenticationClient | Capabilities | StorageService>(),
+      E.context<GetCredential | RPC.AuthenticationClient | Capabilities | StorageService>(),
     )
 
     return AuthenticationService.of({

package/src/connection/connection.fixture.ts

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

package/src/connection/connection.ts

@@ -5,7 +5,7 @@ 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'
+import * as RPC from '../rpc/connection.js'
 
 /* Service */
 
@@ -28,7 +28,7 @@ const hitPrincipal = pipe(
 
 const hitRpc = pipe(
   E.logInfo('Pre-connecting to RPC endpoint'),
-  E.zipRight(ConnectionClient),
+  E.zipRight(RPC.ConnectionClient),
   E.flatMap(rpcClient => rpcClient.preConnect()),
   E.asVoid,
 )
@@ -41,7 +41,7 @@ export const preConnect = () => pipe(E.all([hitPrincipal, hitRpc], { concurrency
 export const ConnectionServiceLive = Layer.effect(
   ConnectionService,
   E.gen(function* (_) {
-    const context = yield* _(E.context<ConnectionClient | Dispatcher | RpcConfig>())
+    const context = yield* _(E.context<RPC.ConnectionClient | Dispatcher | RpcConfig>())
 
     return ConnectionService.of({
       preConnect: flow(preConnect, E.provide(context)),

package/src/effect.ts

@@ -32,12 +32,12 @@ import {
   RegistrationService,
   RegistrationServiceLive,
 } from './registration/register.js'
-import { AuthenticationClientLive } from './rpc/authentication.js'
+import { AuthenticationClientLive } from './rpc/passkey/authentication.js'
 import { DispatcherLive } from './rpc/client.js'
 import type { RpcConfig } from './rpc/config.js'
 import { RetrySchedule } from './rpc/config.js'
 import { ConnectionClientLive } from './rpc/connection.js'
-import { RegistrationClientLive } from './rpc/registration.js'
+import { RegistrationClientLive } from './rpc/passkey/registration.js'
 import { SocialClientLive } from './rpc/social.js'
 import { UserClientLive } from './rpc/user.js'
 import {

package/src/email/email.fixture.ts

@@ -1,6 +1,6 @@
 import { Effect as E, Layer as L, Option as O } from 'effect'
 
-import { VerifyEmailReq, VerifyEmailRes } from '@passlock/shared/dist/rpc/user.js'
+import { VerifyEmailRequest, VerifyEmailResponse } from '@passlock/shared/dist/rpc/user.js'
 
 import * as Fixtures from '../test/fixtures.js'
 import { AuthenticationService } from '../authentication/authenticate.js'
@@ -24,9 +24,9 @@ export const authenticationServiceTest = L.succeed(
   }),
 )
 
-export const rpcVerifyEmailReq = new VerifyEmailReq({ token, code })
+export const rpcVerifyEmailReq = new VerifyEmailRequest({ token, code })
 
-export const rpcVerifyEmailRes = new VerifyEmailRes({ principal: Fixtures.principal })
+export const rpcVerifyEmailRes = new VerifyEmailResponse({ principal: Fixtures.principal })
 
 export const rpcClientTest = L.succeed(
   UserClient,

package/src/email/email.ts

@@ -5,7 +5,7 @@ import { Context, Effect as E, Layer, Option as O, flow, identity, pipe } from '
 
 import { BadRequest } from '@passlock/shared/dist/error/error.js'
 import type { VerifyEmailErrors as RpcErrors } from '@passlock/shared/dist/rpc/user.js'
-import { VerifyEmailReq } from '@passlock/shared/dist/rpc/user.js'
+import { VerifyEmailRequest } from '@passlock/shared/dist/rpc/user.js'
 import type { Principal } from '@passlock/shared/dist/schema/principal.js'
 
 import { type AuthenticationErrors, AuthenticationService } from '../authentication/authenticate.js'
@@ -112,7 +112,7 @@ export const verifyEmail = (
     yield* _(E.logDebug('Making request'))
     const client = yield* _(UserClient)
     const { principal } = yield* _(
-      client.verifyEmail(new VerifyEmailReq({ token, code: request.code })),
+      client.verifyEmail(new VerifyEmailRequest({ token, code: request.code })),
     )
 
     return principal

package/src/registration/register.fixture.ts

@@ -1,15 +1,15 @@
 import { Effect as E, Layer as L, Option as O } from 'effect'
 
 import {
-  OptionsReq,
-  OptionsRes,
-  VerificationReq,
-  VerificationRes,
-} from '@passlock/shared/dist/rpc/registration.js'
+  OptionsRequest,
+  OptionsResponse,
+  VerificationRequest,
+  VerificationResponse,
+} from '@passlock/shared/dist/rpc/passkey/registration.js'
 import type { RegistrationCredential } from '@passlock/shared/dist/schema/passkey.js'
 
 import * as Fixtures from '../test/fixtures.js'
-import { RegistrationClient } from '../rpc/registration.js'
+import { RegistrationClient } from '../rpc/passkey/registration.js'
 import { UserService } from '../user/user.js'
 import { CreateCredential, type RegistrationRequest } from './register.js'
 
@@ -27,9 +27,9 @@ export const registrationRequest: RegistrationRequest = {
   verifyEmail: O.none(),
 }
 
-export const rpcOptionsReq = new OptionsReq(registrationRequest)
+export const rpcOptionsReq = new OptionsRequest(registrationRequest)
 
-export const registrationOptions: OptionsRes = {
+export const registrationOptions: OptionsResponse = {
   session,
   publicKey: {
     rp: {
@@ -46,7 +46,7 @@ export const registrationOptions: OptionsRes = {
   },
 }
 
-export const rpcOptionsRes = new OptionsRes(registrationOptions)
+export const rpcOptionsRes = new OptionsResponse(registrationOptions)
 
 export const credential: RegistrationCredential = {
   type: 'public-key',
@@ -60,13 +60,13 @@ export const credential: RegistrationCredential = {
   clientExtensionResults: {},
 }
 
-export const rpcVerificationReq = new VerificationReq({
+export const rpcVerificationReq = new VerificationRequest({
   session,
   credential,
   verifyEmail: O.none(),
 })
 
-export const rpcVerificationRes = new VerificationRes({ principal: Fixtures.principal })
+export const rpcVerificationRes = new VerificationResponse({ principal: Fixtures.principal })
 
 export const createCredentialTest = L.succeed(
   CreateCredential,

package/src/registration/register.test.ts

@@ -5,7 +5,7 @@ import { mock } from 'vitest-mock-extended'
 import { Duplicate, InternalBrowserError } from '@passlock/shared/dist/error/error.js'
 
 import * as Fixture from './register.fixture.js'
-import { RegistrationClient } from '../rpc/registration.js'
+import { RegistrationClient } from '../rpc/passkey/registration.js'
 import { CreateCredential, RegistrationService, RegistrationServiceLive } from './register.js'
 
 describe('register should', () => {

package/src/registration/register.ts

@@ -9,19 +9,17 @@ import { Context, Effect as E, Layer, flow, pipe } from 'effect'
 
 import type { Duplicate, NotSupported } from '@passlock/shared/dist/error/error.js'
 import { InternalBrowserError } from '@passlock/shared/dist/error/error.js'
-import type { OptionsErrors, VerificationErrors } from '@passlock/shared/dist/rpc/registration.js'
-import { OptionsReq, VerificationReq } from '@passlock/shared/dist/rpc/registration.js'
+import * as RPC from '../rpc/passkey/registration.js'
 import type { RegistrationCredential } from '@passlock/shared/dist/schema/passkey.js'
 import type { Principal } from '@passlock/shared/dist/schema/principal.js'
 
 import { Capabilities } from '../capabilities/capabilities.js'
-import { RegistrationClient } from '../rpc/registration.js'
 import { StorageService } from '../storage/storage.js'
 import type { UserService } from '../user/user.js'
 
 /* Requests */
 
-export type RegistrationRequest = OptionsReq
+export type RegistrationRequest = RPC.OptionsRequest
 
 /* Dependencies */
 
@@ -36,7 +34,7 @@ export class CreateCredential extends Context.Tag('@services/CreateCredential')<
 
 /* Errors */
 
-export type RegistrationErrors = NotSupported | OptionsErrors | VerificationErrors
+export type RegistrationErrors = NotSupported | RPC.OptionsErrors | RPC.VerificationErrors
 
 /* Service */
 
@@ -49,11 +47,11 @@ export class RegistrationService extends Context.Tag('@services/RegistrationServ
 
 /* Utilities */
 
-const fetchOptions = (request: OptionsReq) => {
+const fetchOptions = (request: RPC.OptionsRequest) => {
   return E.gen(function* (_) {
     yield* _(E.logDebug('Making request'))
 
-    const rpcClient = yield* _(RegistrationClient)
+    const rpcClient = yield* _(RPC.RegistrationClient)
     const { publicKey, session } = yield* _(rpcClient.getRegistrationOptions(request))
 
     yield* _(E.logDebug('Converting Passlock options to CredentialCreationOptions'))
@@ -76,11 +74,11 @@ const toCreationOptions = (jsonOptions: CredentialCreationOptionsJSON) => {
   )
 }
 
-const verifyCredential = (request: VerificationReq) => {
+const verifyCredential = (request: RPC.VerificationRequest) => {
   return E.gen(function* (_) {
     yield* _(E.logDebug('Making request'))
 
-    const rpcClient = yield* _(RegistrationClient)
+    const rpcClient = yield* _(RPC.RegistrationClient)
     const { principal } = yield* _(rpcClient.verifyRegistrationCredential(request))
 
     return principal
@@ -94,7 +92,7 @@ type Dependencies =
   | CreateCredential
   | StorageService
   | UserService
-  | RegistrationClient
+  | RPC.RegistrationClient
 
 export const registerPasskey = (
   request: RegistrationRequest,
@@ -105,14 +103,14 @@ export const registerPasskey = (
     yield* _(capabilities.passkeySupport)
 
     yield* _(E.logInfo('Fetching registration options from Passlock'))
-    const { options, session } = yield* fetchOptions(new OptionsReq(request))
+    const { options, session } = yield* fetchOptions(new RPC.OptionsRequest(request))
 
     yield* _(E.logInfo('Building new credential'))
     const { createCredential } = yield* _(CreateCredential)
     const credential = yield* _(createCredential(options))
 
     yield* _(E.logInfo('Storing credential public key in Passlock'))
-    const verificationRequest = new VerificationReq({
+    const verificationRequest = new RPC.VerificationRequest({
       ...request,
       credential,
       session,
@@ -146,7 +144,7 @@ export const RegistrationServiceLive = Layer.effect(
   E.gen(function* (_) {
     const context = yield* _(
       E.context<
-        CreateCredential | RegistrationClient | Capabilities | StorageService | UserService
+        CreateCredential | RPC.RegistrationClient | Capabilities | StorageService | UserService
       >(),
     )
 

package/src/rpc/client.ts

@@ -62,7 +62,7 @@ export const DispatcherLive = Layer.effect(
     }
 
     const buildUrl = (_path: string) => {
-      const endpoint = maybeEndpoint || 'https://api.passlock.dev'
+      const endpoint = maybeEndpoint || 'https://api.v1.passlock.dev'
       // drop leading /
       const path = _path.replace(/^\//, '')
       return `${endpoint}/${tenancyId}/${path}`

package/src/rpc/connection.ts

@@ -3,7 +3,7 @@ import { Context, Effect as E, Layer } from 'effect'
 
 import {
   CONNECT_ENDPOINT,
-  ConnectRes,
+  ConnectResponse,
   type ConnectionService,
 } from '@passlock/shared/dist/rpc/connection.js'
 
@@ -21,10 +21,12 @@ export const ConnectionClientLive = Layer.effect(
   E.gen(function* (_) {
     const dispatcher = yield* _(Dispatcher)
 
-    const preConnectResolver = makeGetRequest(ConnectRes, S.Never, dispatcher)
+    const preConnectResolver = makeGetRequest(ConnectResponse, S.Never, dispatcher)
 
     return {
       preConnect: () => preConnectResolver(CONNECT_ENDPOINT),
     }
   }),
 )
+
+export { ConnectResponse } from '@passlock/shared/dist/rpc/connection.js'

package/src/rpc/{authentication.ts → passkey/authentication.ts}

@@ -4,40 +4,49 @@ import {
   type AuthenticationService,
   OPTIONS_ENDPOINT,
   OptionsErrors,
-  OptionsReq,
-  OptionsRes,
-  VERIFY_ENDPOINT,
+  OptionsRequest,
+  OptionsResponse,
+  VERIFICATION_ENDPOINT,
   VerificationErrors,
-  VerificationReq,
-  VerificationRes,
-} from '@passlock/shared/dist/rpc/authentication.js'
+  VerificationRequest,
+  VerificationResponse,
+} from '@passlock/shared/dist/rpc/passkey/authentication.js'
 
-import { Dispatcher, makePostRequest } from './client.js'
+import { Dispatcher, makePostRequest } from '../client.js'
 
 /* Client */
 
-export class AuthenticationClient extends Context.Tag('@passkey/auth/client')<
+export class AuthenticationClient extends Context.Tag('@passkey/authentication/client')<
   AuthenticationClient,
   AuthenticationService
->() {}
+>() { }
 
 export const AuthenticationClientLive = Layer.effect(
   AuthenticationClient,
   E.gen(function* (_) {
     const dispatcher = yield* _(Dispatcher)
 
-    const optionsResolver = makePostRequest(OptionsReq, OptionsRes, OptionsErrors, dispatcher)
+    const optionsResolver = makePostRequest(OptionsRequest, OptionsResponse, OptionsErrors, dispatcher)
 
     const verifyResolver = makePostRequest(
-      VerificationReq,
-      VerificationRes,
+      VerificationRequest,
+      VerificationResponse,
       VerificationErrors,
       dispatcher,
     )
 
     return {
       getAuthenticationOptions: req => optionsResolver(OPTIONS_ENDPOINT, req),
-      verifyAuthenticationCredential: req => verifyResolver(VERIFY_ENDPOINT, req),
+      verifyAuthenticationCredential: req => verifyResolver(VERIFICATION_ENDPOINT, req),
     }
   }),
 )
+
+export {
+  OptionsErrors,
+  OptionsRequest,
+  OptionsResponse,
+  VerificationErrors,
+  VerificationRequest,
+  VerificationResponse,
+} from '@passlock/shared/dist/rpc/passkey/authentication.js'

package/src/rpc/passkey/registration.ts

@@ -0,0 +1,52 @@
+import { Context, Effect as E, Layer } from 'effect'
+
+import {
+  OptionsErrors,
+  OptionsRequest,
+  OptionsResponse,
+  type RegistrationService,
+  VerificationErrors,
+  VerificationRequest,
+  VerificationResponse,
+  OPTIONS_ENDPOINT,
+  VERIFICATION_ENDPOINT
+} from '@passlock/shared/dist/rpc/passkey/registration.js'
+
+import { Dispatcher, makePostRequest } from '../client.js'
+
+/* Client */
+
+export class RegistrationClient extends Context.Tag('@passkey/register/client')<
+  RegistrationClient,
+  RegistrationService
+>() {}
+
+export const RegistrationClientLive = Layer.effect(
+  RegistrationClient,
+  E.gen(function* (_) {
+    const dispatcher = yield* _(Dispatcher)
+
+    const optionsResolver = makePostRequest(OptionsRequest, OptionsResponse, OptionsErrors, dispatcher)
+
+    const verifyResolver = makePostRequest(
+      VerificationRequest,
+      VerificationResponse,
+      VerificationErrors,
+      dispatcher,
+    )
+
+    return {
+      getRegistrationOptions: req => optionsResolver(OPTIONS_ENDPOINT, req),
+      verifyRegistrationCredential: req => verifyResolver(VERIFICATION_ENDPOINT, req),
+    }
+  }),
+)
+
+export {
+  OptionsErrors,
+  OptionsRequest,
+  OptionsResponse,
+  VerificationErrors,
+  VerificationRequest,
+  VerificationResponse,
+} from '@passlock/shared/dist/rpc/passkey/registration.js'

package/src/rpc/social.ts

@@ -1,12 +1,14 @@
 import { Context, Effect as E, Layer } from 'effect'
 
 import {
-  AuthOidcErrors,
-  AuthOidcReq,
-  PrincipalRes,
-  RegisterOidcErrors,
-  RegisterOidcReq,
-  type SocialService,
+  OIDCRegistrationRequest,
+  OIDCRegistrationErrors,
+  OIDCAuthenticationRequest,
+  OIDCAuthenticationErrors,
+  OIDC_REGISTRATION_ENDPOINT,
+  OIDC_AUTHENTICATION_ENDPOINT,
+  PrincipalResponse,
+  type SocialService
 } from '@passlock/shared/dist/rpc/social.js'
 
 import { Dispatcher, makePostRequest } from './client.js'
@@ -24,22 +26,30 @@ export const SocialClientLive = Layer.effect(
     const dispatcher = yield* _(Dispatcher)
 
     const registerResolver = makePostRequest(
-      RegisterOidcReq,
-      PrincipalRes,
-      RegisterOidcErrors,
+      OIDCRegistrationRequest,
+      PrincipalResponse,
+      OIDCRegistrationErrors,
       dispatcher,
     )
 
     const authenticateResolver = makePostRequest(
-      AuthOidcReq,
-      PrincipalRes,
-      AuthOidcErrors,
+      OIDCAuthenticationRequest,
+      PrincipalResponse,
+      OIDCAuthenticationErrors,
       dispatcher,
     )
 
     return {
-      registerOidc: req => registerResolver(OIDC_REGISTER_ENDPOINT, req),
-      authenticateOidc: req => authenticateResolver(OIDC_AUTH_ENDPOINT, req),
+      oidcRegistration: req => registerResolver(OIDC_REGISTRATION_ENDPOINT, req),
+      oidcAuthentication: req => authenticateResolver(OIDC_AUTHENTICATION_ENDPOINT, req),
     }
   }),
 )
+
+export {
+  OIDCRegistrationRequest,
+  OIDCRegistrationErrors,
+  OIDCAuthenticationRequest,
+  OIDCAuthenticationErrors,
+  PrincipalResponse,
+} from '@passlock/shared/dist/rpc/social.js'