@usesocial/cli 0.11.0 → 0.11.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @usesocial/cli
 
+## 0.11.2
+
+### Patch Changes
+
+- [#46](https://github.com/usesocial/monorepo/pull/46) [`88f7b42`](https://github.com/usesocial/monorepo/commit/88f7b42abaec62175fb6ca030e301c8497601901) Thanks [@CyrusNuevoDia](https://github.com/CyrusNuevoDia)! - Fix `social account connect x` so it finishes when OAuth refreshes an already-connected X account instead of waiting until timeout.
+
+## 0.11.1
+
+### Patch Changes
+
+- [#45](https://github.com/usesocial/monorepo/pull/45) [`940ff35`](https://github.com/usesocial/monorepo/commit/940ff356c07cd1f1a01be059b022eafcb5a82a1b) Thanks [@CyrusNuevoDia](https://github.com/CyrusNuevoDia)! - Create the server-side CLI session grant after non-TTY device login approval so read/write device sessions are not reported locally as write-capable while the API still treats them as read-only.
+
 ## 0.11.0
 
 ### Minor Changes

package/dist/index.mjs

@@ -18702,6 +18702,7 @@ const prepareAccountConnect = async (deps) => {
 	await pollForSeat$1(deps);
 };
 const accountKey = (account) => account.profileId;
+const timestampMS = (value) => value instanceof Date ? value.getTime() : void 0;
 const normalizeIdentifier = (value) => value.trim().replace(/^@+/, "").toLowerCase();
 const accountSelectorFor$1 = (account) => account.username ? `@${account.username.replace(/^@+/, "")}` : `profile_id:${account.profileId}`;
 const assertXAccountSelector = (target) => {
@@ -18733,13 +18734,20 @@ const createXConnectURL = (deps, reconnectProfileId) => connectURLFor(deps, reco
 const connectXAccount = async (deps) => {
 	const before = await listXLifecycleAccounts(deps, true);
 	const connectedBefore = new Set(before.filter((account) => account.status === "connected").map(accountKey));
+	const lastSeenBefore = new Map(before.filter((account) => account.status === "connected").map((account) => [accountKey(account), timestampMS(account.lastSeenAt)]));
 	await prepareAccountConnect(deps);
 	const authURL = await authURLFor(deps, () => connectURLFor(deps));
 	await openOrPrint(deps, authURL.url, { log: !authURL.openingLogged });
 	return {
 		platform: "x",
 		status: "connected",
-		account: await pollForAccount(deps, (candidate) => candidate.status === "connected" && !connectedBefore.has(candidate.profileId))
+		account: await pollForAccount(deps, (candidate) => {
+			if (candidate.status !== "connected") return false;
+			if (!connectedBefore.has(candidate.profileId)) return true;
+			const previousLastSeen = lastSeenBefore.get(candidate.profileId);
+			const currentLastSeen = timestampMS(candidate.lastSeenAt);
+			return previousLastSeen !== void 0 && currentLastSeen !== void 0 && currentLastSeen > previousLastSeen;
+		})
 	};
 };
 const reconnectXAccount = async (deps, args) => {
@@ -21414,7 +21422,7 @@ function createEnv(opts) {
 }
 //#endregion
 //#region package.json
-var version$1 = "0.11.0";
+var version$1 = "0.11.2";
 //#endregion
 //#region src/lib/env.ts
 const URLWithTrailingSlash = url().transform(ensureTrailingSlash);
@@ -28783,13 +28791,16 @@ const errorOutput = (error) => ({
 const isInteractiveTerminal = () => process.stdin.isTTY === true && process.stdout.isTTY === true;
 const nextCommands = ["social account connect linkedin", "social account connect x"];
 const deviceExpiredMessage = "Sign-in expired before approval. Run `social account login` again to restart.";
+const scopeUpgradeRequiresReauthorization = "Existing CLI session is read-only. Run `social account logout`, then `social account login` to approve a new write-capable session.";
+const scopeAliasIncludes = (granted, requested) => granted === requested || granted === "read,write";
 /**
 * Drive one step of the non-TTY device-authorization login and map it onto the
 * login output union. The first call starts the device flow and returns
 * `pending_approval`; later calls poll until `logged_in` or `expired`.
 */
-const deviceLoginOutput = async (loginArgs) => {
-	const state = await advanceDeviceLogin(parseScopeAlias(loginArgs.scope));
+const deviceLoginOutput = async (client, loginArgs) => {
+	const scope = parseScopeAlias(loginArgs.scope);
+	const state = await advanceDeviceLogin(scope);
 	switch (state.status) {
 		case "pending_approval": return {
 			status: "pending_approval",
@@ -28801,7 +28812,10 @@ const deviceLoginOutput = async (loginArgs) => {
 		};
 		case "logged_in": return {
 			status: "logged_in",
-			account: state.account,
+			account: {
+				...state.account,
+				scope: (await client.cli.session.upsert({ scopeAlias: scope })).scopeAlias
+			},
 			nextCommands
 		};
 		case "expired": return {
@@ -28891,23 +28905,30 @@ const loginCommand = defineCommand({
 		try {
 			const client = createORPCAPIClient();
 			const existing = await readExistingAuthSession(client);
-			if (existing.kind === "existing") if (billingReady(await client.billing.status())) output = alreadyLoggedInOutput(existing.session);
-			else if (isInteractiveTerminal()) output = await runLogin({
-				ui: createUI(true),
-				client,
-				args: loginArgs
-			}, [{
-				name: "seat",
-				run: seatPhase
-			}], { authenticated: true });
-			else output = alreadyLoggedInOutput(existing.session);
-			else if (existing.kind === "offline") output = offlineOutput();
+			if (existing.kind === "existing") {
+				const requestedScope = parseScopeAlias(loginArgs.scope);
+				if (!scopeAliasIncludes(existing.session.session.scope, requestedScope)) output = {
+					status: "error",
+					code: "scope_upgrade_requires_reauthorization",
+					message: scopeUpgradeRequiresReauthorization
+				};
+				else if (billingReady(await client.billing.status())) output = alreadyLoggedInOutput(existing.session);
+				else if (isInteractiveTerminal()) output = await runLogin({
+					ui: createUI(true),
+					client,
+					args: loginArgs
+				}, [{
+					name: "seat",
+					run: seatPhase
+				}], { authenticated: true });
+				else output = alreadyLoggedInOutput(existing.session);
+			} else if (existing.kind === "offline") output = offlineOutput();
 			else if (isInteractiveTerminal()) output = await runLogin({
 				ui: createUI(true),
 				client,
 				args: loginArgs
 			});
-			else output = await deviceLoginOutput(loginArgs);
+			else output = await deviceLoginOutput(client, loginArgs);
 		} catch (error) {
 			output = errorOutput(error);
 			exitCode = exitCodeFor(error);