@sasjs/cli 3.16.1 → 3.16.2

package/build/commands/add/addCredential.js

@@ -75,7 +75,8 @@ var logger_1 = require("@sasjs/utils/logger");
 var types_1 = require("@sasjs/utils/types");
 var node_1 = __importStar(require("@sasjs/adapter/node"));
 var auth_1 = require("../../utils/auth");
-var utils_1 = require("@sasjs/utils");
+var utils_1 = require("../../utils");
+var utils_2 = require("@sasjs/utils");
 var input_1 = require("./internal/input");
 var targetScope_1 = require("../../types/targetScope");
 var saveConfig_1 = require("./internal/saveConfig");
@@ -114,7 +115,7 @@ var addCredential = function (target, insecure, targetScope) { return __awaiter(
                     case types_1.ServerType.Sas9: return [3 /*break*/, 10];
                     case types_1.ServerType.Sasjs: return [3 /*break*/, 15];
                 }
-                return [3 /*break*/, 21];
+                return [3 /*break*/, 22];
             case 4: return [4 /*yield*/, (0, input_1.getCredentialsInputForViya)(target.name)];
             case 5:
                 _b = _j.sent(), client = _b.client, secret = _b.secret;
@@ -129,7 +130,7 @@ var addCredential = function (target, insecure, targetScope) { return __awaiter(
             case 8:
                 target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { authConfig: { client: client, secret: secret, access_token: access_token, refresh_token: refresh_token } }));
                 _j.label = 9;
-            case 9: return [3 /*break*/, 22];
+            case 9: return [3 /*break*/, 23];
             case 10: return [4 /*yield*/, (0, input_1.getCredentialsInputSas9)(target, targetScope)];
             case 11:
                 _d = _j.sent(), userName = _d.userName, password = _d.password;
@@ -141,25 +142,31 @@ var addCredential = function (target, insecure, targetScope) { return __awaiter(
             case 13:
                 target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { authConfigSas9: { userName: userName, password: password } }));
                 _j.label = 14;
-            case 14: return [3 /*break*/, 22];
-            case 15: return [4 /*yield*/, (0, input_1.getCredentialsInputSasjs)(target)];
+            case 14: return [3 /*break*/, 23];
+            case 15: return [4 /*yield*/, (0, utils_1.isSasJsServerInServerMode)(target)];
             case 16:
+                if (!(_j.sent())) {
+                    process.logger.info('No need to authenticate against the sasjs server running in desktop mode.');
+                    return [2 /*return*/, target];
+                }
+                return [4 /*yield*/, (0, input_1.getCredentialsInputSasjs)(target)];
+            case 17:
                 client = (_j.sent()).client;
                 return [4 /*yield*/, (0, exports.getTokens)(target, client, '', httpsAgentOptions)];
-            case 17:
+            case 18:
                 _e = _j.sent(), access_token = _e.access_token, refresh_token = _e.refresh_token;
-                if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 19];
+                if (!(targetScope === targetScope_1.TargetScope.Local)) return [3 /*break*/, 20];
                 return [4 /*yield*/, (0, exports.createEnvFileForSasjs)(target.name, client, access_token, refresh_token)];
-            case 18:
-                _j.sent();
-                return [3 /*break*/, 20];
             case 19:
+                _j.sent();
+                return [3 /*break*/, 21];
+            case 20:
                 target = new types_1.Target(__assign(__assign({}, target.toJson(false)), { authConfig: { client: client, secret: '', access_token: access_token, refresh_token: refresh_token } }));
-                _j.label = 20;
-            case 20: return [3 /*break*/, 22];
-            case 21: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
-            case 22: return [4 /*yield*/, (0, saveConfig_1.saveConfig)(targetScope, target, false, false)];
-            case 23:
+                _j.label = 21;
+            case 21: return [3 /*break*/, 23];
+            case 22: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
+            case 23: return [4 /*yield*/, (0, saveConfig_1.saveConfig)(targetScope, target, false, false)];
+            case 24:
                 filePath = _j.sent();
                 (_h = process.logger) === null || _h === void 0 ? void 0 : _h.info("Target configuration has been saved to ".concat(filePath, " ."));
                 return [2 /*return*/, target];
