mstate-cli 0.2.3 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mstate-cli",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "main": "index.js",
   "bin": {
     "mstate": "./dist/index.js"

package/src/common/constant.ts

@@ -7,10 +7,15 @@ export const CRED_FILE_PATH = path.join(
   '.mstate_credentials',
 );
 
-// export const MSTATE_DOMAIN: string = `https://mstate.ai/`;
+export const ENCRYPT_KEY: string = 'THIS_IS_MOBIOFFICE';
+
+export const MSTATE_DOMAIN: string = `https://mstate.ai/`;
 // export const MSTATE_DOMAIN: string = `http://localhost:5173/`;
-export const MSTATE_DOMAIN: string = `https://dev.mstate.ai/`;
+// export const MSTATE_DOMAIN: string = `https://dev.mstate.ai/`;
 
-export const MSTATE_URL: string = 'https://dev.mstate.mobioffice.io/api';
+// export const MSTATE_URL: string = 'https://dev.mstate.mobioffice.io/api';
 // export const MSTATE_URL = 'http://localhost:3000/api';
-// export const MSTATE_URL = 'https://api.mstate.mobioffice.io/api';
+export const MSTATE_URL = 'https://api.mstate.mobioffice.io/api';
+
+export const MOBIOFFICE_URL: string = 'https://server.mobioffice.io/api';
+// export const MOBIOFFICE_URL: string = 'https://dev-server.mobioffice.io/api';

package/src/common/enum.ts

@@ -1,7 +1,7 @@
 export enum CmdAction {
   LOGIN = 'login',
   LINK = 'link',
-  UPDATE = 'update',
+  SET = 'set',
   DEV = 'dev',
   UNLINK = 'unlink',
   PERMISSION = 'permission',

package/src/common/helpers.ts

@@ -1,4 +1,6 @@
 import CryptoJS from 'crypto-js';
+import os from 'os';
+import { ENCRYPT_KEY } from './constant';
 
 export function getValueFromArgs(args: string[], key: string) {
   return args.find((str) => str.includes(key))?.replace(key, '') ?? '';
@@ -8,18 +10,33 @@ export function hasFlag(args: string[], flag: string) {
   return args.includes(flag.toUpperCase()) || args.includes(flag.toLowerCase());
 }
 
-const ENCRYPT_KEY: string = 'THIS_IS_MOBIOFFICE';
-
 // Encrypting data
 export function encryptData(data: any) {
   const jsonData = JSON.stringify(data);
-  const encryptedData = CryptoJS.AES.encrypt(jsonData, ENCRYPT_KEY).toString();
+  const encryptedData = CryptoJS.AES.encrypt(
+    jsonData,
+    getEncryptionKey(),
+  ).toString();
   return encryptedData;
 }
 
 // Decrypting data
 export function decryptData<T = any>(encryptedData: string) {
-  const bytes = CryptoJS.AES.decrypt(encryptedData, ENCRYPT_KEY);
+  const bytes = CryptoJS.AES.decrypt(encryptedData, getEncryptionKey());
   const decryptedData = bytes.toString(CryptoJS.enc.Utf8);
   return JSON.parse(decryptedData) as T;
 }
+
+export function getEncryptionKey() {
+  return ENCRYPT_KEY + getMacID();
+}
+
+export function getMacID() {
+  const networkInterfaces = os.networkInterfaces();
+  const macAddresses = Object.values(networkInterfaces)
+    .flat()
+    .filter((details) => !details?.internal)
+    .map((details) => details?.mac);
+
+  return macAddresses[0];
+}

package/src/common/utils.ts

@@ -38,7 +38,7 @@ export function handleUpdateSecretKey(secret: string) {
       flag: 'w',
       mode: 0o600,
     });
-  } catch (error) { }
+  } catch (error) {}
 }
 
 export function getSecretKey() {
@@ -62,4 +62,6 @@ export function getSecretKey() {
   }
 }
 
+export function getEnv() {}
+
 //#endregion

package/src/handlers/mobioffice.handler.ts

@@ -1,3 +1,4 @@
+import { MOBIOFFICE_URL } from '../common/constant';
 import { CmdAction } from '../common/enum';
 import { getValueFromArgs } from '../common/helpers';
 import { customLog, getSecretKey } from '../common/utils';
@@ -6,12 +7,12 @@ enum Key {
   WORKFLOW = 'workflow=',
   PERMISSIONS = 'permissions=',
   SECRET_KEY = 'secret=',
-  COMPANY_ID = 'company=',
+  COMPANY_NAME = 'company=',
   USER_ID = 'user=',
 }
 
 class MobiofficeHandler {
-  private MOBIOFFICE_URL: string = 'https://server.mobioffice.io/api';
+  private MOBIOFFICE_URL: string = MOBIOFFICE_URL;
 
   constructor() {}
 
@@ -20,7 +21,7 @@ class MobiofficeHandler {
 
     const workflowName = getValueFromArgs(args, Key.WORKFLOW);
     const secretKey = getSecretKey();
-    const companyID = getValueFromArgs(args, Key.COMPANY_ID);
+    const companyName = getValueFromArgs(args, Key.COMPANY_NAME);
     const user = getValueFromArgs(args, Key.USER_ID);
 
     if (!workflowName) {
@@ -33,7 +34,7 @@ class MobiofficeHandler {
       return;
     }
 
-    if (!companyID) {
+    if (!companyName) {
       customLog.changeAndThrow(`Parameter company is required`);
       return;
     }
@@ -54,7 +55,7 @@ class MobiofficeHandler {
         action: action.toUpperCase(),
         workflow: workflowName,
         secret: secretKey,
-        companyID,
+        nickname: companyName,
         user,
       }),
     });

package/src/index.ts

@@ -33,7 +33,7 @@ const [action] = argv.slice(2);
       else await companyHandler.addToken();
       break;
 
-    case CmdAction.UPDATE:
+    case CmdAction.SET:
       companyHandler.handleUpdateSavedSecretKey();
       break;