@better-update/cli 0.21.0 → 0.22.0

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { createRequire } from "node:module";
 import { execFile, spawn, spawnSync } from "node:child_process";
 import { defineCommand, runMain } from "citty";
 import { Console, Context, Data, Deferred, Duration, Effect, Either, Layer, Match, Option, ParseResult, Schedule, Schema } from "effect";
-import { Command, FetchHttpClient, FileSystem, HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup, HttpApiMiddleware, HttpApiSchema, HttpApiSecurity, HttpClient, HttpClientRequest, OpenApi, Path } from "@effect/platform";
+import { Command, FetchHttpClient, FileSystem, Headers as Headers$1, HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup, HttpApiMiddleware, HttpApiSchema, HttpApiSecurity, HttpClient, HttpClientRequest, OpenApi, Path } from "@effect/platform";
 import { NodeContext } from "@effect/platform-node";
 import path, { join } from "node:path";
 import process$1 from "node:process";
@@ -33,7 +33,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
 //#region package.json
-var version = "0.21.0";
+var version = "0.22.0";
 
 //#endregion
 //#region src/lib/interactive-mode.ts
@@ -1621,7 +1621,7 @@ const MeOrganization = Schema.Struct({
 const Me = Schema.Struct({
 	user: Schema.NullOr(MeUser),
 	activeOrganization: Schema.NullOr(MeOrganization),
-	/** Authentication source — "session" for browser cookie, "api-key" for CLI bearer tokens. */
+	/** Authentication source — "session" for browser + CLI sessions, "api-key" for API-key (CI) bearer tokens. */
 	source: Schema.Literal("session", "api-key"),
 	/** Email or descriptor identifying the actor — useful when `user` is null (api-key auth). */
 	actorEmail: Schema.String
@@ -2011,17 +2011,10 @@ var ProtocolApi = class extends HttpApi.make("protocol-api").add(ManifestGroup).
 	description: "Expo Updates protocol endpoints (unauthenticated)"
 })) {};
 
-//#endregion
-//#region ../../packages/type-guards/src/index.ts
-const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-const asRecord = (value) => isRecord(value) ? value : void 0;
-const toOptional = (value) => value ?? void 0;
-const toDbNull = (value) => value ?? null;
-const compact = (obj) => Object.fromEntries(Object.entries(obj).filter(([, value]) => value !== void 0));
-
 //#endregion
 //#region src/lib/exit-codes.ts
 var AuthRequiredError = class extends Data.TaggedError("AuthRequiredError") {};
+var LoginError = class extends Data.TaggedError("LoginError") {};
 var ProjectNotLinkedError = class extends Data.TaggedError("ProjectNotLinkedError") {};
 var UploadFailedError = class extends Data.TaggedError("UploadFailedError") {};
 var BuildProfileError = class extends Data.TaggedError("BuildProfileError") {};
@@ -2048,6 +2041,14 @@ var CredentialsJsonError = class extends Data.TaggedError("CredentialsJsonError"
 var DirtyRepoError = class extends Data.TaggedError("DirtyRepoError") {};
 var StagingError = class extends Data.TaggedError("StagingError") {};
 
+//#endregion
+//#region ../../packages/type-guards/src/index.ts
+const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const asRecord = (value) => isRecord(value) ? value : void 0;
+const toOptional = (value) => value ?? void 0;
+const toDbNull = (value) => value ?? null;
+const compact = (obj) => Object.fromEntries(Object.entries(obj).filter(([, value]) => value !== void 0));
+
 //#endregion
 //#region src/lib/format-error.ts
 const formatCause = (cause) => {
@@ -2168,14 +2169,25 @@ const ApiClientLive = Layer.effect(ApiClientService, Effect.gen(function* () {
 	const authStore = yield* AuthStore;
 	const configStore = yield* ConfigStore;
 	const retryingClient = HttpClient.retryTransient(clientService, RETRY_TRANSIENT_OPTIONS);
-	return { get: Effect.gen(function* () {
-		const token = yield* authStore.getToken;
-		const baseUrl = yield* configStore.getBaseUrl;
-		return yield* HttpApiClient.make(ManagementApi, {
-			transformClient: HttpClient.mapRequest(HttpClientRequest.bearerToken(token)),
-			baseUrl
-		}).pipe(Effect.provideService(HttpClient.HttpClient, retryingClient));
-	}) };
+	return {
+		get: Effect.gen(function* () {
+			const token = yield* authStore.getToken;
+			const baseUrl = yield* configStore.getBaseUrl;
+			return yield* HttpApiClient.make(ManagementApi, {
+				transformClient: HttpClient.mapRequest(HttpClientRequest.bearerToken(token)),
+				baseUrl
+			}).pipe(Effect.provideService(HttpClient.HttpClient, retryingClient));
+		}),
+		exchangeOneTimeToken: (oneTimeToken) => Effect.gen(function* () {
+			const baseUrl = yield* configStore.getBaseUrl;
+			const request = yield* HttpClientRequest.post(`${baseUrl}/api/auth/one-time-token/verify`).pipe(HttpClientRequest.bodyJson({ token: oneTimeToken }), Effect.mapError(() => new LoginError({ message: "Could not encode the login request." })));
+			const response = yield* retryingClient.execute(request).pipe(Effect.mapError((cause) => new LoginError({ message: `Could not reach the login server: ${String(cause)}` })));
+			if (response.status < 200 || response.status >= 300) return yield* new LoginError({ message: `Login token exchange failed (HTTP ${response.status}). Run \`better-update login\` again.` });
+			const sessionToken = Headers$1.get(response.headers, "set-auth-token");
+			if (Option.isNone(sessionToken)) return yield* new LoginError({ message: "The login server did not return a session token (missing set-auth-token header)." });
+			return sessionToken.value;
+		})
+	};
 }));
 
 //#endregion
@@ -2789,8 +2801,9 @@ const browserLogin = Effect.scoped(Effect.gen(function* () {
 	yield* Console.log("Opening browser for better-update login...");
 	yield* Console.log("");
 	yield* openBrowser(loginUrl);
-	const token = yield* loginServer.waitForToken;
-	yield* authStore.saveToken(token);
+	const oneTimeToken = yield* loginServer.waitForToken;
+	const sessionToken = yield* (yield* ApiClientService).exchangeOneTimeToken(oneTimeToken);
+	yield* authStore.saveToken(sessionToken);
 	yield* Console.log("");
 	yield* Console.log("Logged in successfully. Token saved to ~/.better-update/auth.json");
 }));
@@ -2821,6 +2834,7 @@ const exitWith = (code, message) => Console.error(message).pipe(Effect.zipRight(
 //#region src/lib/command-errors.ts
 const BASE_TAG_MAP = {
 	AuthRequiredError: 3,
+	LoginError: 3,
 	ProjectNotLinkedError: 4,
 	NotFound: 1,
 	Conflict: 1,