cloudcc-cli 1.8.7 → 1.8.9

package/utils/utils.js

@@ -1,96 +1,96 @@
-const { getParams, postNormal } = require("./http")
-const chalk = require("chalk")
-const { getPackageJson } = require("./config")
-const { readCache, writeCache } = require("./cache")
-
-async function getBaseUrl(path, devConfig) {
-    const cache = readCache(path);
-    const cacheKey = devConfig.secretKey;
-    const now = Date.now();
-    const oneHour = 60 * 60 * 1000;
-
-    // Check if cache is valid
-    if (cache[cacheKey] &&
-        cache[cacheKey].apiSvc &&
-        cache[cacheKey].setupSvc &&
-        cache[cacheKey].timestamp &&
-        (now - cache[cacheKey].timestamp) < oneHour) {
-        global.apiSvc = cache[cacheKey].apiSvc;
-        global.setupSvc = cache[cacheKey].setupSvc;
-        return;
-    }
-
-    if (devConfig.baseUrl) {
-        global.apiSvc = devConfig.baseUrl + (devConfig.apiSvcPrefix || "/apitfs")
-        global.setupSvc = devConfig.baseUrl + (devConfig.setupSvcPrefix || "/setup")
-    } else {
-        let u = "https://developer.apis.cloudcc.cn/oauth/apidomain?scope=cloudccCRM&orgId=" + devConfig.orgId
-        let res = await getParams(u)
-        global.apiSvc = res.orgapi_address
-        global.setupSvc = new URL(res.orgapi_address).origin + (devConfig.setupSvcPrefix || "/setup")
-    }
-
-    // Update cache with apiSvc and setupSvc
-    cache[cacheKey] = {
-        ...(cache[cacheKey] || {}),
-        apiSvc: global.apiSvc,
-        setupSvc: global.setupSvc,
-        timestamp: now
-    };
-    writeCache(path, cache);
-}
-
-async function getBusToken(path = process.cwd()) {
-    let devConfig = getPackageJson(path);
-    if (!devConfig.username || !devConfig.safetyMark || !devConfig.clientId || !devConfig.openSecretKey || !devConfig.orgId) {
-        console.log(chalk.red('The security tag configuration is incorrect. Please check the documentation for configuration.'));
-        console.log();
-        return false;
-    }
-
-    const cache = readCache(path);
-    const cacheKey = devConfig.secretKey;
-    const now = Date.now();
-    const oneHour = 60 * 60 * 1000;
-    // Check if cache is valid
-    if (cache[cacheKey] &&
-        cache[cacheKey].token &&
-        cache[cacheKey].apiSvc &&
-        cache[cacheKey].setupSvc &&
-        cache[cacheKey].timestamp &&
-        (now - cache[cacheKey].timestamp) < oneHour) {
-        global.accessToken = cache[cacheKey].token;
-        global.apiSvc = cache[cacheKey].apiSvc;
-        global.setupSvc = cache[cacheKey].setupSvc;
-        return cache[cacheKey].token;
-    }
-
-    let body = {
-        username: devConfig.username,
-        safetyMark: devConfig.safetyMark,
-        clientId: devConfig.clientId,
-        secretKey: devConfig.openSecretKey,
-        orgId: devConfig.orgId
-    }
-    await getBaseUrl(path, devConfig)
-    // return path
-    let res = await postNormal(global.apiSvc + "/api/cauth/token", body)
-    if (res.result) {
-        global.accessToken = res.data.accessToken;
-        // Update cache
-        cache[cacheKey] = {
-            token: res.data.accessToken,
-            apiSvc: global.apiSvc,
-            setupSvc: global.setupSvc,
-            timestamp: now
-        };
-
-        writeCache(path, cache);
-        return res.data.accessToken;
-    } else {
-        console.log(chalk.red(res.returnInfo));
-    }
-    return false;
-}
-
+const { getParams, postNormal } = require("./http")
+const chalk = require("chalk")
+const { getPackageJson } = require("./config")
+const { readCache, writeCache } = require("./cache")
+
+async function getBaseUrl(path, devConfig) {
+    const cache = readCache(path);
+    const cacheKey = devConfig.secretKey;
+    const now = Date.now();
+    const oneHour = 60 * 60 * 1000;
+
+    // Check if cache is valid
+    if (cache[cacheKey] &&
+        cache[cacheKey].apiSvc &&
+        cache[cacheKey].setupSvc &&
+        cache[cacheKey].timestamp &&
+        (now - cache[cacheKey].timestamp) < oneHour) {
+        global.apiSvc = cache[cacheKey].apiSvc;
+        global.setupSvc = cache[cacheKey].setupSvc;
+        return;
+    }
+
+    if (devConfig.baseUrl) {
+        global.apiSvc = devConfig.baseUrl + (devConfig.apiSvcPrefix || "/apitfs")
+        global.setupSvc = devConfig.baseUrl + (devConfig.setupSvcPrefix || "/setup")
+    } else {
+        let u = "https://developer.apis.cloudcc.cn/oauth/apidomain?scope=cloudccCRM&orgId=" + devConfig.orgId
+        let res = await getParams(u)
+        global.apiSvc = res.orgapi_address
+        global.setupSvc = new URL(res.orgapi_address).origin + (devConfig.setupSvcPrefix || "/setup")
+    }
+
+    // Update cache with apiSvc and setupSvc
+    cache[cacheKey] = {
+        ...(cache[cacheKey] || {}),
+        apiSvc: global.apiSvc,
+        setupSvc: global.setupSvc,
+        timestamp: now
+    };
+    writeCache(path, cache);
+}
+
+async function getBusToken(path = process.cwd()) {
+    let devConfig = getPackageJson(path);
+    if (!devConfig.username || !devConfig.safetyMark || !devConfig.clientId || !devConfig.openSecretKey || !devConfig.orgId) {
+        console.log(chalk.red('The security tag configuration is incorrect. Please check the documentation for configuration.'));
+        console.log();
+        return false;
+    }
+
+    const cache = readCache(path);
+    const cacheKey = devConfig.secretKey;
+    const now = Date.now();
+    const oneHour = 60 * 60 * 1000;
+    // Check if cache is valid
+    if (cache[cacheKey] &&
+        cache[cacheKey].token &&
+        cache[cacheKey].apiSvc &&
+        cache[cacheKey].setupSvc &&
+        cache[cacheKey].timestamp &&
+        (now - cache[cacheKey].timestamp) < oneHour) {
+        global.accessToken = cache[cacheKey].token;
+        global.apiSvc = cache[cacheKey].apiSvc;
+        global.setupSvc = cache[cacheKey].setupSvc;
+        return cache[cacheKey].token;
+    }
+
+    let body = {
+        username: devConfig.username,
+        safetyMark: devConfig.safetyMark,
+        clientId: devConfig.clientId,
+        secretKey: devConfig.openSecretKey,
+        orgId: devConfig.orgId
+    }
+    await getBaseUrl(path, devConfig)
+    // return path
+    let res = await postNormal(global.apiSvc + "/api/cauth/token", body)
+    if (res.result) {
+        global.accessToken = res.data.accessToken;
+        // Update cache
+        cache[cacheKey] = {
+            token: res.data.accessToken,
+            apiSvc: global.apiSvc,
+            setupSvc: global.setupSvc,
+            timestamp: now
+        };
+
+        writeCache(path, cache);
+        return res.data.accessToken;
+    } else {
+        console.log(chalk.red(res.returnInfo));
+    }
+    return false;
+}
+
 module.exports = { getBusToken }