mstate-cli 0.2.0 → 0.2.2

package/package.json

@@ -1,41 +1,41 @@
-{
-  "name": "mstate-cli",
-  "version": "0.2.0",
-  "main": "index.js",
-  "bin": {
-    "mstate": "./dist/index.js"
-  },
-  "scripts": {
-    "build": "npx rollup -c",
-    "start": "npm run build && node dist/index.js"
-  },
-  "keywords": [
-    "mstate",
-    "workflow",
-    "cli",
-    "automation"
-  ],
-  "author": "",
-  "license": "ISC",
-  "description": "A CLI tool for maintaining mstate workflows config",
-  "devDependencies": {
-    "@rollup/plugin-commonjs": "^28.0.1",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.3.0",
-    "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^12.1.1",
-    "@types/cors": "^2.8.17",
-    "@types/crypto-js": "^4.2.2",
-    "@types/express": "^5.0.0",
-    "@types/node": "^22.9.0",
-    "tslib": "^2.8.1",
-    "typescript": "^5.6.3"
-  },
-  "dependencies": {
-    "cors": "^2.8.5",
-    "crypto-js": "^4.2.0",
-    "express": "^4.21.1",
-    "mstate-cli": "^0.0.9",
-    "open": "^10.1.0"
-  }
-}
+{
+  "name": "mstate-cli",
+  "version": "0.2.2",
+  "main": "index.js",
+  "bin": {
+    "mstate": "./dist/index.js"
+  },
+  "scripts": {
+    "build": "npx rollup -c",
+    "start": "npm run build && node dist/index.js"
+  },
+  "keywords": [
+    "mstate",
+    "workflow",
+    "cli",
+    "automation"
+  ],
+  "author": "",
+  "license": "ISC",
+  "description": "A CLI tool for maintaining mstate workflows config",
+  "devDependencies": {
+    "@rollup/plugin-commonjs": "^28.0.1",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^15.3.0",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-typescript": "^12.1.1",
+    "@types/cors": "^2.8.17",
+    "@types/crypto-js": "^4.2.2",
+    "@types/express": "^5.0.0",
+    "@types/node": "^22.9.0",
+    "tslib": "^2.8.1",
+    "typescript": "^5.6.3"
+  },
+  "dependencies": {
+    "cors": "^2.8.5",
+    "crypto-js": "^4.2.0",
+    "express": "^4.21.1",
+    "mstate-cli": "^0.0.9",
+    "open": "^10.1.0"
+  }
+}

package/src/common/enum.ts

@@ -1,6 +1,8 @@
 export enum CmdAction {
   LOGIN = 'login',
   LINK = 'link',
+  UPDATE = "update",
+  DEV = "dev",
   UNLINK = 'unlink',
   USER = 'user',
   ADD = 'add',

package/src/common/utils.ts

@@ -38,16 +38,15 @@ export function handleUpdateSecretKey(secret: string) {
       flag: 'w',
       mode: 0o600,
     });
