@capawesome/cli 0.0.13 → 0.0.14

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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.14](https://github.com/capawesome-team/cli/compare/v0.0.13...v0.0.14) (2024-09-30)
+
+
+### Bug Fixes
+
+* **apps:** typo ([c65ca99](https://github.com/capawesome-team/cli/commit/c65ca99289b333ddb79d3ade0db33cb4571e860d))
+* **whoami:** support oauth provider ([7b80a7b](https://github.com/capawesome-team/cli/commit/7b80a7b3c5aa3d8dea6c77cf30a8bfae10961e36))
+
 ## [0.0.13](https://github.com/capawesome-team/cli/compare/v0.0.12...v0.0.13) (2024-08-20)
 
 

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

@@ -14,10 +14,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const citty_1 = require("citty");
 const consola_1 = __importDefault(require("consola"));
-const apps_1 = __importDefault(require("../../../services/apps"));
-const prompt_1 = require("../../../utils/prompt");
 const app_channels_1 = __importDefault(require("../../../services/app-channels"));
+const apps_1 = __importDefault(require("../../../services/apps"));
 const error_1 = require("../../../utils/error");
+const prompt_1 = require("../../../utils/prompt");
 exports.default = (0, citty_1.defineCommand)({
     meta: {
         description: 'Delete an app channel.',
@@ -37,7 +37,7 @@ exports.default = (0, citty_1.defineCommand)({
         if (!appId) {
             const apps = yield apps_1.default.findAll();
             if (!apps.length) {
-                consola_1.default.error('You must create an app before deleting a bundle.');
+                consola_1.default.error('You must create an app before deleting a channel.');
                 return;
             }
             // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged

package/dist/commands/login.js

@@ -12,13 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const axios_1 = __importDefault(require("axios"));
 const citty_1 = require("citty");
 const consola_1 = __importDefault(require("consola"));
-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 users_1 = __importDefault(require("../services/users"));
+const prompt_1 = require("../utils/prompt");
+const userConfig_1 = __importDefault(require("../utils/userConfig"));
 exports.default = (0, citty_1.defineCommand)({
     meta: {
         name: 'login',
@@ -32,21 +32,8 @@ exports.default = (0, citty_1.defineCommand)({
     },
     run: (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         let token = ctx.args.token;
-        if (token) {
-            userConfig_1.default.write({
-                token: token,
-            });
-            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.`);
-        }
-        else {
+        if (token === undefined) {
+            consola_1.default.warn('If you have signed up via an OAuth provider, please sign in using the `--token` argument.');
             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...');
@@ -68,5 +55,21 @@ exports.default = (0, citty_1.defineCommand)({
             });
             consola_1.default.success(`Successfully signed in.`);
         }
+        else if (token.length === 0) {
+            consola_1.default.error('Please provide a valid token. You can create a token at https://cloud.capawesome.io/settings/tokens.');
+        }
+        else {
+            userConfig_1.default.write({
+                token: token,
+            });
+            try {
+                yield users_1.default.me();
+                consola_1.default.success(`Successfully signed in.`);
+            }
+            catch (error) {
+                userConfig_1.default.write({});
+                consola_1.default.error('Invalid token. Please provide a valid token. You can create a token at https://cloud.capawesome.io/settings/tokens.');
+            }
+        }
     }),
 });

package/dist/commands/whoami.js

@@ -14,19 +14,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 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"));
+const userConfig_1 = __importDefault(require("../utils/userConfig"));
 exports.default = (0, citty_1.defineCommand)({
     meta: {
         name: 'whoami',
         description: 'Show current user',
     },
     run: () => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b;
         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}.`);
+                const email = user.email;
+                const userProviderProfile = user.userProviderProfiles[0]
+                    ? ((_a = user.userProviderProfiles[0]) === null || _a === void 0 ? void 0 : _a.provider) + ':' + ((_b = user.userProviderProfiles[0]) === null || _b === void 0 ? void 0 : _b.providerUsername)
+                    : null;
+                consola_1.default.info(`Logged in as ${email || userProviderProfile || '?'}.`);
             }
             catch (error) {
                 consola_1.default.error('Token is invalid. Please sign in again.');

package/package.json

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