@passlock/client 0.9.6 → 0.9.8

package/src/test/fixtures.ts

@@ -2,6 +2,8 @@ import type { Principal } from '@passlock/shared/dist/schema/schema.js'
 import { Effect as E, Layer as L } from 'effect'
 import { Capabilities } from '../capabilities/capabilities.js'
 import { StorageService, type StoredToken } from '../storage/storage.js'
+import { BadRequest } from '@passlock/shared/dist/error/error.js'
+import { PreConnectRes } from '@passlock/shared/dist/rpc/connection.js'
 
 export const session = 'session'
 export const token = 'token'
@@ -11,15 +13,15 @@ export const expireAt = Date.now() + 10000
 
 export const principal: Principal = {
   token: 'token',
-  subject: {
+  user: {
     id: '1',
     email: 'john.doe@gmail.com',
-    firstName: 'john',
-    lastName: 'doe',
+    givenName: 'john',
+    familyName: 'doe',
     emailVerified: false,
   },
   authStatement: {
-    authType: 'email',
+    authType: 'passkey',
     userVerified: false,
     authTimestamp: new Date(0),
   },
@@ -29,9 +31,9 @@ export const principal: Principal = {
 export const capabilitiesTest = L.succeed(
   Capabilities,
   Capabilities.of({
-    passkeySupport: E.unit,
+    passkeySupport: E.void,
     isPasskeySupport: E.succeed(true),
-    autofillSupport: E.unit,
+    autofillSupport: E.void,
     isAutofillSupport: E.succeed(true),
   }),
 )
@@ -41,10 +43,13 @@ export const storedToken: StoredToken = { token, authType, expireAt }
 export const storageServiceTest = L.succeed(
   StorageService,
   StorageService.of({
-    storeToken: () => E.unit,
+    storeToken: () => E.void,
     getToken: () => E.succeed(storedToken),
-    clearToken: () => E.unit,
-    clearExpiredToken: () => E.unit,
-    clearExpiredTokens: E.unit,
+    clearToken: () => E.void,
+    clearExpiredToken: () => E.void,
+    clearExpiredTokens: E.void,
   }),
 )
+
+export const preConnectRes = new PreConnectRes({ warmed: true })
+export const notImplemented = new BadRequest({ message: 'Not implemented' })

package/src/user/user.fixture.ts

@@ -1,22 +1,25 @@
-import { BadRequest } from '@passlock/shared/dist/error/error.js'
 import { RpcClient } from '@passlock/shared/dist/rpc/rpc.js'
-import { IsExistingUserReq, IsExistingUserRes } from '@passlock/shared/dist/rpc/user.js'
+import { IsExistingUserReq, IsExistingUserRes, VerifyEmailRes } from '@passlock/shared/dist/rpc/user.js'
 import { Effect as E, Layer as L } from 'effect'
+import * as Fixtures from '../test/fixtures.js'
 
 export const email = 'jdoe@gmail.com'
+export const isRegisteredReq = new IsExistingUserReq({ email })
+export const isRegisteredRes = new IsExistingUserRes({ existingUser: false })
+export const verifyEmailRes = new VerifyEmailRes({ principal: Fixtures.principal })
 
 export const rpcClientTest = L.succeed(
   RpcClient,
   RpcClient.of({
     preConnect: () => E.succeed({ warmed: true }),
     isExistingUser: () => E.succeed({ existingUser: true }),
-    verifyEmail: () => E.succeed({ verified: true }),
-    getRegistrationOptions: () => E.fail(new BadRequest({ message: 'Not implemeneted' })),
-    verifyRegistrationCredential: () => E.fail(new BadRequest({ message: 'Not implemeneted' })),
-    getAuthenticationOptions: () => E.fail(new BadRequest({ message: 'Not implemeneted' })),
-    verifyAuthenticationCredential: () => E.fail(new BadRequest({ message: 'Not implemeneted' })),
+    verifyEmail: () => E.succeed(verifyEmailRes),
+    getRegistrationOptions: () => E.fail(Fixtures.notImplemented),
+    verifyRegistrationCredential: () => E.fail(Fixtures.notImplemented),
+    getAuthenticationOptions: () => E.fail(Fixtures.notImplemented),
+    verifyAuthenticationCredential: () => E.fail(Fixtures.notImplemented),
+    registerOidc: () => E.fail(Fixtures.notImplemented),
+    authenticateOidc: () => E.fail(Fixtures.notImplemented),
+    resendVerificationEmail: () => E.fail(Fixtures.notImplemented),
   }),
-)
-
-export const isRegisteredReq = new IsExistingUserReq({ email })
-export const isRegisteredRes = new IsExistingUserRes({ existingUser: false })
+)

package/src/user/user.ts

@@ -1,19 +1,26 @@
 /**
  * Check for an existing user
  */
-import type { BadRequest } from '@passlock/shared/dist/error/error.js'
+import type { BadRequest, Disabled, NotFound } from '@passlock/shared/dist/error/error.js'
 import { RpcClient } from '@passlock/shared/dist/rpc/rpc.js'
-import { IsExistingUserReq } from '@passlock/shared/dist/rpc/user.js'
+import { IsExistingUserReq, ResendEmailReq } from '@passlock/shared/dist/rpc/user.js'
+import type { VerifyEmail } from '@passlock/shared/dist/schema/schema.js'
 import { Context, Effect as E, Layer, flow } from 'effect'
 
 /* Requests */
 
 export type Email = { email: string }
+export type ResendEmail = VerifyEmail & { userId: string }
+
+/* Errors */
+
+export type ResendEmailErrors = BadRequest | NotFound | Disabled
 
 /* Service */
 
 export type UserService = {
-  isExistingUser: (email: Email) => E.Effect<boolean, BadRequest>
+  isExistingUser: (request: Email) => E.Effect<boolean, BadRequest>
+  resendVerificationEmail: (request: ResendEmail) => E.Effect<void, ResendEmailErrors>
 }
 
 export const UserService = Context.GenericTag<UserService>('@services/UserService')
@@ -34,6 +41,17 @@ export const isExistingUser = (request: Email): E.Effect<boolean, BadRequest, De
   })
 }
 
