@usesocial/cli 0.3.2 → 0.3.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @usesocial/cli
 
+## 0.3.3
+
+### Patch Changes
+
+- [#14](https://github.com/usesocial/monorepo/pull/14) [`22ba757`](https://github.com/usesocial/monorepo/commit/22ba757efd459a0cb3009c91ba833687e2ce2796) Thanks [@CyrusNuevoDia](https://github.com/CyrusNuevoDia)! - Ask for phone number during `social account login`, save it after device approval, and include it in account identity output.
+
 ## 0.3.2
 
 ### Patch Changes

package/README.md

@@ -212,12 +212,12 @@ jq -r '.items[].id' /tmp/recent-posts.json \
    default; clear Write in the prompt to grant read-only access.
 2. Asks for your email address.
 3. Sends a magic link to that email with the device approval screen already
-   attached.
+   attached while asking for your phone number.
 4. Waits until you click the magic link and approve the CLI session in the
-   browser.
-5. Confirms billing checkout in the terminal when a seat is needed.
-6. Stores the returned token in your OS keyring, falling back to
-   `~/.social/credentials.json` (mode `0600`) when no keyring is available.
+   browser, then stores the returned token in your OS keyring.
+5. Stores the phone number, then confirms billing checkout in the terminal when
+   a seat is needed. If no keyring is available, credentials fall back to
+   `~/.social/credentials.json` (mode `0600`).
    Non-production `SOCIAL_API_URL` values use an API-specific credential
    namespace so staging tests do not overwrite the production session.
 

package/dist/index.mjs

@@ -9583,6 +9583,7 @@ const user = pgTable("user", {
 	emailVerified: boolean("emailVerified").notNull().default(false),
 	name: text$1("name").notNull(),
 	image: text$1("image"),
+	phoneNumber: text$1("phone_number"),
 	createdAt: timestamp("createdAt", { mode: "date" }).notNull().defaultNow(),
 	updatedAt: timestamp("updatedAt", { mode: "date" }).notNull().defaultNow().$onUpdate(() => /* @__PURE__ */ new Date())
 });
@@ -21058,7 +21059,7 @@ const createInstance = (defaults) => {
 const ky = createInstance();
 //#endregion
 //#region package.json
-var version$1 = "0.3.2";
+var version$1 = "0.3.3";
 //#endregion
 //#region src/lib/env.ts
 const URLWithTrailingSlash = url().transform(ensureTrailingSlash);
@@ -27411,6 +27412,23 @@ const accessPhase = async (ctx) => {
 	};
 };
 //#endregion
+//#region ../../packages/lib/src/cli-schema-contract.ts
+const isZodSchema = (value) => Boolean(value && typeof value === "object" && "safeParse" in value && typeof value.safeParse === "function");
+const isZodUnknownSchema = (value) => value instanceof ZodUnknown;
+const zodToJSONSchema = (schema, options) => toJSONSchema(schema, { io: options?.io ?? "output" });
+const unknownOutputContract = (message = "Output schema is not declared.") => ({
+	outputSchema: { unknown: true },
+	hazards: [{
+		code: "output_schema_unknown",
+		message
+	}]
+});
+new TextEncoder();
+//#endregion
+//#region ../../packages/lib/src/phone.ts
+const phoneFormattingRegex = /[\s().-]/g;
+const PhoneNumber = string().trim().transform((value) => value.replace(phoneFormattingRegex, "")).pipe(string().regex(/^\+[1-9]\d{1,14}$/, { message: "Enter a phone number with +country code." }));
+//#endregion
 //#region src/login/phases/0.sign-in.ts
 const CLIENT_ID = "social-cli";
 const DEVICE_GRANT_TYPE = "urn:ietf:params:oauth:grant-type:device_code";
@@ -27495,7 +27513,30 @@ const sendMagicLinkSignIn = async (email, callbackURL, deps = {}) => {
 		throw new Error(authErrorMessage("Could not send sign-in email", response, error));
 	}
 };
