ubriot 0.2.1 → 0.2.2

package/README.md

@@ -1,6 +1,6 @@
 # ubriot
 
-Mobile release CLI. Ship iOS and Android native builds, submit to TestFlight and Google Play, and push OTA updates — all from one command.
+Mobile release CLI. Ship iOS and Android native builds, submit to TestFlight and Google Play, and push OTA updates, all from one command.
 
 ## Install
 

package/dist/api.js

@@ -7,13 +7,50 @@ exports.makeClient = makeClient;
 exports.handleError = handleError;
 const axios_1 = __importDefault(require("axios"));
 const config_1 = require("./config");
+async function refreshAccessToken() {
+    const cfg = (0, config_1.readConfig)();
+    if (!cfg.refreshToken)
+        return null;
+    try {
+        const { data } = await axios_1.default.post(`${cfg.apiBase}/auth/refresh`, {
+            refreshToken: cfg.refreshToken,
+        });
+        const token = data?.user?.token;
+        if (!token)
+            return null;
+        (0, config_1.writeConfig)({ token, refreshToken: data?.refreshToken ?? cfg.refreshToken });
+        return token;
+    }
+    catch {
+        return null;
+    }
+}
 function makeClient() {
     const cfg = (0, config_1.readConfig)();
-    return axios_1.default.create({
+    const client = axios_1.default.create({
         baseURL: cfg.apiBase,
         headers: cfg.token ? { Authorization: `Bearer ${cfg.token}` } : {},
-        timeout: 30000,
+        timeout: 120000,
+    });
+    // Expired access token: refresh once and retry the original request.
+    client.interceptors.response.use((res) => res, async (error) => {
+        const original = error.config;
+        const status = error.response?.status;
+        const isAuthCall = typeof original?.url === "string" && original.url.includes("/auth/");
+        if (status !== 401 || !original || original._retry || isAuthCall) {
+            return Promise.reject(error);
+        }
+        original._retry = true;
+        const newToken = await refreshAccessToken();
+        if (!newToken) {
+            console.error("Session expired. Run: ubriot login");
+            process.exit(1);
+        }
+        original.headers = original.headers ?? {};
+        original.headers.Authorization = `Bearer ${newToken}`;
+        return client(original);
     });
+    return client;
 }
 function handleError(err) {
     if (axios_1.default.isAxiosError(err)) {

package/dist/config.js

@@ -11,6 +11,7 @@ const CONFIG_FILE = (0, path_1.join)(CONFIG_DIR, "config.json");
 const defaults = {
     apiBase: "https://api.ubriot.dev/api/v1",
     token: null,
+    refreshToken: null,
     email: null,
 };
 function readConfig() {

package/dist/index.js

@@ -42,7 +42,7 @@ const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const crypto_1 = require("crypto");
-commander_1.program.name("ubriot").description("Ubriot — self-hosted Expo release infrastructure").version("0.1.0");
+commander_1.program.name("ubriot").description("Ubriot, self-hosted Expo release infrastructure").version("0.1.0");
 const MIME = {
     ".avif": "image/avif",
     ".bundle": "application/javascript",
@@ -89,6 +89,37 @@ function readExpoConfigFromPath(configPath) {
     const configJson = readJsonFile(configPath);
     return configJson.expo ?? configJson;
 }
+/**
+ * Derive the Apple capabilities an app needs straight from its Expo config, so
+ * users don't have to remember flags like `--ios-capability PUSH_NOTIFICATIONS`.
+ * Reads plugins + ios.entitlements + ios.infoPlist for clear, unambiguous signals.
+ */
+function detectIosCapabilities(config) {
+    const caps = new Set();
+    const plugins = Array.isArray(config?.plugins) ? config.plugins : [];
+    const pluginNames = plugins.map((p) => (Array.isArray(p) ? p[0] : p)).filter((p) => typeof p === "string");
+    const ent = config?.ios?.entitlements ?? {};
+    // Push notifications: expo-notifications plugin or an aps-environment entitlement.
+    if (pluginNames.some((p) => p.includes("expo-notifications")) || ent["aps-environment"]) {
+        caps.add("PUSH_NOTIFICATIONS");
+    }
+    // Sign in with Apple.
+    if (ent["com.apple.developer.applesignin"])
+        caps.add("APPLE_ID_AUTH");
+    // Associated Domains (universal links).
+    if (config?.ios?.associatedDomains?.length || ent["com.apple.developer.associated-domains"]) {
+        caps.add("ASSOCIATED_DOMAINS");
+    }
+    // HealthKit.
+    if (pluginNames.some((p) => p.includes("health")) || ent["com.apple.developer.healthkit"]) {
+        caps.add("HEALTHKIT");
+    }
+    // iCloud.
+    if (ent["com.apple.developer.icloud-services"] || ent["com.apple.developer.icloud-container-identifiers"]) {
+        caps.add("ICLOUD");
+    }
+    return [...caps];
+}
 function hasExpoIdentity(config) {
     return Boolean(config?.slug ||
         config?.name ||
@@ -564,7 +595,7 @@ commander_1.program
         const token = data?.user?.token;
         if (!token)
             throw new Error("No token in response");
-        (0, config_1.writeConfig)({ token, email });
+        (0, config_1.writeConfig)({ token, refreshToken: data?.refreshToken ?? null, email });
         console.log(`Logged in as ${email}`);
     }
     catch (err) {
@@ -574,8 +605,18 @@ commander_1.program
 commander_1.program
     .command("logout")
     .description("Clear saved credentials")
-    .action(() => {
-    (0, config_1.writeConfig)({ token: null, email: null });
+    .action(async () => {
+    const cfg = (0, config_1.readConfig)();
+    if (cfg.refreshToken) {
+        // Best-effort server-side revoke; ignore failures.
+        try {
+            await (0, api_1.makeClient)().post("/auth/logout", { refreshToken: cfg.refreshToken });
+        }
+        catch {
+            // ignore
+        }
+    }
+    (0, config_1.writeConfig)({ token: null, refreshToken: null, email: null });
     console.log("Logged out.");
 });
 commander_1.program
@@ -680,7 +721,7 @@ apps
         if (opts.noAutoSubmitGooglePlay)
             body.autoSubmitGooglePlay = false;
         if (!Object.keys(body).length) {
-            console.log("Nothing to update — pass --ios-bundle, --android-id, --asc-app-id, --google-play-track, and/or auto-submit flags");
+            console.log("Nothing to update, pass --ios-bundle, --android-id, --asc-app-id, --google-play-track, and/or auto-submit flags");
             return;
         }
         const { data } = await (0, api_1.makeClient)().patch(`/ubriot/apps/${opts.app}`, body);
@@ -738,12 +779,30 @@ commander_1.program
         }
         // EAS-style auto-provisioning: ensure a provisioning profile exists for iOS.
         if (normalizedPlatform === "ios") {
-            const provisionExplicit = Boolean(opts.reprovisionIos || opts.iosCapability?.length);
+            // Auto-detect capabilities from the local Expo config so users don't have
+            // to pass --ios-capability by hand. Explicit flags still win / extend.
+            let capabilities = opts.iosCapability ?? [];
+            try {
+                const cfgPath = opts.expoConfig
+                    ? (0, path_1.resolve)(opts.expoConfig)
+                    : opts.expoProjectRoot
+                        ? (0, path_1.join)((0, path_1.resolve)(opts.expoProjectRoot), "app.json")
+                        : "app.json";
+                const localCfg = (0, fs_1.existsSync)((0, path_1.resolve)(cfgPath)) ? readExpoConfigFromPath((0, path_1.resolve)(cfgPath)) : readExpoConfig();
+                const detected = detectIosCapabilities(localCfg);
+                const added = detected.filter((c) => !capabilities.includes(c));
+                if (added.length) {
+                    capabilities = [...capabilities, ...added];
+                    console.log(`Auto-detected iOS capabilities from app config: ${added.join(", ")}`);
+                }
+            }
+            catch { /* detection is best-effort; fall back to explicit flags */ }
+            const provisionExplicit = Boolean(opts.reprovisionIos || capabilities.length);
             const provisionBody = {};
             if (opts.reprovisionIos)
                 provisionBody.force = true;
-            if (opts.iosCapability?.length)
-                provisionBody.capabilities = opts.iosCapability;
+            if (capabilities.length)
+                provisionBody.capabilities = capabilities;
             try {
                 const { data: prov } = await client.post(`/ubriot/apps/${encodeURIComponent(app)}/provision-ios`, provisionBody);
                 if (prov?.status === "provisioned") {
@@ -754,7 +813,7 @@ commander_1.program
             catch (provErr) {
                 const msg = provErr?.response?.data?.message ?? provErr?.message ?? "";
                 // When reprovisioning or capabilities were explicitly requested, a provisioning
-                // failure means the build is doomed to fail signing — stop here instead.
+                // failure means the build is doomed to fail signing, stop here instead.
                 if (provisionExplicit)
                     throw new Error(`iOS provisioning failed: ${msg}`);
                 console.log(`⚠ Auto-provisioning skipped: ${msg}`);
@@ -766,7 +825,7 @@ commander_1.program
             repoUrl,
             branch,
         });
-        console.log(`Queued build #${data.id} (${data.platform} / ${data.profile}) — status: ${data.status}`);
+        console.log(`Queued build #${data.id} (${data.platform} / ${data.profile}), status: ${data.status}`);
         const finished = await waitForBuild(client, data.id, pollIntervalMs, timeoutMs);
         if (opts.submit === false)
             return;
@@ -823,7 +882,7 @@ builds
             repoUrl: opts.repo,
             branch: opts.branch,
         });
-        console.log(`Queued build #${data.id} (${data.platform} / ${data.profile}) — status: ${data.status}`);
+        console.log(`Queued build #${data.id} (${data.platform} / ${data.profile}), status: ${data.status}`);
         if (!shouldWait) {
             if (data.platform === "ios") {
                 console.log(`To submit after it succeeds: ubriot builds submit-testflight ${data.id}`);
@@ -950,8 +1009,8 @@ builds
                 if (data.playSubmissionStatus === "failed") {
                     throw new Error(`Google Play submit for build #${buildId} failed${data.playSubmissionError ? `: ${data.playSubmissionError}` : ""}`);
                 }
-                const asc = data.ascSubmissionStatus === "succeeded" ? " — TestFlight submission succeeded" : "";
-                const play = data.playSubmissionStatus === "succeeded" ? ` — Google Play submission succeeded${data.playTrack ? ` (${data.playTrack})` : ""}` : "";
+                const asc = data.ascSubmissionStatus === "succeeded" ? ", TestFlight submission succeeded" : "";
+                const play = data.playSubmissionStatus === "succeeded" ? `, Google Play submission succeeded${data.playTrack ? ` (${data.playTrack})` : ""}` : "";
                 console.log(`Build #${buildId} succeeded${asc}${play}.`);
                 return;
             }
@@ -996,7 +1055,7 @@ builds
     (0, config_1.requireAuth)();
     try {
         const { data } = await (0, api_1.makeClient)().post(`/ubriot/builds/${buildId}/submit-testflight`);
-        console.log(`Build #${buildId} queued for TestFlight submit — ascSubmissionStatus: ${data.ascSubmissionStatus}`);
+        console.log(`Build #${buildId} queued for TestFlight submit, ascSubmissionStatus: ${data.ascSubmissionStatus}`);
     }
     catch (err) {
         (0, api_1.handleError)(err);
@@ -1023,7 +1082,7 @@ builds
     (0, config_1.requireAuth)();
     try {
         const { data } = await (0, api_1.makeClient)().post(`/ubriot/builds/${buildId}/submit-google-play`, { track: opts.track });
-        console.log(`Build #${buildId} queued for Google Play submit — playSubmissionStatus: ${data.playSubmissionStatus}`);
+        console.log(`Build #${buildId} queued for Google Play submit, playSubmissionStatus: ${data.playSubmissionStatus}`);
     }
     catch (err) {
         (0, api_1.handleError)(err);
@@ -1109,7 +1168,7 @@ creds
             payload: { serviceAccountJsonBase64 },
         });
         console.log(`Google Play service account credential created: #${data.id} "${data.name}"`);
-        console.log(`Ready to ship — run: ubriot ship android`);
+        console.log(`Ready to ship, run: ubriot ship android`);
     }
     catch (err) {
         (0, api_1.handleError)(err);
@@ -1192,6 +1251,27 @@ creds
         (0, api_1.handleError)(err);
     }
 });
+creds
+    .command("copy")
+    .description("Copy a credential to another app in the same team (reuses team-wide keys like APNs/ASC without re-uploading the file)")
+    .requiredOption("--from <credId>", "Source credential id (see `credentials list`)")
+    .requiredOption("--to-app <appIdOrSlug>", "Destination app id or slug")
+    .option("--name <name>", "Name for the copied credential")
+    .option("--bundle-id <id>", "Override bundle id (APNs topic); defaults to the destination app's bundle id")
+    .action(async (opts) => {
+    (0, config_1.requireAuth)();
+    try {
+        const { data } = await (0, api_1.makeClient)().post(`/ubriot/credentials/${opts.from}/copy`, {
+            toApp: opts.toApp,
+            name: opts.name,
+            bundleId: opts.bundleId,
+        });
+        console.log(`Copied credential → #${data.id} "${data.name}" (${data.kind}) on app ${data.toAppId}`);
+    }
+    catch (err) {
+        (0, api_1.handleError)(err);
+    }
+});
 creds
     .command("upload-ios-cert")
     .description("Upload an iOS distribution certificate (.p12)")
@@ -1296,7 +1376,7 @@ creds
             },
         });
         console.log(`Apple ID credential created: #${data.id} "${data.name}"`);
-        console.log(`Ready to ship — run: ubriot ship ios`);
+        console.log(`Ready to ship, run: ubriot ship ios`);
     }
     catch (err) {
         (0, api_1.handleError)(err);
@@ -1304,7 +1384,7 @@ creds
 });
 creds
     .command("setup-testflight")
-    .description("Interactive guided setup for TestFlight submission (like EAS — walks you through it)")
+    .description("Interactive guided setup for TestFlight submission (like EAS, walks you through it)")
     .requiredOption("--app <appId>", "App ID (run 'ubriot apps list' if unsure)")
     .action(async (opts) => {
     (0, config_1.requireAuth)();
@@ -1314,8 +1394,8 @@ creds
         console.log(`\n🚀  Setting up TestFlight submission for: ${app.name}`);
         console.log(`   Bundle ID: ${app.iosBundleIdentifier || "(not set)"}\n`);
         console.log("We need your Apple credentials to submit to TestFlight.");
-        console.log("You only do this ONCE — the same credentials work for all your apps.");
-        console.log("Apple requires a special one-time password for scripts — your regular");
+        console.log("You only do this ONCE, the same credentials work for all your apps.");
+        console.log("Apple requires a special one-time password for scripts, your regular");
         console.log("Apple ID password won't work here (Apple blocks it for security).\n");
         // 2. Get Apple ID
         const appleId = await (0, readline_1.readlineSync)("Enter your Apple developer email: ");
@@ -1336,7 +1416,7 @@ Next, generate an app-specific password:
         const appSpecificPassword = await (0, readline_1.readlineSync)("Paste the app-specific password here: ", true);
         if (!appSpecificPassword.match(/^[a-z]{4}-[a-z]{4}-[a-z]{4}-[a-z]{4}$/)) {
             console.log("\n⚠  That doesn't look like the expected format (xxxx-xxxx-xxxx-xxxx).");
-            console.log("   Saving anyway — if the format was wrong the submit step will tell you.\n");
+            console.log("   Saving anyway, if the format was wrong the submit step will tell you.\n");
         }
         // 5. Save credential
         const { data: cred } = await (0, api_1.makeClient)().post(`/ubriot/apps/${opts.app}/credentials`, {
@@ -1346,7 +1426,7 @@ Next, generate an app-specific password:
             payload: { appleId, appSpecificPassword },
         });
         console.log(`\n✅  Apple credentials saved (#${cred.id}).`);
-        console.log(`   These will be used automatically for all your apps — no setup needed for future apps.`);
+        console.log(`   These will be used automatically for all your apps, no setup needed for future apps.`);
         console.log(`\nTo build and submit to TestFlight, run:`);
         console.log(`   ubriot ship ios\n`);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ubriot",
-  "version": "0.2.1",
-  "description": "CI/CD CLI for Expo and React Native — ship iOS, Android, and OTA updates from your terminal.",
+  "version": "0.2.2",
+  "description": "CI/CD CLI for Expo and React Native, ship iOS, Android, and OTA updates from your terminal.",
   "license": "MIT",
   "homepage": "https://ubriot.dev",
   "repository": {