@@ -216,7 +223,7 @@ var createEnvFileForViya = function (targetName, client, secret, accessToken, re
             case 0:
                 envFileContent = "CLIENT=".concat(client, "\nSECRET=").concat(secret, "\nACCESS_TOKEN=").concat(accessToken, "\nREFRESH_TOKEN=").concat(refreshToken, "\n");
                 envFilePath = path_1.default.join(process.projectDir, ".env.".concat(targetName));
-                return [4 /*yield*/, (0, utils_1.createFile)(envFilePath, envFileContent)];
+                return [4 /*yield*/, (0, utils_2.createFile)(envFilePath, envFileContent)];
             case 1:
                 _b.sent();
                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Environment file saved at ".concat(envFilePath));
@@ -233,7 +240,7 @@ var createEnvFileForSas9 = function (targetName, userName, password) { return __
             case 0:
                 envFileContent = "SAS_USERNAME=".concat(userName, "\nSAS_PASSWORD=").concat(password, "\n");
                 envFilePath = path_1.default.join(process.projectDir, ".env.".concat(targetName));
-                return [4 /*yield*/, (0, utils_1.createFile)(envFilePath, envFileContent)];
+                return [4 /*yield*/, (0, utils_2.createFile)(envFilePath, envFileContent)];
             case 1:
                 _b.sent();
                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Environment file saved at ".concat(envFilePath));
@@ -250,7 +257,7 @@ var createEnvFileForSasjs = function (targetName, client, accessToken, refreshTo
             case 0:
                 envFileContent = "CLIENT=".concat(client, "\nACCESS_TOKEN=").concat(accessToken, "\nREFRESH_TOKEN=").concat(refreshToken, "\n");
                 envFilePath = path_1.default.join(process.projectDir, ".env.".concat(targetName));
-                return [4 /*yield*/, (0, utils_1.createFile)(envFilePath, envFileContent)];
+                return [4 /*yield*/, (0, utils_2.createFile)(envFilePath, envFileContent)];
             case 1:
                 _b.sent();
                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.success("Environment file saved at ".concat(envFilePath));

package/build/commands/add/addTarget.js

@@ -53,6 +53,7 @@ var targetScope_1 = require("../../types/targetScope");
 var input_1 = require("./internal/input");
 var saveConfig_1 = require("./internal/saveConfig");
 var addCredential_1 = require("./addCredential");
+var utils_1 = require("../../utils");
 /**
  * Creates new target/ updates current target(if found) for either local config or global config file.
  * @param {boolean} insecure- boolean to use insecure connection, default is false. lf true the server will not reject any connection which is not authorized with the list of supplied CAs
@@ -81,7 +82,7 @@ function addTarget(insecure) {
                         case types_1.ServerType.SasViya: return [3 /*break*/, 5];
                         case types_1.ServerType.Sasjs: return [3 /*break*/, 7];
                     }
-                    return [3 /*break*/, 9];
+                    return [3 /*break*/, 11];
                 case 3: return [4 /*yield*/, (0, input_1.getAndValidateSas9Fields)(target, scope)];
                 case 4:
                     _f = _h.sent(), serverName = _f.serverName, repositoryName = _f.repositoryName, userName = _f.userName, password = _f.password;
@@ -92,7 +93,7 @@ function addTarget(insecure) {
                     else {
                         targetJson = __assign(__assign({}, targetJson), { authConfigSas9: { userName: userName, password: password } });
                     }
-                    return [3 /*break*/, 10];
+                    return [3 /*break*/, 12];
                 case 5: return [4 /*yield*/, (0, input_1.getAndValidateSasViyaFields)(target, scope, serverUrl, insecure, addCredential_1.addCredential)];
                 case 6:
                     _g = _h.sent(), contextName = _g.contextName, updatedViyaTarget = _g.target;
@@ -100,18 +101,22 @@ function addTarget(insecure) {
                         contextName: contextName
                     };
                     targetJson = __assign(__assign({}, updatedViyaTarget.toJson(false)), targetJson);
-                    return [3 /*break*/, 10];
-                case 7: return [4 /*yield*/, (0, input_1.getAndValidateSasjsFields)(target, scope, insecure, addCredential_1.addCredential)];
+                    return [3 /*break*/, 12];
+                case 7: return [4 /*yield*/, (0, utils_1.isSasJsServerInServerMode)(target)];
                 case 8:
+                    if (!_h.sent()) return [3 /*break*/, 10];
+                    return [4 /*yield*/, (0, input_1.getAndValidateSasjsFields)(target, scope, insecure, addCredential_1.addCredential)];
+                case 9:
                     updatedSasjsTarget = (_h.sent()).target;
                     targetJson = updatedSasjsTarget.toJson(false);
-                    return [3 /*break*/, 10];
-                case 9: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
-                case 10: return [4 /*yield*/, (0, input_1.getIsDefault)()];
-                case 11:
+                    _h.label = 10;
+                case 10: return [3 /*break*/, 12];
+                case 11: throw new Error('Target contains invalid serverType. Possible types could be SASVIYA, SAS9 and SASJS');
+                case 12: return [4 /*yield*/, (0, input_1.getIsDefault)()];
+                case 13:
                     isDefault = _h.sent();
                     return [4 /*yield*/, (0, saveConfig_1.saveConfig)(scope, new types_1.Target(targetJson), isDefault, false)];
-                case 12:
+                case 14:
                     filePath = _h.sent();
                     (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("Target configuration has been saved to ".concat(filePath));
                     return [2 /*return*/, true];

package/build/commands/add/spec/addTarget.spec.js

@@ -73,6 +73,7 @@ var utils_1 = require("@sasjs/utils");
 var dotenv_1 = __importDefault(require("dotenv"));
 var path_1 = __importDefault(require("path"));
 var inputModule = __importStar(require("../internal/input"));
+var utilsModule = __importStar(require("../../../utils/utils"));
 var addTarget_1 = require("../addTarget");
 var config_1 = require("../../../utils/config");
 var targetScope_1 = require("../../../types/targetScope");
@@ -192,6 +193,9 @@ describe('addTarget', function () {
                             target: new utils_1.Target(commonFields)
                         });
                     });
+                    jest
+                        .spyOn(utilsModule, 'isSasJsServerInServerMode')
+                        .mockImplementation(function () { return Promise.resolve(true); });
                     return [4 /*yield*/, expect((0, addTarget_1.addTarget)(false)).resolves.toEqual(true)];
                 case 1:
                     _a.sent();
@@ -392,6 +396,9 @@ describe('addTarget', function () {
                             target: new utils_1.Target(__assign(__assign({}, targetJson), commonFields))
                         });
                     });
