@linktr.ee/create-link-app 1.7.4 → 1.7.6

package/README.md

@@ -89,7 +89,7 @@ USAGE
 
 FLAGS
   -p, --path=<value>  Specify custom path to project directory
-  --update            Push update for existing Link App
+  --update            Push update for existing Link App.
 
 DESCRIPTION
   Deploy your Link App and test it on Linktr.ee

package/dist/commands/deploy.js

@@ -5,8 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const axios_1 = __importDefault(require("axios"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const slugify_1 = __importDefault(require("slugify"));
 const base_1 = __importDefault(require("../base"));
 const access_token_1 = require("../lib/auth/access-token");
+const check_link_app_exists_1 = __importDefault(require("../lib/deploy/check-link-app-exists"));
 const create_form_data_1 = __importDefault(require("../lib/deploy/create-form-data"));
 const pack_project_1 = __importDefault(require("../lib/deploy/pack-project"));
 const upload_assets_1 = __importDefault(require("../lib/deploy/upload-assets"));
@@ -18,15 +22,25 @@ class Deploy extends base_1.default {
         const linkTypeServiceUrl = `${flags.endpoint ?? appConfig.link_types_url}/link-types`;
         const isForceUpdate = !!flags['force-update'];
         const isQa = !!flags.qa;
-        const packedFiles = await (0, pack_project_1.default)(flags.path);
-        this.log(`\n===`);
         if (isForceUpdate) {
             this.log('⚠️  "--force-update" flag will impact the existing PUBLISHED Link Apps.\n');
         }
+        this.log(`📦 Packing project...\n`);
+        const packedFiles = await (0, pack_project_1.default)(flags.path);
+        const linkAppName = this.getLinkAppId(flags.path);
+        const linkAppId = (0, slugify_1.default)(linkAppName, { lower: true });
+        this.log(`🔍 Checking Link App by ID: [${linkAppId}] ...\n`);
+        const linkAppExists = await (0, check_link_app_exists_1.default)(linkTypeServiceUrl, linkAppId, accessToken);
+        if (linkAppExists) {
+            this.log(`   Link App [${linkAppId}] already exists, updating it...`);
+        }
+        else {
+            this.log(`   Link App [${linkAppId}] does not exist, creating it...`);
+        }
         if (packedFiles?.length) {
-            this.log('Ready to upload the following files:');
+            this.log('   Ready to upload the following files:');
             packedFiles.forEach((file) => {
-                this.log(`  - ${file}`);
+                this.log(`    - ${file}`);
             });
         }
         if (!flags['skip-confirm']) {
@@ -36,61 +50,26 @@ class Deploy extends base_1.default {
                 return;
             }
         }
-        let linkTypeErrorCode = null;
         try {
+            const isUpdate = linkAppExists;
             const form = (0, create_form_data_1.default)(flags.path);
-            const result = await (0, upload_assets_1.default)(linkTypeServiceUrl, form, accessToken, flags.update, isForceUpdate);
+            const result = await (0, upload_assets_1.default)(linkTypeServiceUrl, form, accessToken, isUpdate, isForceUpdate);
             await this.processSuccess(flags, result);
         }
         catch (err) {
-            let throwError = true;
             if (axios_1.default.isAxiosError(err)) {
                 if (err.response?.data) {
-                    linkTypeErrorCode = err.response?.data?.['link_types_error_code'] ?? null;
-                    if (linkTypeErrorCode === 'LINK_TYPE_ALREADY_EXISTS') {
-                        throwError = false;
-                    }
-                    else {
-                        this.error(JSON.stringify(err.response.data, null, 2));
-                    }
+                    this.error(JSON.stringify(err.response.data, null, 2));
                 }
                 else {
                     this.error(err.message);
                 }
             }
-            if (throwError) {
-                throw err;
-            }
-        }
-        if (linkTypeErrorCode === 'LINK_TYPE_ALREADY_EXISTS' && !flags.update && !isForceUpdate) {
-            if (!flags['skip-confirm']) {
-                this.log(`\n⚠️  [${isQa ? '[QA]' : ''}] This Link Type already exists! Do you want to update it?\n`);
-                const userConfirmUpdate = await core_1.CliUx.ux.prompt(`❓ Do you want to proceed? (Y/n)`, { required: false });
-                if (userConfirmUpdate.toLowerCase() !== 'y') {
-                    this.log('Aborted!');
-                    return;
-                }
-            }
-            try {
-                const form = (0, create_form_data_1.default)(flags.path);
-                const result = await (0, upload_assets_1.default)(linkTypeServiceUrl, form, accessToken, true, isForceUpdate);
-                await this.processSuccess(flags, result);
-            }
-            catch (err) {
-                if (axios_1.default.isAxiosError(err)) {
-                    if (err.response?.data) {
-                        this.error(JSON.stringify(err.response.data, null, 2));
-                    }
-                    else {
-                        this.error(err.message);
-                    }
-                }
-                throw err;
-            }
+            throw err;
         }
     }
     async processSuccess(flags, result) {
-        this.log(`\n===`);
+        this.log(`\n--------------------------------`);
         this.log(JSON.stringify(result, null, 2));
         const linkTypeId = result.linkType.linkTypeId;
         const buildId = result.build?.id;
@@ -100,13 +79,18 @@ class Deploy extends base_1.default {
         const linkAppCreateUrl = flags.qa
             ? `https://qa.linktr.ee/admin?action=create-link&linkType=${linkTypeId}`
             : `https://linktr.ee/admin?action=create-link&linkType=${linkTypeId}`;
-        this.log(`\n===`);
+        this.log(`\n--------------------------------`);
         this.log(`✅ Draft Link App successfully ${flags.update ? 'updated' : 'uploaded'}`);
-        this.log(` - Link App ID: ${linkTypeId}`);
+        this.log(`   - Link App ID: ${linkTypeId}`);
         if (buildId) {
-            this.log(` - Check Link App build: ${linkAppBuildUrl}`);
+            this.log(`   - Check Link App build: ${linkAppBuildUrl}`);
         }
-        this.log(` - Create Link App: ${linkAppCreateUrl}`);
+        this.log(`   - Create Link App: ${linkAppCreateUrl}`);
+    }
+    getLinkAppId(givenPath) {
+        const manifestPath = path_1.default.resolve(givenPath ?? process.cwd(), 'manifest.json');
+        const manifest = JSON.parse(fs_1.default.readFileSync(manifestPath, 'utf8'));
+        return manifest.name;
     }
 }
 exports.default = Deploy;
@@ -117,7 +101,7 @@ Deploy.flags = {
         description: 'Specify custom path to project directory',
     }),
     update: core_1.Flags.boolean({
-        description: 'Push update for existing Link App',
+        description: 'Push update for existing Link App.',
     }),
     // Test local link-types service, with --endpoint http://localhost:8081
     endpoint: core_1.Flags.string({

package/dist/commands/login.js

@@ -23,6 +23,9 @@ class Login extends base_1.default {
         core_1.CliUx.ux.action.stop();
         if ((0, access_token_1.isTokenValid)(token)) {
             (0, access_token_1.saveAccessToken)(token.access_token);
+            if (flags.qa) {
+                this.log('TOKEN: ', token.access_token);
+            }
             this.log('\nDevice has been authorized. Login successful.');
             if (token.expires_at) {
                 this.log(`Login will expire at ${new Date(token.expires_at * 1000).toString()}\n`);

package/dist/lib/deploy/check-link-app-exists.js

@@ -0,0 +1,19 @@
+"use strict";
+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"));
+async function checkLinkAppExists(url, linkAppId, accessToken) {
+    const linkAppCreateUrl = `${url}/${linkAppId}`;
+    const response = await axios_1.default.get(linkAppCreateUrl, {
+        headers: {
+            Authorization: `Bearer ${accessToken}`,
+        },
+    });
+    if (response.status !== 200) {
+        return false;
+    }
+    return response.data?.linkTypeId === linkAppId;
+}
+exports.default = checkLinkAppExists;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.4",
+  "version": "1.7.6",
   "commands": {
     "build": {
       "id": "build",
@@ -96,7 +96,7 @@
         "update": {
           "name": "update",
           "type": "boolean",
-          "description": "Push update for existing Link App",
+          "description": "Push update for existing Link App.",
           "allowNo": false
         },
         "endpoint": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@linktr.ee/create-link-app",
-  "version": "1.7.4",
+  "version": "1.7.6",
   "description": "Create a Link App on Linktr.ee.",
   "license": "UNLICENSED",
   "author": "Linktree",