@signageos/cli 4.0.3 → 4.0.5

package/.env.production

@@ -0,0 +1,7 @@
+SOS_DEFAULT_API_URL=https://api.signageos.io
+SOS_DEFAULT_BOX_HOST=box.signageos.io
+SOS_DEFAULT_FORWARD_SERVER_URL=https://forward.signageos.io
+SOS_DEFAULT_AUTH0_DOMAIN=auth0.signageos.io
+SOS_DEFAULT_AUTH0_CLIENT_ID=8AU8D3zJ4mK8gszZP3gZO0nv9DusSNjV
+SOS_DEFAULT_AUTH0_AUDIENCE=https://sos-production.us.auth0.com/api/v2/
+SOS_DEFAULT_AUTH0_SCOPE=openid profile email offline_access

package/README.md

@@ -80,6 +80,42 @@ identification=xxxxxxxxxxxxxxxxxxxx
 apiSecurityToken=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ```
 
+#### Custom deployment
+
+When connecting to a non-default signageOS deployment, use the `--interactive-profile` flag during login. This will interactively prompt for connection settings:
+
+```bash
+sos login --interactive-profile
+# You will be prompted to enter:
+#   Server API URL: https://api.example.com
+#   Box URL: box.example.com
+#   Auth0 domain: auth0.example.com
+#   Auth0 client ID: <your-client-id>
+#   Auth0 audience: https://auth0.example.com/api/v2/
+```
+
+The settings are saved to `~/.sosrc` and used for all subsequent commands automatically.
+
+Alternatively, you can configure the settings directly in `~/.sosrc`:
+```ini
+apiUrl=https://api.example.com
+boxUrl=box.example.com
+auth0Domain=auth0.example.com
+auth0ClientId=<your-client-id>
+auth0Audience=https://auth0.example.com/api/v2/
+```
+
+All settings can also be overridden with environment variables (useful for CI/CD):
+
+| Environment Variable | Config Field |
+|---------------------|---------------|
+| `SOS_API_URL` | `apiUrl` |
+| `SOS_BOX_HOST` | `boxUrl` |
+| `SOS_AUTH0_DOMAIN` | `auth0Domain` |
+| `SOS_AUTH0_CLIENT_ID` | `auth0ClientId` |
+| `SOS_AUTH0_AUDIENCE` | `auth0Audience` |
+| `SOS_AUTH0_SCOPE` | `auth0Scope` |
+
 ### Applet
 ```bash
 sos applet --help

package/dist/Applet/Build/appletBuildCommand.js

@@ -17,7 +17,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const commandDefinition_1 = require("../../Command/commandDefinition");
 const organizationFacade_1 = require("../../Organization/organizationFacade");
 const helper_1 = require("../../helper");
-const dist_1 = require("@signageos/sdk/dist");
+const developmentFactory_1 = require("../../Development/developmentFactory");
 const appletFacade_1 = require("../appletFacade");
 const log_1 = require("@signageos/sdk/dist/Console/log");
 const debug_1 = __importDefault(require("debug"));
