@passlock/client 0.9.30 → 0.9.32

package/src/rpc/user.ts

@@ -2,18 +2,18 @@ import * as S from '@effect/schema/Schema'
 import { Context, Effect as E, Layer } from 'effect'
 
 import {
-  IsExistingUserReq,
-  IsExistingUserRes,
+  IsExistingUserRequest,
+  IsExistingUserResponse,
   RESEND_EMAIL_ENDPOINT,
   ResendEmailErrors,
-  ResendEmailReq,
-  ResendEmailRes,
+  ResendEmailRequest,
+  ResendEmailResponse,
   USER_STATUS_ENDPOINT,
   type UserService,
   VERIFY_EMAIL_ENDPOINT,
   VerifyEmailErrors,
-  VerifyEmailReq,
-  VerifyEmailRes,
+  VerifyEmailRequest,
+  VerifyEmailResponse,
 } from '@passlock/shared/dist/rpc/user.js'
 
 import { Dispatcher, makePostRequest } from './client.js'
@@ -28,22 +28,22 @@ export const UserClientLive = Layer.effect(
     const dispatcher = yield* _(Dispatcher)
 
     const isExistingUserResolver = makePostRequest(
-      IsExistingUserReq,
-      IsExistingUserRes,
+      IsExistingUserRequest,
+      IsExistingUserResponse,
       S.Never,
       dispatcher,
     )
 
     const verifyEmailResolver = makePostRequest(
-      VerifyEmailReq,
-      VerifyEmailRes,
+      VerifyEmailRequest,
+      VerifyEmailResponse,
       VerifyEmailErrors,
       dispatcher,
     )
 
     const resendEmailResolver = makePostRequest(
-      ResendEmailReq,
-      ResendEmailRes,
+      ResendEmailRequest,
+      ResendEmailResponse,
       ResendEmailErrors,
       dispatcher,
     )
@@ -55,3 +55,14 @@ export const UserClientLive = Layer.effect(
     }
   }),
 )
+
+export {
+  IsExistingUserRequest,
+  IsExistingUserResponse,
+  ResendEmailErrors,
+  ResendEmailRequest,
+  ResendEmailResponse,
+  VerifyEmailErrors,
+  VerifyEmailRequest,
+  VerifyEmailResponse,
+} from '@passlock/shared/dist/rpc/user.js'

package/src/social/social.fixture.ts

@@ -1,10 +1,9 @@
 import { Effect as E, Layer as L, Option as O } from 'effect'
 
-import * as Shared from '@passlock/shared/dist/rpc/social.js'
-
 import * as Fixtures from '../test/fixtures.js'
 import { SocialClient } from '../rpc/social.js'
 import type { AuthenticateOidcReq } from './social.js'
+import { OIDCAuthenticationRequest, OIDCRegistrationRequest, PrincipalResponse } from '@passlock/shared/dist/rpc/social.js'
 
 export const session = 'session'
 export const token = 'token'
@@ -12,7 +11,7 @@ export const code = 'code'
 export const authType = 'passkey'
 export const expireAt = Date.now() + 10000
 