-  } catch (error) {}
+  } catch (error) { }
 }
 
 export function getSecretKey() {
   try {
     const fileData = fs.readFileSync(CRED_FILE_PATH, 'utf8');
     const secret =
-      decryptData(fileData)?.secret ||
-      getValueFromArgs(process.argv, 'secret=');
-
+      getValueFromArgs(process.argv, 'secret=') ||
+      decryptData(fileData)?.secret;
     if (!secret) {
       customLog.changeAndThrow(`Please login or Parameter secret is required`);
     }

package/src/handlers/company.handler.ts

@@ -14,20 +14,22 @@ enum Key {
   PERMISSIONS = 'permissions=',
   SECRET_KEY = 'secret=',
   USER_ID = 'user=',
+  COMPANY_ID = "company="
 }
 
 class CompanyHandler {
-  constructor() {}
+  constructor() { }
 
   async addToken() {
     const args = process.argv;
 
     const pString = getValueFromArgs(args, Key.PERMISSIONS).trim();
-    const permissions = pString.split(',');
+    const permissions = pString.split(',').map(s => s.trim());
     const secretKey = getSecretKey();
     const user = getValueFromArgs(args, Key.USER_ID);
+    const companyID = getValueFromArgs(args, Key.COMPANY_ID);
 
-    if (!pString.length) {
+    if (!permissions.length && permissions[0]?.length) {
       customLog.changeAndThrow(`Parameter permissions is required`);
       return;
     }
@@ -42,6 +44,11 @@ class CompanyHandler {
       return;
     }
 
+    if (!companyID) {
+      customLog.changeAndThrow(`Parameter company is required`);
+      return;
+    }
+
     const url = `${MSTATE_URL}/company/permission`;
     const responseJSON = await fetch(url, {
       method: 'POST',
@@ -52,6 +59,7 @@ class CompanyHandler {
       body: JSON.stringify({
         user,
         permissions,
+        company: companyID
       }),
     });
 
@@ -64,17 +72,19 @@ class CompanyHandler {
     } else {
       customLog.success('Company updated successfully \n', response?.data);
     }
+
   }
 
   async revokePermission() {
     const args = process.argv;
 
     const pString = getValueFromArgs(args, Key.PERMISSIONS);
-    const permissions = pString.split(',');
+    const permissions = pString.split(',').map(s => s.trim());
     const secretKey = getSecretKey();
     const user = getValueFromArgs(args, Key.USER_ID);
+    const companyID = getValueFromArgs(args, Key.COMPANY_ID);
 
-    if (!permissions.length) {
+    if (!permissions.length && permissions[0]?.length) {
       customLog.changeAndThrow(`Parameter permissions is required`);
       return;
     }
@@ -89,6 +99,11 @@ class CompanyHandler {
       return;
     }
 
+    if (!companyID) {
+      customLog.changeAndThrow(`Parameter company is required`);
+      return;
+    }
+
     const url = `${MSTATE_URL}/company/permission`;
     const responseJSON = await fetch(url, {
       method: 'DELETE',
@@ -97,6 +112,7 @@ class CompanyHandler {
         'Content-Type': 'application/json',
       },
       body: JSON.stringify({
+        company: companyID,
         user,
         permissions,
       }),
@@ -148,14 +164,14 @@ class CompanyHandler {
           const { token } = req.query;
 
           if (token) {
-            console.log('Authentication successful! Token received.');
+            console.log('Authentication successful!');
 
             // Save the token locally
             handleUpdateSecretKey(token as string);
 
             res.send('<h1>Login successful! You can close this window.</h1>');
           } else {
-            console.error('Authentication failed. No token received.');
+            console.error('Authentication failed.');
             res.send('<h1>Authentication failed. Please try again.</h1>');
           }
         } catch (error) {
@@ -170,9 +186,9 @@ class CompanyHandler {
       .then(async () => {
         await open(
           MSTATE_DOMAIN +
-            `oauth?redirect=${encodeURIComponent(
-              'cli/mstate/login',
-            )}&open=${port}&scope=profile`,
+          `oauth?redirect=${encodeURIComponent(
+            'cli/mstate/login',
+          )}&open=${port}&scope=profile`,
         );
       })
       .catch((err) => {
@@ -181,8 +197,13 @@ class CompanyHandler {
       });
   }
 
+  handleUpdateSavedSecretKey() {
+    handleUpdateSecretKey(getSecretKey());
+  }
+
   logToken() {
     customLog.info('Token', getSecretKey());
+    customLog.info('MSTATE_URL', MSTATE_URL);
   }
 }
 

package/src/index.ts

@@ -29,10 +29,18 @@ const [action] = argv.slice(2);
       break;
 
     case CmdAction.USER:
-      companyHandler.logToken();
-      // if (hasFlag(argv, '-d')) companyHandler.revokePermission();
-      // else companyHandler.addToken();
+      if (hasFlag(argv, '-d')) await companyHandler.revokePermission();
+      else await companyHandler.addToken();
       break;
+
+    case CmdAction.UPDATE:
+      companyHandler.handleUpdateSavedSecretKey();
+      break;
+
+    // case CmdAction.DEV:                    // comment this case on production build
+    //   companyHandler.logToken()
+    //   break;
+
     case CmdAction.LOGIN:
       await companyHandler.handleLogin();
       break;