@fabriktor/fx 0.0.5 → 0.0.7

package/dist/src/fx.d.ts

@@ -7,6 +7,10 @@ export type FXOptions = {
     auth: AuthOperator;
     users: UsersOperator;
 };
+export type DefaultFXOptions = {
+    base_url: string;
+    auth: AuthOperator;
+};
 export interface FXOperator {
     users: UsersFXOperator;
     session: SessionFXOperator;
@@ -17,3 +21,4 @@ export declare class FX implements FXOperator {
     constructor(opts: FXOptions);
 }
 export declare function newFX(opts: FXOptions): FX;
+export declare function newDefaultFX(opts: DefaultFXOptions): FX;

package/dist/src/fx.js

@@ -3,6 +3,7 @@
 // Licensed under the Apache License, Version 2.0 (the "License"); you may
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+import { newHTTPClient, newUsersClient } from "@fabriktor/client";
 import { newSessionFX } from "./session/session";
 import { newUsersFX } from "./users/users";
 export class FX {
@@ -23,3 +24,12 @@ export class FX {
 export function newFX(opts) {
     return new FX(opts);
 }
+export function newDefaultFX(opts) {
+    return newFX({
+        base_url: opts.base_url,
+        auth: opts.auth,
+        users: newUsersClient({
+            http: newHTTPClient(),
+        }),
+    });
+}

package/dist/src/session/session.d.ts

@@ -2,6 +2,12 @@ import type { InUser, UpsertResult } from "@fabriktor/schema";
 import type { Op } from "@fabriktor/client";
 import type { AuthEmailOptions, AuthOperator } from "../auth/auth";
 import type { UsersFXOperator } from "../users/users";
+export type SignInMode = "email" | "username";
+export type SignInOptions = {
+    mode: SignInMode;
+    identifier: string;
+    password: string;
+};
 export type SignUpAndBootstrapOptions = AuthEmailOptions & {
     in: InUser;
 };
@@ -11,7 +17,7 @@ export type SessionFXOptions = {
 };
 export interface SessionFXOperator {
     signUpAndBootstrap(opts: SignUpAndBootstrapOptions): Promise<Op<UpsertResult>>;
-    signIn(opts: AuthEmailOptions): Promise<void>;
+    signIn(opts: SignInOptions): Promise<void>;
     signOut(): Promise<void>;
 }
 export declare class SessionFX implements SessionFXOperator {
@@ -19,7 +25,7 @@ export declare class SessionFX implements SessionFXOperator {
     private users;
     constructor(opts: SessionFXOptions);
     signUpAndBootstrap(opts: SignUpAndBootstrapOptions): Promise<Op<UpsertResult>>;
-    signIn(opts: AuthEmailOptions): Promise<void>;
+    signIn(opts: SignInOptions): Promise<void>;
     signOut(): Promise<void>;
 }
 export declare function newSessionFX(opts: SessionFXOptions): SessionFX;

package/dist/src/session/session.js

@@ -20,7 +20,15 @@ export class SessionFX {
         });
     }
     async signIn(opts) {
-        await this.auth.signIn(opts);
+        const email = opts.mode === "email"
+            ? opts.identifier
+            : await this.users.resolveUsername({
+                username: opts.identifier,
+            });
+        await this.auth.signIn({
+            email,
+            password: opts.password,
+        });
         await this.users.sync();
     }
     async signOut() {

package/dist/src/users/users.d.ts

@@ -9,10 +9,14 @@ export type UsersFXOptions = {
 export type BootstrapOptions = {
     in: InUser;
 };
+export type ResolveUsernameOptions = {
+    username: string;
+};
 export interface UsersFXOperator {
     bootstrap(opts: BootstrapOptions): Promise<Op<UpsertResult>>;
     sync(): Promise<OperationResult>;
     sendEmailVerification(): Promise<void>;
+    resolveUsername(opts: ResolveUsernameOptions): Promise<string>;
 }
 export declare class UsersFX implements UsersFXOperator {
     private base_url;
@@ -22,5 +26,6 @@ export declare class UsersFX implements UsersFXOperator {
     bootstrap(opts: BootstrapOptions): Promise<Op<UpsertResult>>;
     sync(): Promise<OperationResult>;
     sendEmailVerification(): Promise<void>;
+    resolveUsername(opts: ResolveUsernameOptions): Promise<string>;
 }
 export declare function newUsersFX(opts: UsersFXOptions): UsersFX;

package/dist/src/users/users.js

@@ -34,6 +34,16 @@ export class UsersFX {
             token,
         });
     }
+    async resolveUsername(opts) {
+        const out = await this.users.resolveUsername({
+            base_url: this.base_url,
+            username: opts.username,
+        });
+        if (out.value === undefined) {
+            throw new Error("Unable to resolve username.");
+        }
+        return out.value;
+    }
 }
 export function newUsersFX(opts) {
     return new UsersFX(opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/fx",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {
@@ -17,7 +17,7 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@fabriktor/client": "^0.0.6",
+    "@fabriktor/client": "^0.0.7",
     "@fabriktor/schema": "^0.0.10"
   }
 }