add logout command

Author: emilwidlund

install.sh

@@ -118,6 +118,11 @@ main() {
   fi
   chmod +x "${INSTALL_DIR}/${BINARY_NAME}"
 
+  local tokens_file="${HOME}/.polar/tokens.json"
+  if [ -f "$tokens_file" ]; then
+    rm -f "$tokens_file"
+  fi
+
   info "Polar CLI ${version} installed successfully!"
   echo ""
   echo "  Run 'polar --help' to get started."

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "polar-cli",
-	"version": "1.3.5",
+	"version": "1.3.6",
 	"description": "",
 	"bin": "bin/cli.js",
 	"type": "module",

src/cli.ts

@@ -3,6 +3,7 @@ import { BunContext, BunRuntime } from "@effect/platform-bun";
 import { Effect, Layer } from "effect";
 import { listen } from "./commands/listen";
 import { login } from "./commands/login";
+import { logout } from "./commands/logout";
 import { migrate } from "./commands/migrate";
 import { update } from "./commands/update";
 import * as Migration from "./services/migration/migrate";
@@ -14,6 +15,7 @@ import { VERSION } from "./version";
 const mainCommand = Command.make("polar").pipe(
   Command.withSubcommands([
     login,
+    logout,
     migrate,
     listen,
     update

src/commands/logout.ts

@@ -0,0 +1,11 @@
+import { Command } from "@effect/cli";
+import { Console, Effect } from "effect";
+import * as OAuth from "../services/oauth";
+
+export const logout = Command.make("logout", {}, () =>
+	Effect.gen(function* () {
+		const oauth = yield* OAuth.OAuth;
+		yield* oauth.logout();
+		yield* Console.log("Successfully logged out of Polar");
+	}),
+);

src/commands/update.ts

@@ -4,6 +4,7 @@ import { createHash } from "crypto";
 import { chmod, mkdtemp, rename, rm, unlink } from "fs/promises";
 import { tmpdir } from "os";
 import { dirname, join } from "path";
+import * as OAuth from "../services/oauth";
 import { VERSION } from "../version";
 
 const fsError = (e: unknown): Error =>
@@ -308,5 +309,8 @@ export const update = Command.make("update", {}, () =>
     }
 
     yield* downloadAndUpdate(release, latestVersion);
+
+    const oauth = yield* OAuth.OAuth;
+    yield* oauth.logout().pipe(Effect.catchAll(() => Effect.void));
   }),
 );

src/schemas/Tokens.ts

@@ -1,71 +1,6 @@
 import { Schema } from "effect";
 
-export const TokenScope = Schema.Array(
-  Schema.Literal(
-    'benefits:read',
-    'benefits:write',
-    'checkout_links:read',
-    'checkout_links:write',
-    'checkouts:read',
-    'checkouts:write',
-    'custom_fields:read',
-    'custom_fields:write',
-    'customer_meters:read',
-    'customer_portal:read',
-    'customer_portal:write',
-    'customer_seats:read',
-    'customer_seats:write',
-    'customer_sessions:write',
-    'customers:read',
-    'customers:write',
-    'discounts:read',
-    'discounts:write',
-    'disputes:read',
-    'email',
-    'events:read',
-    'events:write',
-    'files:read',
-    'files:write',
-    'license_keys:read',
-    'license_keys:write',
-    'member_sessions:write',
-    'members:read',
-    'members:write',
-    'meters:read',
-    'meters:write',
-    'metrics:read',
-    'metrics:write',
-    'notification_recipients:read',
-    'notification_recipients:write',
-    'notifications:read',
-    'notifications:write',
-    'openid',
-    'orders:read',
-    'orders:write',
-    'organization_access_tokens:read',
-    'organization_access_tokens:write',
-    'organizations:read',
-    'organizations:write',
-    'payments:read',
-    'payouts:read',
-    'payouts:write',
-    'products:read',
-    'products:write',
-    'profile',
-    'refunds:read',
-    'refunds:write',
-    'subscriptions:read',
-    'subscriptions:write',
-    'transactions:read',
-    'transactions:write',
-    'user:read',
-    'user:write',
-    'wallets:read',
-    'wallets:write',
-    'webhooks:read',
-    'webhooks:write',
-  ),
-);
+export const TokenScope = Schema.Array(Schema.String);
 
 export const Token = Schema.Struct({
   token: Schema.Redacted(Schema.String),

src/services/oauth.ts

@@ -148,6 +148,7 @@ export class OAuth extends Context.Tag("OAuth")<OAuth, OAuthImpl>() { }
 
 interface OAuthImpl {
 	login: (server: PolarEnvironment) => Effect.Effect<Token, OAuthError, never>;
+	logout: () => Effect.Effect<void, OAuthError, never>;
 	refresh: (token: Token) => Effect.Effect<Token, OAuthError, never>;
 	isAuthenticated: (
 		server: PolarEnvironment,
@@ -186,6 +187,9 @@ export const make = Effect.gen(function* () {
 			return savedToken;
 		}).pipe(Effect.scoped, Effect.provide(OAuthRequirementsLayer));
 
+	const logout = () =>
+		deleteTokenFile.pipe(Effect.provide(OAuthRequirementsLayer));
+
 	const refresh = (token: Token) =>
 		Effect.gen(function* () {
 			const refreshedToken = yield* refreshAccessToken(token);
@@ -224,6 +228,7 @@ export const make = Effect.gen(function* () {
 
 	return OAuth.of({
 		login,
+		logout,
 		refresh,
 		isAuthenticated,
 		getAccessToken,
@@ -321,6 +326,17 @@ const saveToken = (token: Token) =>
 		return yield* writeToTokenFile(token).pipe(Effect.map(() => token));
 	});
 
+const deleteTokenFile = Effect.gen(function* () {
+	const fileSystem = yield* FileSystem.FileSystem;
+	const filePath = yield* tokenFilePath;
+
+	yield* Effect.logDebug("Deleting token file...");
+
+	return yield* fileSystem.remove(filePath).pipe(
+		Effect.catchAll(() => Effect.void),
+	);
+});
+
 const generateRandomString = Effect.sync(() => randomBytes(48).toString("hex"));
 
 const generateHash = (value: string) =>
@@ -458,7 +474,7 @@ const refreshAccessToken = (token: Token) =>
 			server: token.server,
 		}).pipe(
 			Effect.catchTag("ParseError", (error) =>
-				Effect.die(
+				Effect.fail(
 					new OAuthError({
 						message: "Failed to parse token response into a Token Schema",
 						cause: error,
@@ -544,7 +560,7 @@ const redeemCodeForAccessToken = (
 			server,
 		}).pipe(
 			Effect.catchTag("ParseError", (error) =>
-				Effect.die(
+				Effect.fail(
 					new OAuthError({
 						message: "Failed to parse token response into a Token Schema",
 						cause: error,

src/version.ts

@@ -1 +1 @@
-export const VERSION = "v1.3.5";
+export const VERSION = "v1.3.6";