@capawesome/cli 0.0.3 → 0.0.5

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [0.0.5](https://github.com/capawesome-team/cli/compare/v0.0.4...v0.0.5) (2024-05-02)
+
+
+### Features
+
+* **login:** add `--token` option ([2cdd649](https://github.com/capawesome-team/cli/commit/2cdd649bec96fbdb8a43e16a08b256b16a98a662))
+
+
+### Bug Fixes
+
+* allow execution of commands in ci ([4ce7ea6](https://github.com/capawesome-team/cli/commit/4ce7ea6e23c5cb15543df8a215274287134682e8))
+* read user config in ci ([f404989](https://github.com/capawesome-team/cli/commit/f4049890e5ebac15af5491d4ee04e7fcb6e15235))
+
+## [0.0.4](https://github.com/capawesome-team/cli/compare/v0.0.3...v0.0.4) (2024-04-30)
+
+
+### Bug Fixes
+
+* **apps:** improve error message for `apps:bundles:create` ([79dc82c](https://github.com/capawesome-team/cli/commit/79dc82ce7ce7600fa3885f42b4af73a368e3249a))
+
 ## [0.0.3](https://github.com/capawesome-team/cli/compare/v0.0.2...v0.0.3) (2024-04-27)
 
 

package/dist/commands/apps/bundles/create.js

@@ -19,9 +19,9 @@ const axios_1 = require("axios");
 const zip_1 = __importDefault(require("../../../utils/zip"));
 const form_data_1 = __importDefault(require("form-data"));
 const node_fs_1 = require("node:fs");
-const authorization_service_1 = __importDefault(require("../../../service/authorization-service"));
-const apps_1 = __importDefault(require("../../../service/apps"));
-const app_bundle_1 = __importDefault(require("../../../service/app-bundle"));
+const authorization_service_1 = __importDefault(require("../../../services/authorization-service"));
+const apps_1 = __importDefault(require("../../../services/apps"));
+const app_bundle_1 = __importDefault(require("../../../services/app-bundle"));
 exports.default = (0, citty_1.defineCommand)({
     meta: {
         description: 'Create a new app bundle.',
@@ -41,7 +41,7 @@ exports.default = (0, citty_1.defineCommand)({
         },
     },
     run: (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
+        var _a, _b, _c;
         if (!authorization_service_1.default.hasAuthorizationToken()) {
             consola_1.default.error('You must be logged in to run this command.');
             return;
@@ -83,10 +83,10 @@ exports.default = (0, citty_1.defineCommand)({
             const zipBuffer = yield zip_1.default.zipFolder(path);
             formData.append('file', zipBuffer, { filename: 'bundle.zip' });
         }
-        consola_1.default.start('Uploading...');
         if (channelName) {
             formData.append('channelName', channelName);
         }
+        consola_1.default.start('Uploading...');
         // Upload the bundle
         try {
             const response = yield app_bundle_1.default.create({ appId: appId, formData: formData });
@@ -94,11 +94,17 @@ exports.default = (0, citty_1.defineCommand)({
             consola_1.default.info(`Bundle ID: ${response.id}`);
         }
         catch (error) {
-            if (error instanceof axios_1.AxiosError && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401) {
-                consola_1.default.error('Your token is no longer valid. Please sign in again.');
+            const defaultErrorMessage = 'Failed to create bundle.';
+            if (error instanceof axios_1.AxiosError) {
+                if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401) {
+                    consola_1.default.error('Your token is no longer valid. Please sign in again.');
+                }
+                else {
+                    consola_1.default.error(((_c = (_b = error.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.message) || defaultErrorMessage);
+                }
             }
             else {
-                consola_1.default.error('Failed to create bundle.');
+                consola_1.default.error(defaultErrorMessage);
             }
         }
     }),

package/dist/commands/apps/bundles/delete.js

@@ -15,10 +15,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const citty_1 = require("citty");
 const consola_1 = __importDefault(require("consola"));
 const axios_1 = require("axios");
-const ci_1 = require("../../../utils/ci");
-const apps_1 = __importDefault(require("../../../service/apps"));
+const apps_1 = __importDefault(require("../../../services/apps"));
 const prompt_1 = require("../../../utils/prompt");
-const app_bundle_1 = __importDefault(require("../../../service/app-bundle"));
+const app_bundle_1 = __importDefault(require("../../../services/app-bundle"));
 exports.default = (0, citty_1.defineCommand)({
     meta: {
         description: 'Delete an app bundle.',
@@ -35,10 +34,6 @@ exports.default = (0, citty_1.defineCommand)({
     },
     run: (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
-        if ((0, ci_1.isRunningInCi)()) {
-            consola_1.default.error('This command is not supported in CI environments.');
-            return;
-        }
         let appId = ctx.args.appId;
         if (!appId) {
             const apps = yield apps_1.default.findAll();

package/dist/commands/apps/channels/create.js

@@ -13,12 +13,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const citty_1 = require("citty");
-const ci_1 = require("../../../utils/ci");
 const consola_1 = __importDefault(require("consola"));
 const prompt_1 = require("../../../utils/prompt");
-const apps_1 = __importDefault(require("../../../service/apps"));
+const apps_1 = __importDefault(require("../../../services/apps"));
 const axios_1 = require("axios");
-const app_channel_1 = __importDefault(require("../../../service/app-channel"));
+const app_channel_1 = __importDefault(require("../../../services/app-channel"));
 exports.default = (0, citty_1.defineCommand)({
     meta: {
         description: 'Create a new app channel.',
@@ -35,10 +34,6 @@ exports.default = (0, citty_1.defineCommand)({
     },
     run: (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
-        if ((0, ci_1.isRunningInCi)()) {
-            consola_1.default.error('This command is not supported in CI environments.');
-            return;
-        }
         let appId = ctx.args.appId;
         if (!appId) {
             const apps = yield apps_1.default.findAll();

package/dist/commands/apps/channels/delete.js

@@ -15,10 +15,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const citty_1 = require("citty");
 const consola_1 = __importDefault(require("consola"));
 const axios_1 = require("axios");
-const ci_1 = require("../../../utils/ci");
-const apps_1 = __importDefault(require("../../../service/apps"));
+const apps_1 = __importDefault(require("../../../services/apps"));
 const prompt_1 = require("../../../utils/prompt");
-const app_channel_1 = __importDefault(require("../../../service/app-channel"));
+const app_channel_1 = __importDefault(require("../../../services/app-channel"));
 exports.default = (0, citty_1.defineCommand)({
     meta: {
         description: 'Delete an app channel.',
@@ -35,10 +34,6 @@ exports.default = (0, citty_1.defineCommand)({
     },
     run: (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
-        if ((0, ci_1.isRunningInCi)()) {
-            consola_1.default.error('This command is not supported in CI environments.');
-            return;
-        }
         let appId = ctx.args.appId;
         if (!appId) {
             const apps = yield apps_1.default.findAll();

package/dist/commands/apps/create.js

@@ -13,10 +13,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const citty_1 = require("citty");
-const ci_1 = require("../../utils/ci");
 const consola_1 = __importDefault(require("consola"));
 const prompt_1 = require("../../utils/prompt");
-const apps_1 = __importDefault(require("../../service/apps"));
+const apps_1 = __importDefault(require("../../services/apps"));
 const axios_1 = require("axios");
 exports.default = (0, citty_1.defineCommand)({
     meta: {
@@ -30,10 +29,6 @@ exports.default = (0, citty_1.defineCommand)({
     },
     run: (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
-        if ((0, ci_1.isRunningInCi)()) {
-            consola_1.default.error('This command is not supported in CI environments.');
-            return;
-        }
         let name = ctx.args.name;
         if (!name) {
             name = yield (0, prompt_1.prompt)('Enter the name of the app:', { type: 'text' });

package/dist/commands/apps/delete.js

@@ -13,10 +13,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const citty_1 = require("citty");
-const ci_1 = require("../../utils/ci");
 const consola_1 = __importDefault(require("consola"));
 const prompt_1 = require("../../utils/prompt");
-const apps_1 = __importDefault(require("../../service/apps"));
+const apps_1 = __importDefault(require("../../services/apps"));
 const axios_1 = require("axios");
 exports.default = (0, citty_1.defineCommand)({
     meta: {
@@ -30,10 +29,6 @@ exports.default = (0, citty_1.defineCommand)({
     },
     run: (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
-        if ((0, ci_1.isRunningInCi)()) {
-            consola_1.default.error('This command is not supported in CI environments.');
-            return;
-        }
         let appId = ctx.args.appId;
         if (!appId) {
             const apps = yield apps_1.default.findAll();

package/dist/commands/apps/devices/delete.js

@@ -15,10 +15,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const citty_1 = require("citty");
 const consola_1 = __importDefault(require("consola"));
 const axios_1 = require("axios");
-const ci_1 = require("../../../utils/ci");
-const apps_1 = __importDefault(require("../../../service/apps"));
+const apps_1 = __importDefault(require("../../../services/apps"));
 const prompt_1 = require("../../../utils/prompt");
-const app_device_1 = __importDefault(require("../../../service/app-device"));
+const app_device_1 = __importDefault(require("../../../services/app-device"));
 exports.default = (0, citty_1.defineCommand)({
     meta: {
         description: 'Delete an app device.',
@@ -35,10 +34,6 @@ exports.default = (0, citty_1.defineCommand)({
     },
     run: (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
-        if ((0, ci_1.isRunningInCi)()) {
-            consola_1.default.error('This command is not supported in CI environments.');
-            return;
-        }
         let appId = ctx.args.appId;
         if (!appId) {
             const apps = yield apps_1.default.findAll();

package/dist/commands/login.js

@@ -18,37 +18,55 @@ const axios_1 = __importDefault(require("axios"));
 const userConfig_1 = __importDefault(require("../utils/userConfig"));
 const config_1 = require("../config");
 const prompt_1 = require("../utils/prompt");
-const ci_1 = require("../utils/ci");
+const users_1 = __importDefault(require("../services/users"));
 exports.default = (0, citty_1.defineCommand)({
     meta: {
         name: 'login',
         description: 'Sign in to the Capawesome Cloud Console.',
     },
+    args: {
+        token: {
+            type: 'string',
+            description: 'Token to use for authentication.',
+        },
+    },
     run: (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-        if ((0, ci_1.isRunningInCi)()) {
-            consola_1.default.error('Sign in is not supported in CI environments. Please use the CAPAWESOME_TOKEN environment variable.');
-            return;
-        }
-        const email = yield (0, prompt_1.prompt)('Enter your email:', { type: 'text' });
-        const password = yield (0, prompt_1.passwordPrompt)('Enter your password:');
-        consola_1.default.start('Logging in...');
-        let sessionId;
-        try {
-            const sessionResponse = yield axios_1.default.post(`${config_1.API_URL}/sessions`, {
-                email: email,
-                password: password,
+        let token = ctx.args.token;
+        if (token) {
+            userConfig_1.default.write({
+                token: token,
             });
-            sessionId = sessionResponse.data.id;
+            try {
+                yield users_1.default.me();
+            }
+            catch (error) {
+                userConfig_1.default.write({});
+                consola_1.default.error('Invalid token.');
+                return;
+            }
+            consola_1.default.success(`Successfully signed in.`);
         }
-        catch (error) {
-            consola_1.default.error('Invalid email or password.');
-            return;
+        else {
+            const email = yield (0, prompt_1.prompt)('Enter your email:', { type: 'text' });
+            const password = yield (0, prompt_1.passwordPrompt)('Enter your password:');
+            consola_1.default.start('Logging in...');
+            let sessionId;
+            try {
+                const sessionResponse = yield axios_1.default.post(`${config_1.API_URL}/sessions`, {
+                    email: email,
+                    password: password,
+                });
+                sessionId = sessionResponse.data.id;
+            }
+            catch (error) {
+                consola_1.default.error('Invalid email or password.');
+                return;
+            }
+            const tokenResponse = yield axios_1.default.post(`${config_1.API_URL}/tokens`, { name: 'Capawesome CLI' }, { headers: { Authorization: `Bearer ${sessionId}` } });
+            userConfig_1.default.write({
+                token: tokenResponse.data.token,
+            });
+            consola_1.default.success(`Successfully signed in.`);
         }
-        const tokenResponse = yield axios_1.default.post(`${config_1.API_URL}/tokens`, { name: 'Capawesome CLI' }, { headers: { Authorization: `Bearer ${sessionId}` } });
-        userConfig_1.default.write({
-            username: email,
-            token: tokenResponse.data.token,
-        });
-        consola_1.default.success(`Successfully signed in.`);
     }),
 });

package/dist/commands/logout.js

@@ -22,10 +22,7 @@ exports.default = (0, citty_1.defineCommand)({
     },
     args: {},
     run: () => __awaiter(void 0, void 0, void 0, function* () {
-        const config = userConfig_1.default.read();
-        delete config.username;
-        delete config.token;
-        userConfig_1.default.write(config);
+        userConfig_1.default.write({});
         consola_1.default.success('Successfully signed out.');
     }),
 });

package/dist/commands/whoami.js

@@ -15,18 +15,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const citty_1 = require("citty");
 const consola_1 = __importDefault(require("consola"));
 const userConfig_1 = __importDefault(require("../utils/userConfig"));
+const users_1 = __importDefault(require("../services/users"));
 exports.default = (0, citty_1.defineCommand)({
     meta: {
         name: 'whoami',
         description: 'Show current user',
     },
     run: () => __awaiter(void 0, void 0, void 0, function* () {
-        const { username } = userConfig_1.default.read();
-        if (!username) {
-            consola_1.default.error('Not logged in');
+        const { token } = userConfig_1.default.read();
+        if (token) {
+            try {
+                const user = yield users_1.default.me();
+                consola_1.default.info(`Logged in as ${user.email}.`);
+            }
+            catch (error) {
+                consola_1.default.error('Token is invalid. Please sign in again.');
+            }
         }
         else {
-            consola_1.default.info(`Logged in as ${username}`);
+            consola_1.default.error('Not logged in.');
         }
     }),
 });

package/dist/{service → services}/authorization-service.js

@@ -3,17 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ci_1 = require("../utils/ci");
 const userConfig_1 = __importDefault(require("../utils/userConfig"));
 class AuthorizationServiceImpl {
     constructor(userConfig) {
         this.userConfig = userConfig;
     }
     getCurrentAuthorizationToken() {
-        if ((0, ci_1.isRunningInCi)()) {
-            return process.env.CAPAWESOME_TOKEN || null;
-        }
-        return this.userConfig.read().token || null;
+        return this.userConfig.read().token || process.env.CAPAWESOME_TOKEN || null;
     }
     hasAuthorizationToken() {
         return !!this.getCurrentAuthorizationToken();

package/dist/services/users.js

@@ -0,0 +1,36 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const http_client_1 = __importDefault(require("../utils/http-client"));
+const authorization_service_1 = __importDefault(require("./authorization-service"));
+class UsersServiceImpl {
+    constructor(httpClient) {
+        this.httpClient = httpClient;
+    }
+    me() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield this.httpClient.get('/users/me', {
+                headers: {
+                    Authorization: `Bearer ${authorization_service_1.default.getCurrentAuthorizationToken()}`,
+                },
+            });
+            if (!response.success) {
+                throw response.error;
+            }
+            return response.data;
+        });
+    }
+}
+const usersService = new UsersServiceImpl(http_client_1.default);
+exports.default = usersService;

package/dist/types/index.js

@@ -18,3 +18,4 @@ __exportStar(require("./app"), exports);
 __exportStar(require("./app-bundle"), exports);
 __exportStar(require("./app-device"), exports);
 __exportStar(require("./app-channel"), exports);
+__exportStar(require("./user"), exports);

package/dist/types/user.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capawesome/cli",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "The Capawesome Cloud Command Line Interface (CLI) to manage Live Updates and more.",
   "scripts": {
     "build": "rimraf ./dist && tsc",