t3code-cli 0.2.0 → 0.4.0

package/src/auth/layer.ts

@@ -1,83 +1,18 @@
 import * as Effect from "effect/Effect";
-import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
-import * as Path from "effect/Path";
-import * as Scope from "effect/Scope";
-import { ChildProcessSpawner } from "effect/unstable/process/ChildProcessSpawner";
 
 import { T3Config } from "../config/service.ts";
-import { Environment } from "../environment/service.ts";
 import { AuthConfigError } from "./error.ts";
-import { issueLocalSession, resolveLocalOrigin } from "./local.ts";
-import { parsePairingUrl } from "./pairing.ts";
+import { T3LocalAuth } from "./local.ts";
+import { T3AuthPairing } from "./pairing.ts";
 import { T3Auth } from "./service.ts";
-import { makeAuthTransport } from "./transport.ts";
-import type { LocalAuthInput } from "./type.ts";
+import { T3AuthTransport } from "./transport.ts";
 
 export const makeT3Auth = Effect.fn("makeT3Auth")(function* () {
   const config = yield* T3Config;
-  const transport = yield* makeAuthTransport();
-  const spawner = yield* ChildProcessSpawner;
-  const fs = yield* FileSystem.FileSystem;
-  const path = yield* Path.Path;
-  const environment = yield* Environment;
-  const scope = yield* Scope.Scope;
-
-  const pair = Effect.fn("T3AuthLive.pair")(function* (pairingUrl: string) {
-    const parsed = yield* parsePairingUrl(pairingUrl);
-    const result = yield* transport.bootstrapBearer(parsed);
-    const existing = yield* config.readStored().pipe(
-      Effect.catchTags({
-        ConfigError: (error) =>
-          Effect.fail(new AuthConfigError({ message: "auth config failed", cause: error })),
-      }),
-    );
-    yield* config
-      .writeStored({ ...existing, url: parsed.baseUrl, token: result.sessionToken })
-      .pipe(
-        Effect.catchTags({
-          ConfigError: (error) =>
-            Effect.fail(new AuthConfigError({ message: "auth config failed", cause: error })),
-        }),
-      );
-    return { url: parsed.baseUrl, role: result.role, expiresAt: result.expiresAt };
-  });
-
-  const local = Effect.fn("T3AuthLive.local")(function* (input: LocalAuthInput) {
-    const issued = yield* issueLocalSession(input).pipe(
-      Effect.provideService(ChildProcessSpawner, spawner),
-      Effect.provideService(FileSystem.FileSystem, fs),
-      Effect.provideService(Path.Path, path),
-      Effect.provideService(Environment, environment),
-      Effect.provideService(Scope.Scope, scope),
-    );
-    const url = yield* resolveLocalOrigin({
-      baseDir: issued.baseDir,
-      ...(input.origin !== undefined ? { origin: input.origin } : {}),
-    }).pipe(
-      Effect.provideService(FileSystem.FileSystem, fs),
-      Effect.provideService(Path.Path, path),
-    );
-    const existing = yield* config.readStored().pipe(
-      Effect.catchTags({
-        ConfigError: (error) =>
-          Effect.fail(new AuthConfigError({ message: "auth config failed", cause: error })),
-      }),
-    );
-    yield* config.writeStored({ ...existing, url, token: issued.session.token }).pipe(
-      Effect.catchTags({
-        ConfigError: (error) =>
-          Effect.fail(new AuthConfigError({ message: "auth config failed", cause: error })),
-      }),
-    );
-    return {
-      url,
-      role: issued.session.role,
-      expiresAt: issued.session.expiresAt,
-      source: "local" as const,
-      baseDir: issued.baseDir,
-    };
-  });
+  const transport = yield* T3AuthTransport;
+  const localAuth = yield* T3LocalAuth;
+  const pairing = yield* T3AuthPairing;
 
   const status = Effect.fn("T3AuthLive.status")(function* () {
     const resolved = yield* config.resolve().pipe(
@@ -91,7 +26,7 @@ export const makeT3Auth = Effect.fn("makeT3Auth")(function* () {
     return yield* transport.getSession(resolved);
   });
 
-  const issueWebSocketToken = Effect.fn("T3AuthLive.issueWebSocketToken")(function* () {
+  const issueWebSocketTicket = Effect.fn("T3AuthLive.issueWebSocketTicket")(function* () {
     const resolved = yield* config.resolve().pipe(
       Effect.catchTags({
         ConfigError: (error) =>
@@ -100,14 +35,14 @@ export const makeT3Auth = Effect.fn("makeT3Auth")(function* () {
           Effect.fail(new AuthConfigError({ message: "auth config failed", cause: error })),
       }),
     );
-    return yield* transport.issueWebSocketToken(resolved);
+    return yield* transport.issueWebSocketTicket(resolved);
   });
 
   return {
-    pair,
-    local,
+    pair: pairing.pair,
+    local: localAuth.local,
     status,
-    issueWebSocketToken,
+    issueWebSocketTicket,
   };
 });