+export const resendVerificationEmail = (request: ResendEmail): E.Effect<void, ResendEmailErrors, Dependencies> => {
+  return E.gen(function* (_) {
+    yield* _(E.logInfo('Resending verification email'))
+    const rpcClient = yield* _(RpcClient)
+
+    yield* _(E.logDebug('Making RPC request'))
+    const { userId, ...verifyEmail } = request
+    yield* _(rpcClient.resendVerificationEmail(new ResendEmailReq({ userId, verifyEmail })))
+  })
+}
+
 /* Live */
 
 /* v8 ignore start */
@@ -43,6 +61,7 @@ export const UserServiceLive = Layer.effect(
     const context = yield* _(E.context<RpcClient>())
     return UserService.of({
       isExistingUser: flow(isExistingUser, E.provide(context)),
+      resendVerificationEmail: flow(resendVerificationEmail, E.provide(context))
     })
   }),
 )

package/dist/exit.d.ts

@@ -1,64 +0,0 @@
-import { Effect } from 'effect';
-import { Cause, Exit as EX, Runtime } from 'effect';
-declare const AbortError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => Cause.YieldableError & {
-    readonly _tag: "AbortError";
-} & Readonly<A>;
-export declare class AbortError extends AbortError_base<{
-    message: string;
-}> {
-}
-export declare class PasslockError extends Error {
-    readonly code: string;
-    readonly detail?: unknown;
-    constructor(args: {
-        code: string;
-        message?: string;
-        detail?: unknown;
-    });
-}
-export declare const isPasslockError: (data: unknown) => data is PasslockError;
-type PasslockRuntime<R> = Runtime.Runtime<R>;
-type Abort = {
-    abort?: AbortSignal;
-};
-type EffectFn<I, A, E, R> = (input: I) => Effect.Effect<A, E, R>;
-type UnionFn<I, A> = (input: I & Abort) => Promise<A | PasslockError>;
-type UnsafeFn<I, A> = (input: I & Abort) => Promise<A>;
-/**
- * Poor man's either - transform an Exit into a union of
- * PasslockError | T
- *
- * @param exit
- * @returns
- */
-export declare const transformExit: <A, E>(exit: EX.Exit<A, E>) => PasslockError | A;
-/**
- * Run an effect to generate promise with an error or value
- *
- * @param input Effect
- * @returns
- */
-export declare const runUnion: <A, E, R>(input: Effect.Effect<A, E, R>, runtime: PasslockRuntime<R>, controller?: AbortSignal) => Promise<PasslockError | A>;
-/**
- * Transform a function that returns an effect to one that returns a promise with an error or value
- *
- * @param fn Function that returns an Effect
- * @returns Function that returns a Promise wrapping a union
- */
-export declare const makeUnionFn: <I, A, E, R>(fn: EffectFn<I, A, E, R>, runtime: PasslockRuntime<R>) => UnionFn<I, A>;
-/**
- * Transform an effect into one that potentially throws a PasslockError
- *
- * @param effect Effect
- * @returns Promise that could throw
- */
-export declare const runUnsafe: <A, E, R>(effect: Effect.Effect<A, E, R>, runtime: PasslockRuntime<R>) => Promise<A>;
-/**
- * Transform a function that returns an effect to one that returns a promise that could reject
- *
- * @param fn Function that returns an Effect
- * @returns Function that returns a Promise that could reject
- */
-export declare const makeUnsafeFn: <I, A, E, R>(fn: EffectFn<I, A, E, R>, runtime: PasslockRuntime<R>) => UnsafeFn<I, A>;
-export {};
-//# sourceMappingURL=exit.d.ts.map