@@ -63,7 +63,7 @@ exports.appletBuild = (0, commandDefinition_1.createCommandDefinition)({
             const organization = yield (0, organizationFacade_1.getOrganization)(organizationUid);
             const restApi = yield (0, helper_1.createOrganizationRestApi)(organization);
             const config = yield (0, runControlHelper_1.loadConfig)();
-            const dev = (0, dist_1.createDevelopment)({
+            const dev = (0, developmentFactory_1.createDevelopmentWithOptions)({
                 organizationUid: organization.uid,
                 url: (0, helper_1.getApiUrl)(config),
                 accessToken: config.accessToken,

package/dist/Applet/Start/appletStartCommand.js

@@ -19,7 +19,7 @@ const appletUploadCommandHelper_1 = require("../Upload/appletUploadCommandHelper
 const emulatorFacade_1 = require("../../Emulator/emulatorFacade");
 const commandDefinition_1 = require("../../Command/commandDefinition");
 const organizationFacade_1 = require("../../Organization/organizationFacade");
-const dist_1 = require("@signageos/sdk/dist");
+const developmentFactory_1 = require("../../Development/developmentFactory");
 const wait_1 = __importDefault(require("../../Timer/wait"));
 const runControlHelper_1 = require("../../RunControl/runControlHelper");
 const helper_1 = require("../../helper");
@@ -105,7 +105,7 @@ exports.appletStart = (0, commandDefinition_1.createCommandDefinition)({
             const entryFileRelativePath = (0, appletUploadCommandHelper_1.getAppletEntryFileRelativePath)(entryFileAbsolutePath, appletPath);
             const emulatorUid = yield (0, emulatorFacade_1.loadEmulatorOrCreateNewAndReturnUid)(organizationUid);
             const config = yield (0, runControlHelper_1.loadConfig)();
-            const dev = (0, dist_1.createDevelopment)({
+            const dev = (0, developmentFactory_1.createDevelopmentWithOptions)({
                 organizationUid,
                 url: (0, helper_1.getApiUrl)(config),
                 accessToken: config.accessToken,

package/dist/Applet/Upload/appletUploadCommand.js

@@ -61,7 +61,7 @@ const packageConfig_1 = require("@signageos/sdk/dist/FileSystem/packageConfig");
 const commandDefinition_1 = require("../../Command/commandDefinition");
 const appletErrors_1 = require("../appletErrors");
 const log_1 = require("@signageos/sdk/dist/Console/log");
-const sdk_1 = require("@signageos/sdk");
+const AppletFilesManagement_1 = require("@signageos/sdk/dist/Development/Applet/Files/AppletFilesManagement");
 const GatewayError_1 = __importDefault(require("@signageos/sdk/dist/RestApi/Error/GatewayError"));
 const NotFoundError_1 = __importDefault(require("@signageos/sdk/dist/RestApi/Error/NotFoundError"));
 const appletValidation_1 = require("../appletValidation");
@@ -226,7 +226,8 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
             const allowVerbose = options[verbose];
             const appletFiles = [];
             if (!isSingleFileApplet) {
-                const appletFilePaths = yield sdk_1.dev.applet.files.listAppletFiles({
+                const appletFilesManagement = new AppletFilesManagement_1.AppletFilesManagement();
+                const appletFilePaths = yield appletFilesManagement.listAppletFiles({
                     appletPath: appletDirectoryPath,
                 });
                 yield (0, fileSystem_1.validateAllFormalities)(appletDirectoryPath, appletEntryFilePath, appletFilePaths);

package/dist/Auth/auth0Settings.d.ts

@@ -3,6 +3,11 @@ import { Auth0Settings } from '@signageos/cli-common';
  * Auth0 settings for the signageOS CLI tool (regular API).
  *
  * These connect to the regular signageOS API (not admin API).
- * Override with environment variables for testing or custom Auth0 tenants.
+ * Precedence: SOS_AUTH0_* env var (user-explicit override) > profile field in ~/.sosrc > SOS_DEFAULT_AUTH0_* env var (package default).
  */
 export declare function getAuth0Settings(): Auth0Settings;
+/**
+ * Read the Box URL from the active profile.
+ * Precedence: SOS_BOX_HOST env var (user-explicit override) > profile field in ~/.sosrc > SOS_DEFAULT_BOX_HOST env var (package default).
+ */
+export declare function getBoxUrl(): string;

package/dist/Auth/auth0Settings.js

@@ -1,18 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAuth0Settings = getAuth0Settings;
+exports.getBoxUrl = getBoxUrl;
+const cli_common_1 = require("@signageos/cli-common");
+const globalArgs_1 = require("../Command/globalArgs");
 /**
  * Auth0 settings for the signageOS CLI tool (regular API).
  *
  * These connect to the regular signageOS API (not admin API).
- * Override with environment variables for testing or custom Auth0 tenants.
+ * Precedence: SOS_AUTH0_* env var (user-explicit override) > profile field in ~/.sosrc > SOS_DEFAULT_AUTH0_* env var (package default).
  */
 function getAuth0Settings() {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    const profile = (0, globalArgs_1.getGlobalProfile)();
     return {
-        domain: (_a = process.env.SOS_AUTH0_DOMAIN) !== null && _a !== void 0 ? _a : 'auth0.signageos.io',
-        clientId: (_b = process.env.SOS_AUTH0_CLIENT_ID) !== null && _b !== void 0 ? _b : '8AU8D3zJ4mK8gszZP3gZO0nv9DusSNjV',
-        audience: (_c = process.env.SOS_AUTH0_AUDIENCE) !== null && _c !== void 0 ? _c : 'https://sos-production.us.auth0.com/api/v2/',
-        scope: (_d = process.env.SOS_AUTH0_SCOPE) !== null && _d !== void 0 ? _d : 'openid profile email offline_access',
+        domain: (_c = (_b = (_a = process.env.SOS_AUTH0_DOMAIN) !== null && _a !== void 0 ? _a : (0, cli_common_1.readProfileField)('auth0Domain', profile)) !== null && _b !== void 0 ? _b : process.env.SOS_DEFAULT_AUTH0_DOMAIN) !== null && _c !== void 0 ? _c : '',
+        clientId: (_f = (_e = (_d = process.env.SOS_AUTH0_CLIENT_ID) !== null && _d !== void 0 ? _d : (0, cli_common_1.readProfileField)('auth0ClientId', profile)) !== null && _e !== void 0 ? _e : process.env.SOS_DEFAULT_AUTH0_CLIENT_ID) !== null && _f !== void 0 ? _f : '',
+        audience: (_j = (_h = (_g = process.env.SOS_AUTH0_AUDIENCE) !== null && _g !== void 0 ? _g : (0, cli_common_1.readProfileField)('auth0Audience', profile)) !== null && _h !== void 0 ? _h : process.env.SOS_DEFAULT_AUTH0_AUDIENCE) !== null && _j !== void 0 ? _j : '',
+        scope: (_m = (_l = (_k = process.env.SOS_AUTH0_SCOPE) !== null && _k !== void 0 ? _k : (0, cli_common_1.readProfileField)('auth0Scope', profile)) !== null && _l !== void 0 ? _l : process.env.SOS_DEFAULT_AUTH0_SCOPE) !== null && _m !== void 0 ? _m : '',
     };
 }
+/**
+ * Read the Box URL from the active profile.
+ * Precedence: SOS_BOX_HOST env var (user-explicit override) > profile field in ~/.sosrc > SOS_DEFAULT_BOX_HOST env var (package default).
+ */
+function getBoxUrl() {
+    var _a, _b, _c;
+    const profile = (0, globalArgs_1.getGlobalProfile)();
+    return (_c = (_b = (_a = process.env.SOS_BOX_HOST) !== null && _a !== void 0 ? _a : (0, cli_common_1.readProfileField)('boxUrl', profile)) !== null && _b !== void 0 ? _b : process.env.SOS_DEFAULT_BOX_HOST) !== null && _c !== void 0 ? _c : '';
+}

package/dist/Auth/loginCommand.d.ts

@@ -10,6 +10,9 @@
  * # Interactive login (opens browser for Auth0 authentication)
  * sos login
  *
+ * # Login with custom configuration (prompts for Auth0 and connection settings)
+ * sos login --interactive-profile
+ *
  * # Login with a specific profile
  * sos --profile staging login
  * ```
@@ -19,7 +22,11 @@
 export declare const login: {
     name: "login";
     description: string;
-    optionList: never[];
+    optionList: readonly [{
+        readonly name: "interactive-profile";
+        readonly type: BooleanConstructor;
+        readonly description: "Prompt for custom Auth0 and connection settings (for custom deployments)";
+    }];
     commands: never[];
-    run(): Promise<void>;
+    run(options: import("../Command/commandDefinition").CommandLineOptions<readonly Readonly<Readonly<import("command-line-args").OptionDefinition & import("command-line-usage").OptionDefinition>>[]>): Promise<void>;
 };

package/dist/Auth/loginCommand.js

@@ -17,7 +17,6 @@ const node_child_process_1 = require("node:child_process");
 const node_os_1 = require("node:os");
 const chalk_1 = __importDefault(require("chalk"));
 const prompts_1 = __importDefault(require("prompts"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
 const log_1 = require("@signageos/sdk/dist/Console/log");
 const sosControlHelper_1 = require("@signageos/sdk/dist/SosHelper/sosControlHelper");
 const cli_common_1 = require("@signageos/cli-common");
@@ -37,6 +36,13 @@ function openInBrowser(url) {
         }
     });
 }
+const LOGIN_OPTION_LIST = [
+    {
+        name: 'interactive-profile',
+        type: Boolean,
+        description: 'Prompt for custom Auth0 and connection settings (for custom deployments)',
+    },
+];
 /**
  * Authenticates the user via the Auth0 Device Authorization Flow.
  * Opens a browser-based verification page where the user logs in,
@@ -49,6 +55,9 @@ function openInBrowser(url) {
  * # Interactive login (opens browser for Auth0 authentication)
  * sos login
  *
+ * # Login with custom configuration (prompts for Auth0 and connection settings)
+ * sos login --interactive-profile
+ *
  * # Login with a specific profile
  * sos --profile staging login
  * ```
@@ -58,35 +67,68 @@ function openInBrowser(url) {
 exports.login = (0, commandDefinition_1.createCommandDefinition)({
     name: 'login',
     description: 'Authenticate user with signageOS via Auth0',
-    optionList: [],
+    optionList: LOGIN_OPTION_LIST,
     commands: [],
-    run() {
+    run(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             const profile = (0, globalArgs_1.getGlobalProfile)();
             const configFilePath = (0, sosControlHelper_1.getConfigFilePath)();
-            // Detect a new (non-existent) named profile and prompt for the API URL
-            if (profile) {
-                const exists = (yield fs_extra_1.default.pathExists(configFilePath)) && (0, cli_common_1.profileExists)(profile);
-                if (!exists) {
-                    (0, log_1.log)('info', `Profile "${profile}" does not exist in ${configFilePath}. Please enter the server API URL to create it.`);
-                    const { inputApiUrl } = yield (0, prompts_1.default)({
-                        type: 'text',
-                        name: 'inputApiUrl',
-                        message: 'Server API URL',
-                        initial: 'https://api.signageos.io',
-                        validate: (v) => (v.startsWith('http') ? true : 'Must be a valid URL starting with http'),
-                    });
-                    if (!inputApiUrl) {
-                        throw new Error('API URL is required to log in.');
-                    }
-                    (0, cli_common_1.writeProfileField)('apiUrl', inputApiUrl.replace(/\/+$/, ''), profile);
+            const interactiveProfile = options['interactive-profile'];
+            if (interactiveProfile) {
+                (0, log_1.log)('info', `Setting up custom connection settings in ${configFilePath}.`);
+                const { inputApiUrl } = yield (0, prompts_1.default)({
+                    type: 'text',
+                    name: 'inputApiUrl',
+                    message: 'Server API URL',
+                    initial: (_b = (_a = process.env.SOS_API_URL) !== null && _a !== void 0 ? _a : process.env.SOS_DEFAULT_API_URL) !== null && _b !== void 0 ? _b : 'https://api.signageos.io',
+                    validate: (v) => (v.startsWith('http') ? true : 'Must be a valid URL starting with http'),
+                });
+                if (!inputApiUrl) {
+                    throw new Error('API URL is required to log in.');
+                }
+                (0, cli_common_1.writeProfileField)('apiUrl', inputApiUrl.replace(/\/+$/, ''), profile);
+                const { inputBoxUrl } = yield (0, prompts_1.default)({
+                    type: 'text',
+                    name: 'inputBoxUrl',
+                    message: 'Box URL',
+                    initial: (_d = (_c = process.env.SOS_BOX_HOST) !== null && _c !== void 0 ? _c : process.env.SOS_DEFAULT_BOX_HOST) !== null && _d !== void 0 ? _d : 'box.signageos.io',
+                });
+                if (inputBoxUrl) {
+                    (0, cli_common_1.writeProfileField)('boxUrl', inputBoxUrl.replace(/\/+$/, ''), profile);
+                }
+                const { inputAuth0Domain } = yield (0, prompts_1.default)({
+                    type: 'text',
+                    name: 'inputAuth0Domain',
+                    message: 'Auth0 domain',
+                    initial: (_f = (_e = process.env.SOS_AUTH0_DOMAIN) !== null && _e !== void 0 ? _e : process.env.SOS_DEFAULT_AUTH0_DOMAIN) !== null && _f !== void 0 ? _f : 'auth0.signageos.io',
+                });
+                if (inputAuth0Domain) {
+                    (0, cli_common_1.writeProfileField)('auth0Domain', inputAuth0Domain, profile);
+                }
+                const { inputAuth0ClientId } = yield (0, prompts_1.default)({
+                    type: 'text',
+                    name: 'inputAuth0ClientId',
+                    message: 'Auth0 client ID',
+                    initial: (_h = (_g = process.env.SOS_AUTH0_CLIENT_ID) !== null && _g !== void 0 ? _g : process.env.SOS_DEFAULT_AUTH0_CLIENT_ID) !== null && _h !== void 0 ? _h : '',
+                });
+                if (inputAuth0ClientId) {
+                    (0, cli_common_1.writeProfileField)('auth0ClientId', inputAuth0ClientId, profile);
+                }
+                const { inputAuth0Audience } = yield (0, prompts_1.default)({
+                    type: 'text',
+                    name: 'inputAuth0Audience',
+                    message: 'Auth0 audience',
+                    initial: (_k = (_j = process.env.SOS_AUTH0_AUDIENCE) !== null && _j !== void 0 ? _j : process.env.SOS_DEFAULT_AUTH0_AUDIENCE) !== null && _k !== void 0 ? _k : '',
+                });
+                if (inputAuth0Audience) {
+                    (0, cli_common_1.writeProfileField)('auth0Audience', inputAuth0Audience, profile);
                 }
             }
             const auth0 = (0, auth0Settings_1.getAuth0Settings)();
             (0, log_1.log)('info', 'Starting Auth0 Device Authorization Flow...');
             const deviceCode = yield (0, cli_common_1.requestDeviceCode)(auth0);
-            const verificationUrl = (_a = deviceCode.verification_uri_complete) !== null && _a !== void 0 ? _a : deviceCode.verification_uri;
+            const verificationUrl = (_l = deviceCode.verification_uri_complete) !== null && _l !== void 0 ? _l : deviceCode.verification_uri;
             // Try to open the verification URL in the default browser
             openInBrowser(verificationUrl);
             console.info('');

package/dist/Development/developmentFactory.d.ts

@@ -0,0 +1,12 @@
+import { Development } from '@signageos/sdk/dist/Development/Development';
+export interface IDevelopmentFactoryOptions {
+    url: string;
+    accessToken?: string;
+    organizationUid?: string;
+}
+/**
+ * Creates a Development instance using deep SDK imports only.
+ * Does NOT touch the SDK barrel or its implicit parameters.
+ * All configuration is passed explicitly.
+ */
+export declare function createDevelopmentWithOptions(opts: IDevelopmentFactoryOptions): Development;

package/dist/Development/developmentFactory.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDevelopmentWithOptions = createDevelopmentWithOptions;
+const RestApi_1 = __importDefault(require("@signageos/sdk/dist/RestApi/RestApi"));
+const RestApiV2_1 = __importDefault(require("@signageos/sdk/dist/RestApi/RestApiV2"));
+const Development_1 = require("@signageos/sdk/dist/Development/Development");
+const apiVersions_1 = require("@signageos/sdk/dist/RestApi/apiVersions");
+const helper_1 = require("../helper");
+/**
+ * Creates a Development instance using deep SDK imports only.
+ * Does NOT touch the SDK barrel or its implicit parameters.
+ * All configuration is passed explicitly.
+ */
+function createDevelopmentWithOptions(opts) {
+    const auth = opts.accessToken ? { accessToken: opts.accessToken } : { clientId: '', secret: '' };
+    const baseV1 = {
+        url: opts.url,
+        auth,
+        version: apiVersions_1.ApiVersions.V1,
+        clientVersions: (0, helper_1.createClientVersions)(),
+        organizationUid: opts.organizationUid,
+    };
+    const baseV2 = Object.assign(Object.assign({}, baseV1), { version: apiVersions_1.ApiVersions.V2 });
+    const v1 = new RestApi_1.default(baseV1, Object.assign(Object.assign({}, baseV1), { organizationUid: undefined }));
+    const v2 = new RestApiV2_1.default(baseV2, Object.assign(Object.assign({}, baseV2), { organizationUid: undefined }));
+    return new Development_1.Development(v1, v2);
+}

package/dist/Device/Connect/connectCommand.js

@@ -18,7 +18,7 @@ const organizationFacade_1 = require("../../Organization/organizationFacade");
 const appletFacade_1 = require("../../Applet/appletFacade");
 const helper_1 = require("../../helper");
 const commandDefinition_1 = require("../../Command/commandDefinition");
-const sdk_1 = require("@signageos/sdk");
+const developmentFactory_1 = require("../../Development/developmentFactory");
 const wait_1 = __importDefault(require("../../Timer/wait"));
 const runControlHelper_1 = require("../../RunControl/runControlHelper");
 const appletServerHelper_1 = require("../../Applet/appletServerHelper");
@@ -108,7 +108,7 @@ exports.connect = (0, commandDefinition_1.createCommandDefinition)({
             const organization = yield (0, organizationFacade_1.getOrganization)(organizationUid);
             const restApi = yield (0, helper_1.createOrganizationRestApi)(organization);
             const config = yield (0, runControlHelper_1.loadConfig)();
-            const dev = (0, sdk_1.createDevelopment)({
+            const dev = (0, developmentFactory_1.createDevelopmentWithOptions)({
                 organizationUid: organization.uid,
                 url: (0, helper_1.getApiUrl)(config),
                 accessToken: config.accessToken,

package/dist/RunControl/runControlHelper.js

@@ -26,9 +26,12 @@ function loadConfig() {
     return __awaiter(this, void 0, void 0, function* () {
         const profile = (0, globalArgs_1.getGlobalProfile)();
         const config = yield (0, sosControlHelper_1.loadConfig)({ profile });
+        Debug('Loaded base config from .sosrc (profile=%o): apiUrl=%o', profile !== null && profile !== void 0 ? profile : '<default>', config.apiUrl);
         // Override with environment variables if they exist.
-        // When --profile is explicitly given, skip the SOS_API_URL override so the
-        // profile's own apiUrl is used instead of the ambient environment variable.
+        // Note: SOS_API_URL is intentionally NOT applied here — it is resolved together
+        // with --api-url and SOS_DEFAULT_API_URL in helper.getApiUrl(), so the full
+        // precedence chain (cli > SOS_API_URL > .sosrc > SOS_DEFAULT_API_URL) is honored
+        // in a single place.
         const envOverride = {};
         if (process.env.SOS_API_IDENTIFICATION) {
             envOverride.identification = process.env.SOS_API_IDENTIFICATION;
@@ -39,10 +42,9 @@ function loadConfig() {
         if (process.env.SOS_ORGANIZATION_UID) {
             envOverride.defaultOrganizationUid = process.env.SOS_ORGANIZATION_UID;
         }
-        if (process.env.SOS_API_URL && !profile) {
-            envOverride.apiUrl = process.env.SOS_API_URL;
-        }
+        Debug('Env overrides applied: %o', Object.keys(envOverride));
         const finalConfig = Object.assign(Object.assign({}, config), envOverride);
+        Debug('Final config: apiUrl=%o defaultOrganizationUid=%o', finalConfig.apiUrl, finalConfig.defaultOrganizationUid);
         // Check for SOS_ACCESS_TOKEN env var (CI-friendly JWT override)
         const envToken = process.env.SOS_ACCESS_TOKEN;
         if (envToken) {

package/dist/helper/paginationHelper.d.ts

@@ -1,4 +1,4 @@
-import { IPaginatedList } from '@signageos/sdk';
+import { IPaginatedList } from '@signageos/sdk/dist/Lib/Pagination/PaginatedList';
 /**
  * Fetches all pages from a paginated list.
  * @param firstPage The first page returned from a list() method

package/dist/helper.js

@@ -27,11 +27,13 @@ exports.deserializeJSON = deserializeJSON;
 exports.getErrorMessageFromUnknownError = getErrorMessageFromUnknownError;
 exports.autocompleteSuggest = autocompleteSuggest;
 const querystring_1 = require("querystring");
+const debug_1 = __importDefault(require("debug"));
 const RestApi_1 = __importDefault(require("@signageos/sdk/dist/RestApi/RestApi"));
 const runControlHelper_1 = require("./RunControl/runControlHelper");
 const apiVersions_1 = require("@signageos/sdk/dist/RestApi/apiVersions");
 const parameters_1 = require("./parameters");
 const globalArgs_1 = require("./Command/globalArgs");
+const Debug = (0, debug_1.default)('@signageos/cli:helper');
 function loadApiUrl() {
     return __awaiter(this, void 0, void 0, function* () {
         const config = yield (0, runControlHelper_1.loadConfig)();
@@ -39,13 +41,17 @@ function loadApiUrl() {
     });
 }
 function getApiUrl(config) {
-    // Precedence:
-    // 1. Explicit global CLI argument (--api-url)
-    // 2. Environment variable (SOS_API_URL) - for CI/CD and testing
-    // 3. Stored profile configuration (config.apiUrl from ~/.sosrc)
+    // Precedence (highest to lowest):
+    // 1. CLI --api-url argument
+    // 2. SOS_API_URL env var (user-explicit override, for CI/CD)
+    // 3. config.apiUrl (.sosrc field — user's saved profile)
+    // 4. SOS_DEFAULT_API_URL env var (package default from .env.production)
     const cliUrl = (0, globalArgs_1.getGlobalApiUrl)();
+    const envUrl = process.env.SOS_API_URL;
     const profileUrl = config.apiUrl;
-    const rawApiUrl = cliUrl || profileUrl;
+    const defaultUrl = process.env.SOS_DEFAULT_API_URL;
+    const rawApiUrl = cliUrl || envUrl || profileUrl || defaultUrl;
+    Debug('API URL resolution: cli=%o env(SOS_API_URL)=%o profile=%o env(SOS_DEFAULT_API_URL)=%o resolved=%o', cliUrl, envUrl, profileUrl, defaultUrl, rawApiUrl);
     if (!rawApiUrl) {
         throw new Error(`No API URL is defined. Please use --api-url or set SOS_API_URL environment variable.`);
     }
@@ -63,8 +69,10 @@ function createOrganizationRestApi(credentials) {
         const auth = config.accessToken
             ? { accessToken: config.accessToken }
             : { clientId: credentials.oauthClientId, secret: credentials.oauthClientSecret };
+        const url = yield loadApiUrl();
+        Debug('Creating organization REST API: url=%s authMode=%s organizationUid=%o', url, config.accessToken ? 'jwt' : 'legacy', config.defaultOrganizationUid);
         const options = {
-            url: yield loadApiUrl(),
+            url,
             auth,
             version: apiVersions_1.ApiVersions.V1,
             clientVersions: createClientVersions(),
@@ -86,7 +94,9 @@ function createOptions(method, options, data) {
     };
 }
 function createUri(options, resource, queryParams) {
-    return [options.url, options.version, resource].join('/') + (typeof queryParams !== 'undefined' ? '?' + (0, querystring_1.stringify)(queryParams) : '');
+    const uri = [options.url, options.version, resource].join('/') + (typeof queryParams !== 'undefined' ? '?' + (0, querystring_1.stringify)(queryParams) : '');
+    Debug('API request URI: %s (auth=%s)', uri, options.accessToken ? 'jwt' : 'legacy');
+    return uri;
 }
 function getResource(options, path, query) {
     return fetch(createUri(options, path, query), createOptions('GET', options));

package/dist/index.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+process.env.SOS_SKIP_DOTENV = '1';
 const appletCommand_1 = require("./Applet/appletCommand");
 const loginCommand_1 = require("./Auth/loginCommand");
 const logoutCommand_1 = require("./Auth/logoutCommand");

package/dist/parameters.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parameters = void 0;
 const log_1 = require("@signageos/sdk/dist/Console/log");
@@ -10,6 +11,8 @@ const rootPath = path.normalize(__dirname + '/..');
 // Load environment-specific .env file
 const envFile = environment === 'test' ? '.env.test' : '.env';
 dotenv.config({ path: path.join(rootPath, envFile) });
+// Load production defaults for any vars not already set
+dotenv.config({ path: path.join(rootPath, '.env.production') });
 const configurableEnvVars = [
     'SOS_PROFILE',
     'SOS_API_IDENTIFICATION',
@@ -24,9 +27,9 @@ for (const envVar of configurableEnvVars) {
         (0, log_1.log)('warning', `Environment variable ${envVar} found. Will override default values from ~/.sosrc`);
     }
 }
-const apiUrl = process.env.SOS_API_URL;
+const apiUrl = (_a = process.env.SOS_API_URL) !== null && _a !== void 0 ? _a : process.env.SOS_DEFAULT_API_URL;
 if (!apiUrl) {
-    throw new Error(`Environment variable SOS_API_URL is required`);
+    throw new Error(`Environment variable SOS_API_URL or SOS_DEFAULT_API_URL is required`);
 }
 exports.parameters = {
     environment,
@@ -34,7 +37,7 @@ exports.parameters = {
     version: packageConfig.version,
     profile: process.env.SOS_PROFILE,
     apiUrl,
-    forwardServerUrl: process.env.SOS_FORWARD_SERVER_URL,
+    forwardServerUrl: (_b = process.env.SOS_FORWARD_SERVER_URL) !== null && _b !== void 0 ? _b : process.env.SOS_DEFAULT_FORWARD_SERVER_URL,
     applet: {
         uid: process.env.SOS_APPLET_UID,
         version: process.env.SOS_APPLET_VERSION,

package/docs/login/index.md

@@ -20,12 +20,21 @@ then stores the resulting JWT tokens in `~/.sosrc`.
 sos login [options]
 ```
 
+## Options
+
+| Option                  | Description                                                                        |
+| ----------------------- | ---------------------------------------------------------------------------------- |
+| `--interactive-profile` | Prompt for custom Auth0 and connection settings (for custom deployments) (boolean) |
+
 ## Examples
 
 ```bash
 # Interactive login (opens browser for Auth0 authentication)
 sos login
 
+# Login with custom configuration (prompts for Auth0 and connection settings)
+sos login --interactive-profile
+
 # Login with a specific profile
 sos --profile staging login
 ```

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@signageos/cli",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "main": "./dist/index.js",
   "author": "signageOS.io <dev@signageos.io>",
   "files": [
     ".env",
+    ".env.production",
     "dist",
     "README.md",
     "package.json",
@@ -87,7 +88,7 @@
   "dependencies": {
     "@signageos/cli-common": "0.1.0",
     "@signageos/file": "2.0.1",
-    "@signageos/sdk": "2.7.0",
+    "@signageos/sdk": "2.8.0",
     "archiver": "7.0.1",
     "chalk": "2.4.2",
     "child-process-promise": "2.1.3",