+                    jest
+                        .spyOn(utilsModule, 'isSasJsServerInServerMode')
+                        .mockImplementation(function () { return Promise.resolve(true); });
                     return [4 /*yield*/, expect((0, addTarget_1.addTarget)(false)).resolves.toEqual(true)];
                 case 2:
                     _a.sent();

package/build/utils/utils.d.ts

@@ -44,3 +44,4 @@ export declare const terminateProcess: (status: number) => never;
  */
 export declare const isSASjsProject: () => Promise<boolean>;
 export declare const getNodeModulePath: (module: string) => Promise<string>;
+export declare const isSasJsServerInServerMode: (target: Target) => Promise<boolean>;

package/build/utils/utils.js

@@ -86,10 +86,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeModulePath = exports.isSASjsProject = exports.terminateProcess = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
+exports.isSasJsServerInServerMode = exports.getNodeModulePath = exports.isSASjsProject = exports.terminateProcess = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
 var shelljs_1 = __importDefault(require("shelljs"));
 var path_1 = __importDefault(require("path"));
 var ora_1 = __importDefault(require("ora"));
+var axios_1 = __importDefault(require("axios"));
 var utils_1 = require("@sasjs/utils");
 var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var displayResult_1 = require("./displayResult");
@@ -638,3 +639,23 @@ var getNodeModulePath = function (module) { return __awaiter(void 0, void 0, voi
     });
 }); };
 exports.getNodeModulePath = getNodeModulePath;
+var isSasJsServerInServerMode = function (target) { return __awaiter(void 0, void 0, void 0, function () {
+    var res, error_1, message;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                _a.trys.push([0, 2, , 3]);
+                return [4 /*yield*/, axios_1.default.get("".concat(target.serverUrl, "/SASjsApi/info"))];
+            case 1:
+                res = _a.sent();
+                return [2 /*return*/, res.data.mode === 'server'];
+            case 2:
+                error_1 = _a.sent();
+                message = "An error occurred while fetching server info from ".concat(target.serverUrl, "/SASjsApi/info");
+                (0, displayResult_1.displayError)(error_1, message);
+                throw new Error(message);
+            case 3: return [2 /*return*/];
+        }
+    });
+}); };
+exports.isSasJsServerInServerMode = isSasJsServerInServerMode;

package/package.json

@@ -96,5 +96,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.16.1"
+  "version": "3.16.2"
 }