-const waitForDeviceToken = async (ctx, deviceCode) => {
+const startMagicLinkSignIn = (email, callbackURL) => sendMagicLinkSignIn(email, callbackURL).then(() => ({ status: "fulfilled" }), (error) => ({
+	status: "rejected",
+	error
+}));
+const waitForMagicLinkEmail = async (ctx, emailPromise) => {
+	const result = await emailPromise;
+	if (result.status === "rejected") {
+		ctx.ui.error("Could not send sign-in email");
+		throw result.error;
+	}
+};
+const isMissingPhoneEndpointError = (error) => isRecord$2(error) && "status" in error && error.status === 404 && "message" in error && typeof error.message === "string" && error.message.toLowerCase().includes("not found");
+const updatePhoneNumber = async (ctx, phoneNumber) => {
+	try {
+		await ctx.client.cli.user.updatePhone({ phoneNumber });
+	} catch (error) {
+		if (isMissingPhoneEndpointError(error)) {
+			ctx.ui.warn("Phone number could not be saved yet; login is complete.");
+			return;
+		}
+		throw error;
+	}
+};
+const waitForDeviceToken = async (ctx, deviceCode, phoneNumber) => {
 	const spinner = ctx.ui.spinner();
 	const message = "Waiting for magic link approval";
 	spinner.start(message);
@@ -27509,6 +27550,7 @@ const waitForDeviceToken = async (ctx, deviceCode) => {
 			expiresAt: tokenExpiresAt,
 			scope: token.scope
 		});
+		await updatePhoneNumber(ctx, phoneNumber);
 		clearTick();
 		spinner.stop(LOGIN_SUCCESS_MESSAGE);
 		ctx.ui.info(NEXT_COMMANDS_MESSAGE);
@@ -27530,14 +27572,17 @@ const signInPhase = async (ctx) => {
 	const expiresAt = new Date(Date.now() + deviceCode.expires_in * 1e3).toISOString();
 	const callbackURL = deviceCallbackURLFor(deviceCode, email);
 	const userCode = formatUserCode(deviceCode.user_code);
-	await ctx.ui.spin("Sending sign-in email", () => sendMagicLinkSignIn(email, callbackURL), "Magic link sent");
+	const emailPromise = startMagicLinkSignIn(email, callbackURL);
+	const phoneNumber = await resolvePhoneNumber(ctx);
+	await waitForMagicLinkEmail(ctx, emailPromise);
 	ctx.ui.note(`Code: ${userCode}\nEmail: ${email}\n\nClick the magic link in your inbox to approve this CLI session.\n\n${onboardingLegalNotice()}`, "Check your email");
 	return {
 		status: "done",
 		data: {
 			email,
 			expiresAt,
-			scope: (await waitForDeviceToken(ctx, deviceCode)).scope
+			phoneNumber,
+			scope: (await waitForDeviceToken(ctx, deviceCode, phoneNumber)).scope
 		}
 	};
 };
@@ -27547,6 +27592,17 @@ const resolveEmail = async (ctx) => await ctx.ui.text({
 	placeholder: "you@example.com",
 	validate: (value) => value?.includes("@") ? void 0 : "Enter an email address."
 });
+const resolvePhoneNumber = async (ctx) => {
+	const phoneNumber = await ctx.ui.text({
+		message: "Phone number",
+		placeholder: "+1 555 123 4567",
+		validate: (value) => {
+			const result = PhoneNumber.safeParse(value);
+			return result.success ? void 0 : result.error.issues[0]?.message;
+		}
+	});
+	return PhoneNumber.parse(phoneNumber);
+};
 //#endregion
 //#region src/login/phases/1.scope.ts
 const DEFAULT_SCOPE_ALIAS = "read,write";
@@ -27691,7 +27747,8 @@ const ScopeAlias = _enum(["read", "read,write"]);
 const LoginUserOutput = object({
 	id: string(),
 	email: string().nullable(),
-	name: string().nullable()
+	name: string().nullable(),
+	phoneNumber: string().nullable()
 });
 const LoginSeatsOutput = object({
 	total: number().int().nonnegative(),
@@ -28111,7 +28168,8 @@ const AccountSessionOutput = object({
 	user: object({
 		id: string(),
 		email: string().nullable(),
-		name: string().nullable()
+		name: string().nullable(),
+		phoneNumber: string().nullable()
 	}),
 	scope: _enum(["read", "read,write"]),
 	capabilities: array(string())
@@ -28591,18 +28649,6 @@ const createCLIDeps = () => {
 	};
 };
 //#endregion
-//#region ../../packages/lib/src/cli-schema-contract.ts
-const isZodSchema = (value) => Boolean(value && typeof value === "object" && "safeParse" in value && typeof value.safeParse === "function");
-const isZodUnknownSchema = (value) => value instanceof ZodUnknown;
-const zodToJSONSchema = (schema, options) => toJSONSchema(schema, { io: options?.io ?? "output" });
-const unknownOutputContract = (message = "Output schema is not declared.") => ({
-	outputSchema: { unknown: true },
-	hazards: [{
-		code: "output_schema_unknown",
-		message
-	}]
-});
-//#endregion
 //#region src/schema/index.ts
 const HTTPMethod = _enum([
 	"DELETE",

package/package.json

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