shoplazza-cli 0.0.4 → 0.0.6

package/lib/auth/getCode.js

@@ -3,18 +3,21 @@ const { fork } = require('child_process');
 const path = require('path');
 const open = require('open');
 const log = require('../log');
-const { SSO_AUTH_URL, CLIENT_ID, REDIRECT_URI } = require('../config');
+const { REDIRECT_URI } = require('../config');
+const { getSSOAuthUrl, getClientId } = require('../utils');
 
-const openSSOPage = () => {
+const openSSOPage = (store) => {
   open(
-    `${SSO_AUTH_URL}/switch_account?lack=0&continue=${encodeURIComponent(
-      `${SSO_AUTH_URL}/api/oauth/authorize?action=login&client_id=${CLIENT_ID}&redirect_uri=${REDIRECT_URI}&response_type=code`
+    `${getSSOAuthUrl(store)}/switch_account?lack=0&continue=${encodeURIComponent(
+      `${getSSOAuthUrl(store)}/api/oauth/authorize?action=login&client_id=${getClientId(
+        store
+      )}&redirect_uri=${REDIRECT_URI}&response_type=code`
     )}`
   );
   log.info(`${chalk.green('✓')} Initiating authentication`);
 };
 
-const getCode = () => {
+const getCode = (store) => {
   return new Promise((resolve, reject) => {
     const child = fork(path.join(__dirname, './child.js'), { timeout: 60 * 1000 });
     child.on('message', function (message) {
@@ -26,9 +29,10 @@ const getCode = () => {
       // Timeout
       if (message === null) {
         log.error(chalk.red('✗ Timed out while waiting for response from Shoplazza'));
+        reject('timeout');
       }
     });
-    openSSOPage();
+    openSSOPage(store);
   });
 };
 

package/lib/auth/index.js

@@ -4,14 +4,15 @@ const Sentry = require('@sentry/node');
 const querystring = require('querystring');
 const { get, set, empty } = require('../db/user');
 const log = require('../log');
-const { SSO_AUTH_URL, ACCOUNT_URL, CLIENT_ID, REDIRECT_URI } = require('../config');
+const { REDIRECT_URI } = require('../config');
+const { getAccountUrl, getClientId, getSSOAuthUrl } = require('../utils');
 
-exports.postAccessToken = async (code) => {
+exports.postAccessToken = async (code, store) => {
   try {
     const { data } = await axios.post(
-      `${SSO_AUTH_URL}/api/oauth/token`,
+      `${getSSOAuthUrl(store)}/api/oauth/token`,
       querystring.stringify({
-        client_id: CLIENT_ID,
+        client_id: getClientId(store),
         code,
         grant_type: 'authorization_code',
         redirect_uri: REDIRECT_URI
@@ -33,9 +34,9 @@ exports.postAccessToken = async (code) => {
   }
 };
 
-exports.getUserInfo = async () => {
+exports.getUserInfo = async (store) => {
   try {
-    const { data } = await axios.get(`${SSO_AUTH_URL}/api/sso/current/users`, {
+    const { data } = await axios.get(`${getSSOAuthUrl(store)}/api/sso/current/users`, {
       headers: {
         Cookie: `awesomev2=${get('session_id')}`
       }
@@ -54,7 +55,7 @@ exports.postExchangeToken = async (storeDomain, options = {}) => {
   return new Promise(async (resolve, reject) => {
     try {
       const { data } = await axios.post(
-        `${ACCOUNT_URL}/api/accounts/store/token`,
+        `${getAccountUrl(storeDomain)}/api/accounts/store/token`,
         {
           user_id: get('user_id'),
           domain: storeDomain

package/lib/commands/login.js

@@ -8,6 +8,8 @@ const log = require('../log');
 const { getShopDetail } = require('../openAPI/api');
 const getCode = require('../auth/getCode');
 const { postAccessToken, getUserInfo, postExchangeToken } = require('../auth');
+const { loginIntoPartner } = require('../app/login');
+
 let spinner;
 
 const checkAndLogin = async (store) => {
@@ -31,10 +33,11 @@ const checkAndLogin = async (store) => {
     }
   }
 
-  const code = await getCode();
+  const code = await getCode(store);
   spinner = ora(`Logging in to ${chalk.green(store)}`).start();
-  await postAccessToken(code);
-  await getUserInfo();
+  log.info(`${chalk.green('✓')} Initiating authentication`);
+  await postAcxcessToken(code, store);
+  await getUserInfo(store);
   await postExchangeToken(store);
   spinner?.stop?.();
   log.info(`${chalk.green('✓')} Finalizing authentication`);
@@ -64,10 +67,10 @@ const requestAnalyticsIfNeeded = async () => {
   }
 };
 
-exports.login = async (options) => {
+const loginIntoStore = async (store) => {
   try {
-    if (options.store) {
-      await checkAndLogin(options.store);
+    if (store) {
+      await checkAndLogin(store);
     } else {
       const answers = await inquirer.prompt([
         {
@@ -77,7 +80,7 @@ exports.login = async (options) => {
         }
       ]);
       if (answers.store) {
-        if (!/.+\.myshoplaza\.com/.test(answers.store)) {
+        if (!answers.store.includes('myshoplaza.com') || !answers.store.includes('myshoplaza.com')) {
           log.error(
             chalk.red(
               `✗ Invalid store provided ${answers.store}. Please provide the store in the following format: developer.myshoplaza.com`
@@ -97,3 +100,12 @@ exports.login = async (options) => {
     Sentry.captureException(error);
   }
 };
+
+exports.login = async (options) => {
+  if (options.partner) {
+    await loginIntoPartner();
+    return;
+  } else {
+    await loginIntoStore(options.store);
+  }
+};

package/lib/commands/logout.js

@@ -1,14 +1,23 @@
 const Sentry = require('@sentry/node');
 const chalk = require('chalk');
-const { empty } = require('../db/user');
+const { empty: emptyUser } = require('../db/user');
+const { logoutPartner } = require('../app/logout');
 const log = require('../log');
 
-module.exports = () => {
+const logoutStore = () => {
   try {
-    empty();
-    log.info('Successfully logged out of your account');
+    emptyUser();
+    log.info('Successfully logged out of your store account');
   } catch (error) {
-    log.error(chalk.red(`✗ Failed to logout`));
+    log.error(chalk.red(`✗ Failed to logout your store account`));
     Sentry.captureException(error);
   }
 };
+
+module.exports = (options) => {
+  if (options.partner) {
+    logoutPartner();
+  } else {
+    logoutStore();
+  }
+};

package/lib/commands/switch.js

@@ -32,7 +32,7 @@ module.exports = async (options) => {
         }
       ]);
       if (answers.store) {
-        if (!/.+\.myshoplaza\.com/.test(answers.store)) {
+        if (!answers.store.includes('myshoplaza.com')) {
           log.error(
             chalk.red(
               `✗ Invalid store provided ${answers.store}. Please provide the store in the following format: developer.myshoplaza.com`

package/lib/config.js

@@ -3,3 +3,6 @@ exports.ACCOUNT_URL = 'https://myaccount.shoplazza.com';
 exports.CLIENT_ID = '807525c9-dd77-4f4e-a738-d1e9d02c593d';
 exports.REDIRECT_URI = 'http://127.0.0.1:3456';
 exports.THEME_DIRS = ['assets', 'config', 'layout', 'locales', 'sections', 'snippets', 'templates'];
+exports.DEV_SSO_AUTH_URL = 'https://sso.dev.shoplazza.com';
+exports.DEV_ACCOUNT_URL = 'https://myaccount.dev.shoplazza.com';
+exports.DEV_CLIENT_ID = 'b630b285-e098-4c51-a7a4-d0240c9fc209';

package/lib/utils.js

@@ -3,6 +3,8 @@ const fs = require('fs-extra');
 const AdmZip = require('adm-zip');
 const chalk = require('chalk');
 
+const { SSO_AUTH_URL, ACCOUNT_URL, CLIENT_ID, DEV_SSO_AUTH_URL, DEV_ACCOUNT_URL, DEV_CLIENT_ID } = require('./config');
+
 exports.unzipTheme = (zipPath, outputPath) => {
   const zip = new AdmZip(zipPath);
   const zipEntries = zip.getEntries();
@@ -45,3 +47,15 @@ exports.formatThemeList = (themes, defaultThemeId) => {
 };
 
 exports.sleep = (time) => new Promise((resolve) => setTimeout(resolve, time));
+
+exports.getClientId = (store) => {
+  return store.includes('dev.') ? DEV_CLIENT_ID : CLIENT_ID;
+};
+
+exports.getAccountUrl = (store) => {
+  return store.includes('dev.myshoplaza.com') ? DEV_ACCOUNT_URL : ACCOUNT_URL;
+};
+
+exports.getSSOAuthUrl = (store) => {
+  return store.includes('dev.myshoplaza.com') ? DEV_SSO_AUTH_URL : SSO_AUTH_URL;
+};

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "shoplazza-cli",
-  "version": "0.0.4",
-  "title": "Shoplazza CLI",
-  "description": "Shoplazza CLI is a command-line interface tool that helps you build Shoplazza themes. It quickly generates Shoplazza themes. You can also use it to automate many common development tasks.",
+  "version": "0.0.6",
+  "description": "",
   "main": "bin/shoplazza",
   "engines": {
     "node": ">=14.14.0"
@@ -14,19 +13,13 @@
     "prettier": "prettier --write ./lib",
     "test": "jest --runInBand --forceExit"
   },
-  "homepage": "https://github.com/Shoplazza/shoplazza-cli",
   "repository": {
     "type": "git",
-    "url": "https://github.com/Shoplazza/shoplazza-cli"
+    "url": "git@gitlab.shoplazza.site:shoplaza/frontend/openapi/shoplazza-cli.git"
   },
-  "keywords": [
-    "shoplazza",
-    "cli",
-    "developer",
-    "theme"
-  ],
-  "author": "Shoplazza",
-  "license": "MIT",
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
   "devDependencies": {
     "axios-mock-adapter": "^1.20.0",
     "jest": "^28.1.0",
@@ -36,18 +29,24 @@
     "@sentry/node": "^6.19.7",
     "@sentry/tracing": "^6.19.7",
     "adm-zip": "^0.5.9",
+    "archiver": "^5.3.1",
     "axios": "^0.27.1",
     "better-sqlite3": "^7.5.1",
     "chalk": "^4.1.2",
+    "clean-css": "^5.3.1",
     "commander": "^9.2.0",
+    "download-git-repo": "^3.0.2",
     "execa": "^5.1.1",
     "form-data": "^4.0.0",
     "fs-extra": "^10.1.0",
+    "glob": "^8.0.3",
     "inquirer": "^8.2.3",
     "livereload": "^0.9.3",
     "node-watch": "^0.7.3",
     "open": "^8.4.0",
     "ora": "^5.4.1",
+    "spark-md5": "^3.0.2",
+    "uglify-js": "^3.17.4",
     "update-notifier": "^5.1.0",
     "yargs": "^17.5.0"
   }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Shoplazza Opensource
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.