@getbrevo/cli 1.1.0 → 2.0.0

package/dist/commands/app/update.js

@@ -48,196 +48,230 @@ const container_1 = require("../../container");
 const ui_1 = require("../../lib/ui");
 const config_1 = require("../../lib/config");
 const validators_1 = require("../../lib/validators");
+const constants_1 = require("../../lib/constants");
 const inquirer_1 = __importDefault(require("inquirer"));
-exports.updateCommand = (0, command_handler_1.withCommandHandler)(async (options) => {
-    const config = (0, config_1.readProjectConfig)();
-    const hasFlags = !!(options.name !== undefined ||
-        (options.redirectUri && options.redirectUri.length > 0) ||
-        options.logoUri !== undefined ||
-        (options.scope && options.scope.length > 0));
-    // Validate --name if provided (even empty strings)
-    if (options.name !== undefined) {
-        const nameCheck = (0, validators_1.validateAppName)(options.name);
-        if (nameCheck !== true)
-            throw new errors_1.CliError(nameCheck);
+const NON_INTERACTIVE_CONFIRM_ERROR = 'Cannot prompt for confirmation in non-interactive mode. Use --yes or --json to skip.';
+// File exists but readProjectConfig returned null — invalid JSON or missing appId
+function assertConfigFileUsable() {
+    const configPath = path.resolve(process.cwd(), 'app-config.json');
+    if (!fs.existsSync(configPath))
+        return;
+    let raw;
+    try {
+        raw = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
     }
-    // readProjectConfig normalizes appId (trim + coerce finite numbers, reject
-    // empty) so `config.appId` is a guaranteed non-empty string whenever `config`
-    // is non-null.
-    const configAppId = config?.appId;
-    const configAppIdValid = !!configAppId;
-    // app-config.json is only usable when it describes the app being updated.
-    // When --app-id differs from config.appId, the local file belongs to a
-    // different app and must not be used as the update payload or merge base.
-    const configMatches = configAppIdValid && (!options.appId || options.appId === configAppId);
-    // No flags and no usable config: emit a specific error.
-    if (!hasFlags && !configMatches) {
-        // File exists but appId is empty/invalid — surface that over a
-        // mismatch error, which would otherwise quote a garbage configAppId.
-        if (config != null && !configAppIdValid) {
-            throw new errors_1.CliError(en_1.messages.APP_UPDATE_INVALID_APP_ID);
-        }
-        if (config != null && options.appId && options.appId !== configAppId) {
-            throw new errors_1.CliError(en_1.messages.APP_UPDATE_APP_ID_MISMATCH(options.appId, configAppId));
-        }
-        const configExists = fs.existsSync(path.resolve(process.cwd(), 'app-config.json'));
-        if (configExists) {
-            // File exists but readProjectConfig returned null — invalid JSON or missing appId
-            let raw;
-            try {
-                raw = JSON.parse(fs.readFileSync(path.resolve(process.cwd(), 'app-config.json'), 'utf-8'));
-            }
-            catch {
-                throw new errors_1.CliError(en_1.messages.APP_UPDATE_INVALID_JSON);
-            }
-            if (!raw ||
-                typeof raw !== 'object' ||
-                !('appId' in raw) ||
-                !raw.appId) {
-                throw new errors_1.CliError(en_1.messages.APP_UPDATE_MISSING_APP_ID);
-            }
-        }
-        throw new errors_1.CliError(en_1.messages.APP_UPDATE_NOTHING_TO_UPDATE);
+    catch {
+        throw new errors_1.CliError(en_1.messages.APP_UPDATE_INVALID_JSON);
     }
-    // Resolve appId: flag > config
-    let appId;
-    if (options.appId) {
-        appId = options.appId;
+    if (!raw ||
+        typeof raw !== 'object' ||
+        !('appId' in raw) ||
+        !raw.appId) {
+        throw new errors_1.CliError(en_1.messages.APP_UPDATE_MISSING_APP_ID);
     }
-    else if (configAppIdValid) {
-        appId = configAppId;
+}
+// No flags and no usable config: emit a specific error.
+function throwNoUpdateSource(config, configAppIdValid, configAppId, flagAppId) {
+    // File exists but appId is empty/invalid — surface that over a
+    // mismatch error, which would otherwise quote a garbage configAppId.
+    if (config != null && !configAppIdValid) {
+        throw new errors_1.CliError(en_1.messages.APP_UPDATE_INVALID_APP_ID);
+    }
+    if (config != null && flagAppId && flagAppId !== configAppId) {
+        throw new errors_1.CliError(en_1.messages.APP_UPDATE_APP_ID_MISMATCH(flagAppId, configAppId));
     }
-    else if (config) {
+    assertConfigFileUsable();
+    throw new errors_1.CliError(en_1.messages.APP_UPDATE_NOTHING_TO_UPDATE);
+}
+// Resolve appId: flag > config
+function resolveAppId(flagAppId, configAppId, config) {
+    if (flagAppId)
+        return flagAppId;
+    if (configAppId)
+        return configAppId;
+    if (config)
         throw new errors_1.CliError(en_1.messages.APP_UPDATE_INVALID_APP_ID);
+    throw new errors_1.CliError(en_1.messages.APP_UPDATE_NO_APP_RESOLVED);
+}
+async function confirmUpdate() {
+    const { confirmed } = await inquirer_1.default.prompt([
+        {
+            type: 'confirm',
+            name: 'confirmed',
+            message: en_1.messages.APP_UPDATE_CONFIRM,
+            default: true,
+        },
+    ]);
+    if (!confirmed) {
+        (0, logger_1.logInfo)(`\n  ${en_1.messages.APP_UPDATE_CANCELLED}\n`);
+        return false;
     }
-    if (!appId) {
-        throw new errors_1.CliError(en_1.messages.APP_UPDATE_NO_APP_RESOLVED);
+    return true;
+}
+function reportUpdateResult(params, jsonMode) {
+    if (jsonMode) {
+        (0, json_output_1.jsonOutput)({
+            app_id: params.appId,
+            name: params.name,
+            redirect_uris: params.redirectUris,
+            scopes: params.scopes,
+            ...(params.logoUri ? { logo_uri: params.logoUri } : {}),
+        });
+        return;
     }
-    // Write back only when config describes the app being updated.
-    const shouldWriteBack = configMatches;
-    // No flags provided: push full config from app-config.json.
-    // (config is guaranteed non-null here — the !hasFlags && !config case is handled above)
-    if (!hasFlags) {
-        const redirectUrls = config.auth?.redirectUrls;
-        if (!redirectUrls || redirectUrls.length === 0) {
-            throw new errors_1.CliError(en_1.messages.APP_UPDATE_NO_REDIRECT_URLS);
-        }
-        validateRedirectUrls(redirectUrls);
-        const nextScopes = config.auth?.scopes ?? [];
-        (0, validators_1.validateScopes)(nextScopes);
-        if (!options.json) {
-            // Fail fast before the network fetch when we'd have nowhere to show the diff.
-            if (!options.yes && !process.stdin.isTTY) {
-                throw new errors_1.CliError('Cannot prompt for confirmation in non-interactive mode. Use --yes or --json to skip.');
-            }
-            // Fetch current remote state so the summary can show deltas vs. what the
-            // push will apply. Hard-fail on fetch error — the user asked for a diff.
-            const remote = await fetchExistingApp(appId, options.json);
-            renderUpdateSummary({
-                appId,
-                currentName: remote.name,
-                nextName: config.appName,
-                currentUrls: remote.redirect_uris ?? [],
-                nextUrls: redirectUrls,
-                currentLogoUri: remote.logo_uri,
-                nextLogoUri: config.logoUri,
-                currentScopes: remote.scopes ?? [],
-                nextScopes,
-            });
-        }
-        if (!options.json && !options.yes) {
-            const { confirmed } = await inquirer_1.default.prompt([
-                {
-                    type: 'confirm',
-                    name: 'confirmed',
-                    message: en_1.messages.APP_UPDATE_CONFIRM,
-                    default: true,
-                },
-            ]);
-            if (!confirmed) {
-                (0, logger_1.logInfo)(`\n  ${en_1.messages.APP_UPDATE_CANCELLED}\n`);
-                return;
-            }
+    (0, logger_1.logSuccess)(en_1.messages.APP_UPDATE_SUCCESS);
+    if (params.name) {
+        (0, logger_1.logInfo)(`  Name:          ${params.name}`);
+    }
+    (0, logger_1.logInfo)(`  Redirect URLs: ${params.redirectUris.length > 0 ? params.redirectUris.join(', ') : '(none)'}`);
+    (0, logger_1.logInfo)(`  Scopes:        ${params.scopes.length > 0 ? params.scopes.join(', ') : '(none)'}`);
+    if (params.logoUri) {
+        (0, logger_1.logInfo)(`  Logo URL:      ${params.logoUri}`);
+    }
+    if (params.configWrittenBack) {
+        (0, logger_1.logInfo)('  app-config.json updated.');
+    }
+    process.stdout.write('\n');
+}
+// No flags provided: push full config from app-config.json.
+async function pushFullConfig(appId, config, options) {
+    const redirectUrls = config.auth?.redirectUrls;
+    if (!redirectUrls || redirectUrls.length === 0) {
+        throw new errors_1.CliError(en_1.messages.APP_UPDATE_NO_REDIRECT_URLS);
+    }
+    validateRedirectUrls(redirectUrls);
+    const nextScopes = config.auth?.scopes ?? [];
+    (0, validators_1.validateScopes)(nextScopes);
+    // The legacy 'all' scope is deprecated — block the push and point at the
+    // migration path (--scope). No silent rewrite, no escape hatch (BEX-214).
+    if ((0, validators_1.containsLegacyAllScope)(nextScopes)) {
+        throw new errors_1.CliError(en_1.messages.LEGACY_ALL_SCOPE_DEPRECATED_BLOCK);
+    }
+    if (!options.json) {
+        // Fail fast before the network fetch when we'd have nowhere to show the diff.
+        if (!options.yes && !process.stdin.isTTY) {
+            throw new errors_1.CliError(NON_INTERACTIVE_CONFIRM_ERROR);
         }
-        const spinner = (0, ui_1.createSpinner)('Updating app...', { silent: options.json });
-        await container_1.appService.updateApp(appId, {
-            name: config.appName,
-            redirect_uris: redirectUrls,
-            scopes: nextScopes,
-            ...(config.logoUri ? { logo_uri: config.logoUri } : {}),
+        // Fetch current remote state so the summary can show deltas vs. what the
+        // push will apply. Hard-fail on fetch error — the user asked for a diff.
+        const remote = await fetchExistingApp(appId, options.json);
+        renderUpdateSummary({
+            appId,
+            currentName: remote.name,
+            nextName: config.appName,
+            currentUrls: remote.redirect_uris ?? [],
+            nextUrls: redirectUrls,
+            currentLogoUri: remote.logo_uri,
+            nextLogoUri: config.logoUri,
+            currentScopes: remote.scopes ?? [],
+            nextScopes,
         });
-        spinner.stop();
-        if (config.appName)
-            (0, config_1.saveAppName)(appId, config.appName);
-        if (options.json) {
-            (0, json_output_1.jsonOutput)({
-                app_id: appId,
-                name: config.appName,
-                redirect_uris: redirectUrls,
-                scopes: nextScopes,
-                ...(config.logoUri ? { logo_uri: config.logoUri } : {}),
-            });
-            return;
-        }
-        (0, logger_1.logSuccess)(en_1.messages.APP_UPDATE_SUCCESS);
-        if (config.appName) {
-            (0, logger_1.logInfo)(`  Name:          ${config.appName}`);
-        }
-        (0, logger_1.logInfo)(`  Redirect URLs: ${redirectUrls.join(', ')}`);
-        (0, logger_1.logInfo)(`  Scopes:        ${nextScopes.length > 0 ? nextScopes.join(', ') : '(none)'}`);
-        if (config.logoUri) {
-            (0, logger_1.logInfo)(`  Logo URL:      ${config.logoUri}`);
-        }
-        process.stdout.write('\n');
+    }
+    if (!options.json && !options.yes && !(await confirmUpdate())) {
         return;
     }
-    // Flags provided: merge with existing values
-    let existingName;
-    let existingRedirectUrls = [];
-    let existingLogoUri;
-    let existingScopes = [];
+    const spinner = (0, ui_1.createSpinner)('Updating app...', { silent: options.json });
+    await container_1.appService.updateApp(appId, {
+        name: config.appName,
+        redirect_uris: redirectUrls,
+        scopes: nextScopes,
+        ...(config.logoUri ? { logo_uri: config.logoUri } : {}),
+    });
+    spinner.stop();
+    if (config.appName)
+        (0, config_1.saveAppName)(appId, config.appName);
+    reportUpdateResult({
+        appId,
+        name: config.appName,
+        redirectUris: redirectUrls,
+        scopes: nextScopes,
+        logoUri: config.logoUri,
+    }, options.json);
+}
+async function resolveExistingState(appId, config, shouldWriteBack, silent) {
     const configRedirectUrls = config?.auth?.redirectUrls;
     const hasUsableConfigRedirectUrls = Array.isArray(configRedirectUrls) && configRedirectUrls.length > 0;
     if (config && shouldWriteBack && hasUsableConfigRedirectUrls) {
         // Use config as baseline only when it can safely preserve redirect URLs
-        existingName = config.appName;
-        existingRedirectUrls = configRedirectUrls;
-        existingLogoUri = config.logoUri;
-        existingScopes = config.auth?.scopes ?? [];
+        return {
+            name: config.appName,
+            redirectUrls: configRedirectUrls,
+            logoUri: config.logoUri,
+            scopes: config.auth?.scopes ?? [],
+        };
     }
-    else if (config && shouldWriteBack) {
+    if (config && shouldWriteBack) {
         // Config matches the app, but missing/empty redirect URLs would otherwise clear
         // remote redirect URIs on a name-only update. Fall back to the API for preservation.
-        const app = await fetchExistingApp(appId, options.json);
-        existingName = config.appName ?? app.name;
-        existingRedirectUrls = app.redirect_uris ?? [];
-        existingLogoUri = config.logoUri ?? app.logo_uri;
-        existingScopes = config.auth?.scopes ?? app.scopes ?? [];
-    }
-    else {
-        const app = await fetchExistingApp(appId, options.json);
-        existingName = app.name;
-        existingRedirectUrls = app.redirect_uris ?? [];
-        existingLogoUri = app.logo_uri;
-        existingScopes = app.scopes ?? [];
+        const app = await fetchExistingApp(appId, silent);
+        return {
+            name: config.appName ?? app.name,
+            redirectUrls: app.redirect_uris ?? [],
+            logoUri: config.logoUri ?? app.logo_uri,
+            scopes: config.auth?.scopes ?? app.scopes ?? [],
+        };
     }
-    // Merge: --name wins, --redirect-uri appends (deduplicated), --logo-uri wins
-    const finalName = options.name ?? existingName;
-    const appendedUrls = options.redirectUri ?? [];
-    const mergedUrls = [...existingRedirectUrls];
-    for (const url of appendedUrls) {
-        if (!mergedUrls.includes(url)) {
-            mergedUrls.push(url);
+    const app = await fetchExistingApp(appId, silent);
+    return {
+        name: app.name,
+        redirectUrls: app.redirect_uris ?? [],
+        logoUri: app.logo_uri,
+        scopes: app.scopes ?? [],
+    };
+}
+function appendUnique(existing, additions) {
+    const merged = [...existing];
+    for (const item of additions) {
+        if (!merged.includes(item)) {
+            merged.push(item);
         }
     }
-    const finalLogoUri = options.logoUri ?? existingLogoUri;
-    const appendedScopes = options.scope ?? [];
-    const mergedScopes = [...existingScopes];
-    for (const s of appendedScopes) {
-        if (!mergedScopes.includes(s)) {
-            mergedScopes.push(s);
-        }
+    return merged;
+}
+// Passing --scope signals migration intent: drop the deprecated legacy 'all'
+// scope from the merge baseline so the outgoing payload is clean (BEX-214).
+function mergeScopes(existingScopes, appendedScopes) {
+    const hasScopeFlag = appendedScopes.length > 0;
+    const migratingLegacyScopes = hasScopeFlag && (0, validators_1.containsLegacyAllScope)(existingScopes);
+    const baseline = migratingLegacyScopes
+        ? existingScopes.filter((s) => s !== constants_1.LEGACY_ALL_SCOPE)
+        : existingScopes;
+    const mergedScopes = appendUnique(baseline, appendedScopes);
+    // Block any outgoing payload that still carries 'all' — either no --scope
+    // was passed (no migration intent), or 'all' was explicitly re-added.
+    if ((0, validators_1.containsLegacyAllScope)(mergedScopes)) {
+        throw new errors_1.CliError(en_1.messages.LEGACY_ALL_SCOPE_DEPRECATED_BLOCK);
+    }
+    return { mergedScopes, migratingLegacyScopes };
+}
+// Write back to app-config.json if appropriate
+function writeBackProjectConfig(config, shouldWriteBack, options, mergedUrls, mergedScopes) {
+    if (!shouldWriteBack || !config) {
+        return false;
     }
+    const updatedConfig = { ...config };
+    if (options.name) {
+        updatedConfig.appName = options.name;
+    }
+    if (options.logoUri) {
+        updatedConfig.logoUri = options.logoUri;
+    }
+    updatedConfig.auth = {
+        ...updatedConfig.auth,
+        redirectUrls: mergedUrls,
+        scopes: mergedScopes,
+    };
+    (0, config_1.writeProjectConfig)(updatedConfig);
+    return true;
+}
+// Flags provided: merge with existing values
+async function updateWithFlags(appId, config, shouldWriteBack, options) {
+    const existing = await resolveExistingState(appId, config, shouldWriteBack, options.json);
+    // Merge: --name wins, --redirect-uri appends (deduplicated), --logo-uri wins
+    const finalName = options.name ?? existing.name;
+    const mergedUrls = appendUnique(existing.redirectUrls, options.redirectUri ?? []);
+    const finalLogoUri = options.logoUri ?? existing.logoUri;
+    const { mergedScopes, migratingLegacyScopes } = mergeScopes(existing.scopes, options.scope ?? []);
     const hasRedirectUriFlag = options.redirectUri !== undefined;
     if (hasRedirectUriFlag && mergedUrls.length === 0) {
         throw new errors_1.CliError(en_1.messages.APP_UPDATE_NO_REDIRECT_URLS);
@@ -249,30 +283,22 @@ exports.updateCommand = (0, command_handler_1.withCommandHandler)(async (options
     if (!options.json) {
         renderUpdateSummary({
             appId,
-            currentName: existingName,
+            currentName: existing.name,
             nextName: finalName,
-            currentUrls: existingRedirectUrls,
+            currentUrls: existing.redirectUrls,
             nextUrls: mergedUrls,
-            currentLogoUri: existingLogoUri,
+            currentLogoUri: existing.logoUri,
             nextLogoUri: finalLogoUri,
-            currentScopes: existingScopes,
+            currentScopes: existing.scopes,
             nextScopes: mergedScopes,
+            migratingLegacyScopes,
         });
     }
     if (!options.json && !options.yes) {
         if (!process.stdin.isTTY) {
-            throw new errors_1.CliError('Cannot prompt for confirmation in non-interactive mode. Use --yes or --json to skip.');
+            throw new errors_1.CliError(NON_INTERACTIVE_CONFIRM_ERROR);
         }
-        const { confirmed } = await inquirer_1.default.prompt([
-            {
-                type: 'confirm',
-                name: 'confirmed',
-                message: en_1.messages.APP_UPDATE_CONFIRM,
-                default: true,
-            },
-        ]);
-        if (!confirmed) {
-            (0, logger_1.logInfo)(`\n  ${en_1.messages.APP_UPDATE_CANCELLED}\n`);
+        if (!(await confirmUpdate())) {
             return;
         }
     }
@@ -286,45 +312,49 @@ exports.updateCommand = (0, command_handler_1.withCommandHandler)(async (options
     spinner.stop();
     if (finalName)
         (0, config_1.saveAppName)(appId, finalName);
-    // Write back to app-config.json if appropriate
-    if (shouldWriteBack && config) {
-        const updatedConfig = { ...config };
-        if (options.name) {
-            updatedConfig.appName = options.name;
-        }
-        if (options.logoUri) {
-            updatedConfig.logoUri = options.logoUri;
-        }
-        updatedConfig.auth = {
-            ...updatedConfig.auth,
-            redirectUrls: mergedUrls,
-            scopes: mergedScopes,
-        };
-        (0, config_1.writeProjectConfig)(updatedConfig);
-    }
-    if (options.json) {
-        (0, json_output_1.jsonOutput)({
-            app_id: appId,
-            name: finalName,
-            redirect_uris: mergedUrls,
-            scopes: mergedScopes,
-            ...(finalLogoUri ? { logo_uri: finalLogoUri } : {}),
-        });
-        return;
-    }
-    (0, logger_1.logSuccess)(en_1.messages.APP_UPDATE_SUCCESS);
-    if (finalName) {
-        (0, logger_1.logInfo)(`  Name:          ${finalName}`);
+    const configWrittenBack = writeBackProjectConfig(config, shouldWriteBack, options, mergedUrls, mergedScopes);
+    reportUpdateResult({
+        appId,
+        name: finalName,
+        redirectUris: mergedUrls,
+        scopes: mergedScopes,
+        logoUri: finalLogoUri,
+        configWrittenBack,
+    }, options.json);
+}
+exports.updateCommand = (0, command_handler_1.withCommandHandler)(async (options) => {
+    const config = (0, config_1.readProjectConfig)();
+    const hasFlags = !!(options.name !== undefined ||
+        (options.redirectUri && options.redirectUri.length > 0) ||
+        options.logoUri !== undefined ||
+        (options.scope && options.scope.length > 0));
+    // Validate --name if provided (even empty strings)
+    if (options.name !== undefined) {
+        const nameCheck = (0, validators_1.validateAppName)(options.name);
+        if (nameCheck !== true)
+            throw new errors_1.CliError(nameCheck);
     }
-    (0, logger_1.logInfo)(`  Redirect URLs: ${mergedUrls.length > 0 ? mergedUrls.join(', ') : '(none)'}`);
-    (0, logger_1.logInfo)(`  Scopes:        ${mergedScopes.length > 0 ? mergedScopes.join(', ') : '(none)'}`);
-    if (finalLogoUri) {
-        (0, logger_1.logInfo)(`  Logo URL:      ${finalLogoUri}`);
+    // readProjectConfig normalizes appId (trim + coerce finite numbers, reject
+    // empty) so `config.appId` is a guaranteed non-empty string whenever `config`
+    // is non-null.
+    const configAppId = config?.appId;
+    const configAppIdValid = !!configAppId;
+    // app-config.json is only usable when it describes the app being updated.
+    // When --app-id differs from config.appId, the local file belongs to a
+    // different app and must not be used as the update payload or merge base.
+    const configMatches = configAppIdValid && (!options.appId || options.appId === configAppId);
+    if (!hasFlags && !configMatches) {
+        throwNoUpdateSource(config, configAppIdValid, configAppId, options.appId);
     }
-    if (shouldWriteBack && config) {
-        (0, logger_1.logInfo)('  app-config.json updated.');
+    const appId = resolveAppId(options.appId, configAppId, config);
+    // Write back only when config describes the app being updated.
+    const shouldWriteBack = configMatches;
+    if (!hasFlags) {
+        // config is guaranteed non-null here — the !hasFlags && !configMatches case throws above
+        await pushFullConfig(appId, config, options);
+        return;
     }
-    process.stdout.write('\n');
+    await updateWithFlags(appId, config, shouldWriteBack, options);
 });
 async function fetchExistingApp(appId, silent) {
     const spinner = (0, ui_1.createSpinner)('Fetching app...', { silent });
@@ -340,59 +370,60 @@ async function fetchExistingApp(appId, silent) {
     }
     return app;
 }
-function renderUpdateSummary(params) {
-    const { appId, currentName, nextName, currentUrls, nextUrls, currentLogoUri, nextLogoUri, currentScopes, nextScopes, } = params;
-    const currentSet = new Set(currentUrls);
-    const nextSet = new Set(nextUrls);
-    const addedSet = new Set(nextUrls.filter((u) => !currentSet.has(u)));
-    const removed = currentUrls.filter((u) => !nextSet.has(u));
-    (0, logger_1.logInfo)('');
-    (0, logger_1.logInfo)(`  ${en_1.messages.APP_UPDATE_SUMMARY}`);
-    (0, logger_1.logInfo)(`  App ID:        ${appId}`);
-    if (nextName) {
-        if (currentName && currentName !== nextName) {
-            (0, logger_1.logInfo)(`  Name:          ${currentName} → ${nextName}`);
-        }
-        else {
-            (0, logger_1.logInfo)(`  Name:          ${nextName}`);
-        }
-    }
-    const lines = [
-        ...nextUrls.map((u) => (addedSet.has(u) ? `${u} (new)` : u)),
-        ...removed.map((u) => `${u} (removed)`),
+// Diff `current` vs `next`: next values keep their order (tagged `(new)` when
+// absent from current), values dropped from current trail with `(removed)`.
+function diffLines(current, next) {
+    const currentSet = new Set(current);
+    const nextSet = new Set(next);
+    return [
+        ...next.map((v) => (currentSet.has(v) ? v : `${v} (new)`)),
+        ...current.filter((v) => !nextSet.has(v)).map((v) => `${v} (removed)`),
     ];
+}
+// Print a labelled block; continuation lines are indented to align under the
+// first value.
+function logAligned(label, lines) {
     lines.forEach((line, i) => {
-        const prefix = i === 0 ? '  Redirect URLs: ' : '                 ';
-        (0, logger_1.logInfo)(`${prefix}${line}`);
+        (0, logger_1.logInfo)(`${i === 0 ? label : '                 '}${line}`);
     });
-    if (nextScopes !== undefined) {
-        const currentScopesSet = new Set(currentScopes ?? []);
-        const nextScopesSet = new Set(nextScopes);
-        const addedScopes = new Set(nextScopes.filter((s) => !currentScopesSet.has(s)));
-        const removedScopes = (currentScopes ?? []).filter((s) => !nextScopesSet.has(s));
-        const scopeLines = nextScopes.length === 0 && removedScopes.length === 0
-            ? ['(none)']
-            : [
-                ...nextScopes.map((s) => (addedScopes.has(s) ? `${s} (new)` : s)),
-                ...removedScopes.map((s) => `${s} (removed)`),
-            ];
-        scopeLines.forEach((line, i) => {
-            const prefix = i === 0 ? '  Scopes:        ' : '                 ';
-            (0, logger_1.logInfo)(`${prefix}${line}`);
-        });
+}
+function renderNameLine(currentName, nextName) {
+    if (!nextName) {
+        return;
     }
-    if (currentLogoUri || nextLogoUri) {
-        const label = '  Logo URL:      ';
-        if (currentLogoUri && nextLogoUri && currentLogoUri !== nextLogoUri) {
-            (0, logger_1.logInfo)(`${label}${currentLogoUri} → ${nextLogoUri}`);
-        }
-        else if (nextLogoUri) {
-            (0, logger_1.logInfo)(`${label}${nextLogoUri}`);
-        }
-        else if (currentLogoUri) {
-            (0, logger_1.logInfo)(`${label}${currentLogoUri} (unchanged)`);
-        }
+    const renamePrefix = currentName && currentName !== nextName ? `${currentName} → ` : '';
+    (0, logger_1.logInfo)(`  Name:          ${renamePrefix}${nextName}`);
+}
+function renderScopeLines(currentScopes, nextScopes) {
+    if (nextScopes === undefined) {
+        return;
+    }
+    const lines = diffLines(currentScopes ?? [], nextScopes);
+    logAligned('  Scopes:        ', lines.length > 0 ? lines : ['(none)']);
+}
+function renderLogoLine(currentLogoUri, nextLogoUri) {
+    const label = '  Logo URL:      ';
+    if (currentLogoUri && nextLogoUri && currentLogoUri !== nextLogoUri) {
+        (0, logger_1.logInfo)(`${label}${currentLogoUri} → ${nextLogoUri}`);
+    }
+    else if (nextLogoUri) {
+        (0, logger_1.logInfo)(`${label}${nextLogoUri}`);
+    }
+    else if (currentLogoUri) {
+        (0, logger_1.logInfo)(`${label}${currentLogoUri} (unchanged)`);
+    }
+}
+function renderUpdateSummary(params) {
+    (0, logger_1.logInfo)('');
+    (0, logger_1.logInfo)(`  ${en_1.messages.APP_UPDATE_SUMMARY}`);
+    (0, logger_1.logInfo)(`  App ID:        ${params.appId}`);
+    renderNameLine(params.currentName, params.nextName);
+    logAligned('  Redirect URLs: ', diffLines(params.currentUrls, params.nextUrls));
+    if (params.migratingLegacyScopes) {
+        (0, logger_1.logInfo)(`  ${en_1.messages.LEGACY_ALL_SCOPE_UPDATE_MIGRATING}`);
     }
+    renderScopeLines(params.currentScopes, params.nextScopes);
+    renderLogoLine(params.currentLogoUri, params.nextLogoUri);
     (0, logger_1.logInfo)('');
 }
 function validateRedirectUrls(urls) {