@usesocial/cli 0.3.4 → 0.3.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @usesocial/cli
 
+## 0.3.5
+
+### Patch Changes
+
+- [#18](https://github.com/usesocial/monorepo/pull/18) [`831fe99`](https://github.com/usesocial/monorepo/commit/831fe99ed1d8ebc045e053fd53a8c5372ec7f49a) Thanks [@CyrusNuevoDia](https://github.com/CyrusNuevoDia)! - Resume existing CLI login sessions at the billing step when a seat is missing, and show account-connect guidance only after login and seat setup complete.
+
 ## 0.3.4
 
 ### Patch Changes

package/dist/index.mjs

@@ -21059,7 +21059,7 @@ const createInstance = (defaults) => {
 const ky = createInstance();
 //#endregion
 //#region package.json
-var version$1 = "0.3.4";
+var version$1 = "0.3.5";
 //#endregion
 //#region src/lib/env.ts
 const URLWithTrailingSlash = url().transform(ensureTrailingSlash);
@@ -27444,7 +27444,6 @@ const DEVICE_GRANT_TYPE = "urn:ietf:params:oauth:grant-type:device_code";
 const MAGIC_LINK_PATH = "/api/auth/sign-in/magic-link";
 const TERMS_URL = new URL(siteConfig.links.terms, siteConfig.publicWebURL).toString();
 const LOGIN_SUCCESS_MESSAGE = "Logged in! 🎉";
-const NEXT_COMMANDS_MESSAGE = "Now run `social account connect linkedin` or `social account connect x`.";
 const formatUserCode = (code) => `${code.slice(0, 4)}-${code.slice(4)}`;
 const isRecord$2 = (value) => typeof value === "object" && value !== null;
 const isAuthErrorResponse = (data) => isRecord$2(data) && (typeof data.error === "string" || typeof data.error_description === "string" || typeof data.message === "string");
@@ -27563,7 +27562,6 @@ const waitForDeviceToken = async (ctx, deviceCode, phoneNumber) => {
 		await updatePhoneNumber(ctx, phoneNumber);
 		clearTick();
 		spinner.stop(LOGIN_SUCCESS_MESSAGE);
-		ctx.ui.info(NEXT_COMMANDS_MESSAGE);
 		return token;
 	} catch (error) {
 		clearTick();
@@ -27834,6 +27832,8 @@ const assertInteractiveTerminal = () => {
 	if (!(process.stdin.isTTY && process.stdout.isTTY)) throw new UsageError("social account login requires an interactive terminal.");
 };
 const nextCommands = ["social account connect linkedin", "social account connect x"];
+const nextCommandsMessage = `Now run \`${nextCommands[0]}\` or \`${nextCommands[1]}\`.`;
+const billingReady = (billing) => billing.seats.available > 0;
 const alreadyLoggedInOutput = ({ credential, session }) => ({
 	status: "already_logged_in",
 	message: "Already logged in.",
@@ -27849,16 +27849,19 @@ const offlineOutput = () => ({
 	code: "offline",
 	message: "Couldn't reach the server. Check your network connection and try again."
 });
-const runLogin = async (ctx) => {
+const runLogin = async (ctx, loginPhases = phases, deps = {}) => {
+	const bearerIsValid = deps.isBearerValid ?? isBearerValid;
+	const readLocalCredentials = deps.readCredentials ?? readCredentials;
 	analytics.capture("login_started");
-	for (const phase of phases) {
-		if (phase.run !== accessPhase && phase.run !== signInPhase && !isBearerValid(await readCredentials())) throw new AuthError("Session expired before login finished. Run `social account login` again.");
+	for (const phase of loginPhases) {
+		if (phase.name !== "access" && phase.name !== "sign-in" && deps.authenticated !== true && !bearerIsValid(await readLocalCredentials())) throw new AuthError("Session expired before login finished. Run `social account login` again.");
 		const result = await phase.run(ctx);
 		if (result.status !== "done") return result;
 		analytics.capture("login_phase_completed", { phase: phase.name });
 	}
 	const session = await ctx.client.cli.session.me();
 	const billing = await ctx.client.billing.status();
+	ctx.ui.info(nextCommandsMessage);
 	return {
 		status: "ok",
 		user: session.user,
@@ -27906,7 +27909,18 @@ const loginCommand = defineCommand({
 		try {
 			const client = createORPCAPIClient();
 			const existing = await readExistingAuthSession(client);
-			if (existing.kind === "existing") output = alreadyLoggedInOutput(existing.session);
+			if (existing.kind === "existing") if (billingReady(await client.billing.status())) output = alreadyLoggedInOutput(existing.session);
+			else {
+				assertInteractiveTerminal();
+				output = await runLogin({
+					ui: createUI(process.stdout.isTTY === true),
+					client,
+					args: loginArgs
+				}, [{
+					name: "seat",
+					run: seatPhase
+				}], { authenticated: true });
+			}
 			else if (existing.kind === "offline") output = offlineOutput();
 			else {
 				assertInteractiveTerminal();

package/package.json

@@ -11,7 +11,7 @@
     "access": "public"
   },
   "private": false,
-  "version": "0.3.4",
+  "version": "0.3.5",
   "type": "module",
   "engines": {
     "node": ">=22.5.0"