package/dist/exit.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"exit.d.ts","sourceRoot":"","sources":["../src/exit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,IAAI,IAAI,EAAE,EAAE,OAAO,EAAQ,MAAM,QAAQ,CAAA;;;;AAEzD,qBAAa,UAAW,SAAQ,gBAA+B;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;CAAG;AAEtF,qBAAa,aAAc,SAAQ,KAAK;IACtC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;gBAEb,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE;CAKvE;AAED,eAAO,MAAM,eAAe,SAAU,OAAO,0BAI5C,CAAA;AAED,KAAK,eAAe,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;AAE5C,KAAK,KAAK,GAAG;IAAE,KAAK,CAAC,EAAE,WAAW,CAAA;CAAE,CAAA;AAGpC,KAAK,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;AAGhE,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,KAAK,KAAK,OAAO,CAAC,CAAC,GAAG,aAAa,CAAC,CAAA;AAGrE,KAAK,QAAQ,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;AActD;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,kDAczB,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,qFAGN,WAAW,+BAWzB,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,WAAW,sFAKvB,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,SAAS,sFAQrB,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,YAAY,uFAKxB,CAAA"}

package/dist/exit.js

@@ -1,106 +0,0 @@
-import { Data, Effect } from 'effect';
-import { Cause, Exit as EX, Runtime, flow } from 'effect';
-export class AbortError extends Data.TaggedError('AbortError') {
-}
-export class PasslockError extends Error {
-    code;
-    detail;
-    constructor(args) {
-        super(args.message);
-        this.code = args.code;
-        this.detail = args.detail;
-    }
-}
-export const isPasslockError = (data) => {
-    if (typeof data !== "object")
-        return false;
-    if (data === null)
-        return false;
-    return data instanceof PasslockError;
-};
-const hasTag = (data) => {
-    if (typeof data !== "object")
-        return false;
-    if (data === null)
-        return false;
-    return '_tag' in data && typeof data._tag === "string";
-};
-const hasMessage = (data) => {
-    if (typeof data !== "object")
-        return false;
-    if (data === null)
-        return false;
-    return 'message' in data && typeof data.message === "string";
-};
-/**
- * Poor man's either - transform an Exit into a union of
- * PasslockError | T
- *
- * @param exit
- * @returns
- */
-export const transformExit = (exit) => {
-    return EX.getOrElse(exit, cause => {
-        if (Cause.isFailType(cause) && hasTag(cause.error) && hasMessage(cause.error)) {
-            return new PasslockError({ code: cause.error._tag, message: cause.error.message });
-        }
-        else if (Cause.isFailType(cause) && hasTag(cause.error)) {
-            return new PasslockError({ code: cause.error._tag });
-        }
-        else if (Cause.isDieType(cause)) {
-            return new PasslockError({ code: 'UnexpectedError', detail: cause.defect });
-        }
-        else if (Cause.isInterruptType(cause)) {
-            return new PasslockError({ code: 'AbortedError', message: 'Operation aborted' });
-        }
-        else {
-            return new PasslockError({ code: 'UnexpectedError', detail: cause });
-        }
-    });
-};
-/**
- * Run an effect to generate promise with an error or value
- *
- * @param input Effect
- * @returns
- */
-export const runUnion = (input, runtime, controller) => {
-    const abort = Effect.async((resume) => {
-        if (controller) {
-            controller.onabort = () => resume(Effect.interrupt);
-        }
-        else
-            resume(Effect.never);
-    });
-    const withInterrupt = Effect.race(input, abort);
-    return Runtime.runPromiseExit(runtime)(withInterrupt).then(transformExit);
-};
-/**
- * Transform a function that returns an effect to one that returns a promise with an error or value
- *
- * @param fn Function that returns an Effect
- * @returns Function that returns a Promise wrapping a union
- */
-export const makeUnionFn = (fn, runtime) => {
-    return (input) => runUnion(fn(input), runtime, input.abort);
-};
-/**
- * Transform an effect into one that potentially throws a PasslockError
- *
- * @param effect Effect
- * @returns Promise that could throw
- */
-export const runUnsafe = (effect, runtime) => {
-    const controller = new AbortController();
-    return runUnion(effect, runtime, controller.signal).then(t => isPasslockError(t) ? Promise.reject(t) : Promise.resolve(t));
-};
-/**
- * Transform a function that returns an effect to one that returns a promise that could reject
- *
- * @param fn Function that returns an Effect
- * @returns Function that returns a Promise that could reject
- */
-export const makeUnsafeFn = (fn, runtime) => {
-    return flow(fn, e => runUnsafe(e, runtime));
-};
-//# sourceMappingURL=exit.js.map

package/dist/exit.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"exit.js","sourceRoot":"","sources":["../src/exit.ts"],"names":[],"mappings":"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"}