-export const registerOidcReq = new Shared.RegisterOidcReq({
+export const registerOidcReq = new OIDCRegistrationRequest({
   provider: 'google',
   idToken: 'google-token',
   nonce: 'nonce',
@@ -20,21 +19,21 @@ export const registerOidcReq = new Shared.RegisterOidcReq({
   familyName: O.some('doe'),
 })
 
-export const authOidcReq: AuthenticateOidcReq = new Shared.AuthOidcReq({
+export const authOidcReq: AuthenticateOidcReq = new OIDCAuthenticationRequest({
   provider: 'google',
   idToken: 'google-token',
   nonce: 'nonce',
 })
 
-export const rpcRegisterRes = new Shared.PrincipalRes({ principal: Fixtures.principal })
+export const rpcRegisterRes = new PrincipalResponse({ principal: Fixtures.principal })
 
-export const rpcAuthenticateRes = new Shared.PrincipalRes({ principal: Fixtures.principal })
+export const rpcAuthenticateRes = new PrincipalResponse({ principal: Fixtures.principal })
 
 export const rpcClientTest = L.succeed(
   SocialClient,
   SocialClient.of({
-    registerOidc: () => E.fail(Fixtures.notImplemented),
-    authenticateOidc: () => E.fail(Fixtures.notImplemented),
+    oidcRegistration: () => E.fail(Fixtures.notImplemented),
+    oidcAuthentication: () => E.fail(Fixtures.notImplemented),
   }),
 )
 

package/src/social/social.test.ts

@@ -21,7 +21,7 @@ describe('registerOidc should', () => {
       E.sync(() => {
         const rpcMock = mock<SocialClient['Type']>()
 
-        rpcMock.registerOidc.mockReturnValue(E.succeed(Fixture.rpcRegisterRes))
+        rpcMock.oidcRegistration.mockReturnValue(E.succeed(Fixture.rpcRegisterRes))
 
         return rpcMock
       }),
@@ -41,7 +41,7 @@ describe('registerOidc should', () => {
       yield* _(service.registerOidc(Fixture.registerOidcReq))
 
       const rpcClient = yield* _(SocialClient)
-      expect(rpcClient.registerOidc).toHaveBeenCalledWith(Fixture.registerOidcReq)
+      expect(rpcClient.oidcRegistration).toHaveBeenCalledWith(Fixture.registerOidcReq)
     })
 
     const rpcClientTest = L.effect(
@@ -49,7 +49,7 @@ describe('registerOidc should', () => {
       E.sync(() => {
         const rpcMock = mock<SocialClient['Type']>()
 
-        rpcMock.registerOidc.mockReturnValue(E.succeed(Fixture.rpcRegisterRes))
+        rpcMock.oidcRegistration.mockReturnValue(E.succeed(Fixture.rpcRegisterRes))
 
         return rpcMock
       }),
@@ -77,7 +77,7 @@ describe('registerOidc should', () => {
       E.sync(() => {
         const rpcMock = mock<SocialClient['Type']>()
 
-        rpcMock.registerOidc.mockReturnValue(E.fail(new Duplicate({ message: 'Duplicate user' })))
+        rpcMock.oidcRegistration.mockReturnValue(E.fail(new Duplicate({ message: 'Duplicate user' })))
 
         return rpcMock
       }),
@@ -105,7 +105,7 @@ describe('authenticateIodc should', () => {
       E.sync(() => {
         const rpcMock = mock<SocialClient['Type']>()
 
-        rpcMock.authenticateOidc.mockReturnValue(E.succeed(Fixture.rpcRegisterRes))
+        rpcMock.oidcAuthentication.mockReturnValue(E.succeed(Fixture.rpcRegisterRes))
 
         return rpcMock
       }),
@@ -125,7 +125,7 @@ describe('authenticateIodc should', () => {
       yield* _(service.authenticateOidc(Fixture.authOidcReq))
 
       const rpcClient = yield* _(SocialClient)
-      expect(rpcClient.authenticateOidc).toHaveBeenCalledWith(Fixture.authOidcReq)
+      expect(rpcClient.oidcAuthentication).toHaveBeenCalledWith(Fixture.authOidcReq)
     })
 
     const rpcClientTest = L.effect(
@@ -133,7 +133,7 @@ describe('authenticateIodc should', () => {
       E.sync(() => {
         const rpcMock = mock<SocialClient['Type']>()
 
-        rpcMock.authenticateOidc.mockReturnValue(E.succeed(Fixture.rpcAuthenticateRes))
+        rpcMock.oidcAuthentication.mockReturnValue(E.succeed(Fixture.rpcAuthenticateRes))
 
         return rpcMock
       }),
@@ -161,7 +161,7 @@ describe('authenticateIodc should', () => {
       E.sync(() => {
         const rpcMock = mock<SocialClient['Type']>()
 
-        rpcMock.authenticateOidc.mockReturnValue(
+        rpcMock.oidcAuthentication.mockReturnValue(
           E.fail(new NotFound({ message: 'User not found' })),
         )
 

package/src/social/social.ts

@@ -2,26 +2,23 @@
  * Passkey authentication effects
  */
 import { Context, Effect as E, Layer, flow } from 'effect'
-
-import * as RPC from '@passlock/shared/dist/rpc/social.js'
+import * as RPC from '../rpc/social.js'
 import { type BadRequest, type NotSupported } from '@passlock/shared/dist/error/error.js'
 import type { Principal } from '@passlock/shared/dist/schema/principal.js'
 
-import { SocialClient } from '../rpc/social.js'
-
 /* Requests */
 
 export type Provider = 'apple' | 'google'
 
-export type RegisterOidcReq = RPC.RegisterOidcReq
+export type RegisterOidcReq = RPC.OIDCRegistrationRequest
 
-export type AuthenticateOidcReq = RPC.AuthOidcReq
+export type AuthenticateOidcReq = RPC.OIDCAuthenticationRequest
 
 /* Errors */
 
-export type RegistrationErrors = NotSupported | BadRequest | RPC.RegisterOidcErrors
+export type RegistrationErrors = NotSupported | BadRequest | RPC.OIDCRegistrationErrors
 
-export type AuthenticationErrors = NotSupported | BadRequest | RPC.AuthOidcErrors
+export type AuthenticationErrors = NotSupported | BadRequest | RPC.OIDCAuthenticationErrors
 
 /* Service */
 
@@ -35,7 +32,7 @@ export class SocialService extends Context.Tag('@services/SocialService')<
 
 /* Effects */
 
-type Dependencies = SocialClient
+type Dependencies = RPC.SocialClient
 
 export const registerOidc = (
   request: RegisterOidcReq,
@@ -43,9 +40,9 @@ export const registerOidc = (
   return E.gen(function* (_) {
     yield* _(E.logInfo('Registering social account'))
 
-    const rpcClient = yield* _(SocialClient)
-    const rpcRequest = new RPC.RegisterOidcReq(request)
-    const { principal } = yield* _(rpcClient.registerOidc(rpcRequest))
+    const rpcClient = yield* _(RPC.SocialClient)
+    const rpcRequest = new RPC.OIDCRegistrationRequest(request)
+    const { principal } = yield* _(rpcClient.oidcRegistration(rpcRequest))
 
     return principal
   })
@@ -57,9 +54,9 @@ export const authenticateOidc = (
   return E.gen(function* (_) {
     yield* _(E.logInfo('Authenticating with social account'))
 
-    const rpcClient = yield* _(SocialClient)
-    const rpcRequest = new RPC.AuthOidcReq(request)
-    const { principal } = yield* _(rpcClient.authenticateOidc(rpcRequest))
+    const rpcClient = yield* _(RPC.SocialClient)
+    const rpcRequest = new RPC.OIDCAuthenticationRequest(request)
+    const { principal } = yield* _(rpcClient.oidcAuthentication(rpcRequest))
 
     return principal
   })
@@ -71,7 +68,7 @@ export const authenticateOidc = (
 export const SocialServiceLive = Layer.effect(
   SocialService,
   E.gen(function* (_) {
-    const context = yield* _(E.context<SocialClient>())
+    const context = yield* _(E.context<RPC.SocialClient>())
 
     return SocialService.of({
       registerOidc: flow(registerOidc, E.provide(context)),

package/src/user/user.fixture.ts

@@ -1,11 +1,11 @@
 import { Effect as E, Layer as L, Option as O } from 'effect'
 
 import {
-  IsExistingUserReq,
-  IsExistingUserRes,
-  ResendEmailReq,
-  ResendEmailRes,
-  VerifyEmailRes,
+  IsExistingUserRequest,
+  IsExistingUserResponse,
+  ResendEmailRequest,
+  ResendEmailResponse,
+  VerifyEmailResponse,
 } from '@passlock/shared/dist/rpc/user.js'
 
 import * as Fixtures from '../test/fixtures.js'
@@ -13,15 +13,15 @@ import { UserClient } from '../rpc/user.js'
 import type { ResendEmail } from './user.js'
 
 export const email = 'jdoe@gmail.com'
-export const isRegisteredReq = new IsExistingUserReq({ email })
-export const isRegisteredRes = new IsExistingUserRes({ existingUser: false, detail: O.none() })
-export const verifyEmailRes = new VerifyEmailRes({ principal: Fixtures.principal })
+export const isRegisteredReq = new IsExistingUserRequest({ email })
+export const isRegisteredRes = new IsExistingUserResponse({ existingUser: false, detail: O.none() })
+export const verifyEmailRes = new VerifyEmailResponse({ principal: Fixtures.principal })
 export const resendEmailReq: ResendEmail = { userId: '123', method: 'code' }
-export const rpcResendEmailReq = new ResendEmailReq({
+export const rpcResendEmailReq = new ResendEmailRequest({
   userId: '123',
   verifyEmail: { method: 'code' },
 })
-export const rpcResendEmailRes = new ResendEmailRes({})
+export const rpcResendEmailRes = new ResendEmailResponse({})
 
 export const rpcClientTest = L.succeed(
   UserClient,

package/src/user/user.ts

@@ -4,10 +4,8 @@
 import { Context, Effect as E, Layer, flow } from 'effect'
 
 import type { BadRequest, Disabled, NotFound } from '@passlock/shared/dist/error/error.js'
-import { IsExistingUserReq, ResendEmailReq } from '@passlock/shared/dist/rpc/user.js'
 import type { VerifyEmail } from '@passlock/shared/dist/schema/email.js'
-
-import { UserClient } from '../rpc/user.js'
+import * as RPC from '../rpc/user.js'
 
 /* Requests */
 
@@ -30,15 +28,15 @@ export class UserService extends Context.Tag('@services/UserService')<
 
 /* Effects */
 
-type Dependencies = UserClient
+type Dependencies = RPC.UserClient
 
 export const isExistingUser = (request: Email): E.Effect<boolean, BadRequest, Dependencies> => {
   return E.gen(function* (_) {
     yield* _(E.logInfo('Checking registration status'))
-    const rpcClient = yield* _(UserClient)
+    const rpcClient = yield* _(RPC.UserClient)
 
     yield* _(E.logDebug('Making RPC request'))
-    const { existingUser } = yield* _(rpcClient.isExistingUser(new IsExistingUserReq(request)))
+    const { existingUser } = yield* _(rpcClient.isExistingUser(new RPC.IsExistingUserRequest(request)))
 
     return existingUser
   })
@@ -49,11 +47,11 @@ export const resendVerificationEmail = (
 ): E.Effect<void, ResendEmailErrors, Dependencies> => {
   return E.gen(function* (_) {
     yield* _(E.logInfo('Resending verification email'))
-    const rpcClient = yield* _(UserClient)
+    const rpcClient = yield* _(RPC.UserClient)
 
     yield* _(E.logDebug('Making RPC request'))
     const { userId, ...verifyEmail } = request
-    yield* _(rpcClient.resendVerificationEmail(new ResendEmailReq({ userId, verifyEmail })))
+    yield* _(rpcClient.resendVerificationEmail(new RPC.ResendEmailRequest({ userId, verifyEmail })))
   })
 }
 
@@ -63,7 +61,7 @@ export const resendVerificationEmail = (
 export const UserServiceLive = Layer.effect(
   UserService,
   E.gen(function* (_) {
-    const context = yield* _(E.context<UserClient>())
+    const context = yield* _(E.context<RPC.UserClient>())
     return UserService.of({
       isExistingUser: flow(isExistingUser, E.provide(context)),
       resendVerificationEmail: flow(resendVerificationEmail, E.provide(context)),

package/dist/rpc/authentication.js

@@ -1,16 +0,0 @@
-import { Context, Effect as E, Layer } from 'effect';
-import { OPTIONS_ENDPOINT, OptionsErrors, OptionsReq, OptionsRes, VERIFY_ENDPOINT, VerificationErrors, VerificationReq, VerificationRes, } from '@passlock/shared/dist/rpc/authentication.js';
-import { Dispatcher, makePostRequest } from './client.js';
-/* Client */
-export class AuthenticationClient extends Context.Tag('@passkey/auth/client')() {
-}
-export const AuthenticationClientLive = Layer.effect(AuthenticationClient, E.gen(function* (_) {
-    const dispatcher = yield* _(Dispatcher);
-    const optionsResolver = makePostRequest(OptionsReq, OptionsRes, OptionsErrors, dispatcher);
-    const verifyResolver = makePostRequest(VerificationReq, VerificationRes, VerificationErrors, dispatcher);
-    return {
-        getAuthenticationOptions: req => optionsResolver(OPTIONS_ENDPOINT, req),
-        verifyAuthenticationCredential: req => verifyResolver(VERIFY_ENDPOINT, req),
-    };
-}));
-//# sourceMappingURL=authentication.js.map

package/dist/rpc/authentication.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../../src/rpc/authentication.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAEpD,OAAO,EAEL,gBAAgB,EAChB,aAAa,EACb,UAAU,EACV,UAAU,EACV,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,eAAe,GAChB,MAAM,6CAA6C,CAAA;AAEpD,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAEzD,YAAY;AAEZ,MAAM,OAAO,oBAAqB,SAAQ,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAG1E;CAAG;AAEN,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,CAAC,MAAM,CAClD,oBAAoB,EACpB,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;IAChB,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IAEvC,MAAM,eAAe,GAAG,eAAe,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,CAAC,CAAA;IAE1F,MAAM,cAAc,GAAG,eAAe,CACpC,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,UAAU,CACX,CAAA;IAED,OAAO;QACL,wBAAwB,EAAE,GAAG,CAAC,EAAE,CAAC,eAAe,CAAC,gBAAgB,EAAE,GAAG,CAAC;QACvE,8BAA8B,EAAE,GAAG,CAAC,EAAE,CAAC,cAAc,CAAC,eAAe,EAAE,GAAG,CAAC;KAC5E,CAAA;AACH,CAAC,CAAC,CACH,CAAA"}

package/dist/rpc/registration.js

@@ -1,16 +0,0 @@
-import { Context, Effect as E, Layer } from 'effect';
-import { OptionsErrors, OptionsReq, OptionsRes, VerificationErrors, VerificationReq, VerificationRes, } from '@passlock/shared/dist/rpc/registration.js';
-import { Dispatcher, makePostRequest } from './client.js';
-/* Client */
-export class RegistrationClient extends Context.Tag('@passkey/register/client')() {
-}
-export const RegistrationClientLive = Layer.effect(RegistrationClient, E.gen(function* (_) {
-    const dispatcher = yield* _(Dispatcher);
-    const optionsResolver = makePostRequest(OptionsReq, OptionsRes, OptionsErrors, dispatcher);
-    const verifyResolver = makePostRequest(VerificationReq, VerificationRes, VerificationErrors, dispatcher);
-    return {
-        getRegistrationOptions: req => optionsResolver('/passkey/register/options', req),
-        verifyRegistrationCredential: req => verifyResolver('/passkey/register/verify', req),
-    };
-}));
-//# sourceMappingURL=registration.js.map

package/dist/rpc/registration.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"registration.js","sourceRoot":"","sources":["../../src/rpc/registration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAEpD,OAAO,EACL,aAAa,EACb,UAAU,EACV,UAAU,EAEV,kBAAkB,EAClB,eAAe,EACf,eAAe,GAChB,MAAM,2CAA2C,CAAA;AAElD,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAEzD,YAAY;AAEZ,MAAM,OAAO,kBAAmB,SAAQ,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,EAG5E;CAAG;AAEN,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAC,MAAM,CAChD,kBAAkB,EAClB,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;IAChB,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IAEvC,MAAM,eAAe,GAAG,eAAe,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,CAAC,CAAA;IAE1F,MAAM,cAAc,GAAG,eAAe,CACpC,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,UAAU,CACX,CAAA;IAED,OAAO;QACL,sBAAsB,EAAE,GAAG,CAAC,EAAE,CAAC,eAAe,CAAC,2BAA2B,EAAE,GAAG,CAAC;QAChF,4BAA4B,EAAE,GAAG,CAAC,EAAE,CAAC,cAAc,CAAC,0BAA0B,EAAE,GAAG,CAAC;KACrF,CAAA;AACH,CAAC,CAAC,CACH,CAAA"}

package/src/rpc/registration.ts

@@ -1,41 +0,0 @@
-import { Context, Effect as E, Layer } from 'effect'
-
-import {
-  OptionsErrors,
-  OptionsReq,
-  OptionsRes,
-  type RegistrationService,
-  VerificationErrors,
-  VerificationReq,
-  VerificationRes,
-} from '@passlock/shared/dist/rpc/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(OptionsReq, OptionsRes, OptionsErrors, dispatcher)
-
-    const verifyResolver = makePostRequest(
-      VerificationReq,
-      VerificationRes,
-      VerificationErrors,
-      dispatcher,
-    )
-
-    return {
-      getRegistrationOptions: req => optionsResolver('/passkey/register/options', req),
-      verifyRegistrationCredential: req => verifyResolver('/passkey/register/verify', req),
-    }
-  }),
-)