@sasjs/cli 4.18.5 → 4.19.0

package/build/utils/spec/config.spec.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -64,12 +75,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var config_1 = require("../config");
 var authUtils = __importStar(require("../auth"));
+var sasjsAuthUtils = __importStar(require("@sasjs/utils/auth"));
 var fileUtils = __importStar(require("@sasjs/utils/file"));
 var dotenv_1 = __importDefault(require("dotenv"));
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
+var file_1 = require("@sasjs/utils/file");
 var test_1 = require("../test");
 var setConstants_1 = require("../setConstants");
+// The compiled @sasjs/utils/auth module exposes getters that jest.spyOn
+// cannot redefine - mock the module with configurable jest.fn()s that
+// default to the real implementations.
+jest.mock('@sasjs/utils/auth', function () {
+    var actual = jest.requireActual('@sasjs/utils/auth');
+    return __assign(__assign({}, actual), { isAccessTokenExpiring: jest.fn(), isRefreshTokenExpiring: jest.fn() });
+});
+var actualAuthUtils = jest.requireActual('@sasjs/utils/auth');
+beforeEach(function () {
+    ;
+    sasjsAuthUtils.isAccessTokenExpiring.mockImplementation(actualAuthUtils.isAccessTokenExpiring);
+    sasjsAuthUtils.isRefreshTokenExpiring.mockImplementation(actualAuthUtils.isRefreshTokenExpiring);
+});
 describe('getAccessToken', function () {
     beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -189,12 +215,9 @@ describe('getAccessToken', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest
-                        .spyOn(authUtils, 'isAccessTokenExpiring')
-                        .mockImplementation(function () { return true; });
-                    jest
-                        .spyOn(authUtils, 'isRefreshTokenExpiring')
-                        .mockImplementation(function () { return false; });
+                    ;
+                    sasjsAuthUtils.isAccessTokenExpiring.mockImplementation(function () { return true; });
+                    sasjsAuthUtils.isRefreshTokenExpiring.mockImplementation(function () { return false; });
                     jest.spyOn(authUtils, 'getNewAccessToken');
                     jest.spyOn(authUtils, 'refreshTokens').mockImplementation(function () {
                         return Promise.resolve({
@@ -212,8 +235,8 @@ describe('getAccessToken', function () {
                     return [4 /*yield*/, (0, config_1.getAccessToken)(target, true)];
                 case 1:
                     token = _a.sent();
-                    expect(authUtils.isAccessTokenExpiring).toHaveBeenCalledTimes(1);
-                    expect(authUtils.isRefreshTokenExpiring).toHaveBeenCalledTimes(1);
+                    expect(sasjsAuthUtils.isAccessTokenExpiring).toHaveBeenCalledTimes(1);
+                    expect(sasjsAuthUtils.isRefreshTokenExpiring).toHaveBeenCalledTimes(1);
                     expect(authUtils.refreshTokens).toHaveBeenCalledTimes(1);
                     expect(authUtils.getNewAccessToken).not.toHaveBeenCalled();
                     expect(token).toEqual('N3WT0K3N');
@@ -226,12 +249,9 @@ describe('getAccessToken', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest
-                        .spyOn(authUtils, 'isAccessTokenExpiring')
-                        .mockImplementation(function () { return true; });
-                    jest
-                        .spyOn(authUtils, 'isRefreshTokenExpiring')
-                        .mockImplementation(function () { return true; });
+                    ;
+                    sasjsAuthUtils.isAccessTokenExpiring.mockImplementation(function () { return true; });
+                    sasjsAuthUtils.isRefreshTokenExpiring.mockImplementation(function () { return true; });
                     jest.spyOn(authUtils, 'refreshTokens');
                     jest.spyOn(authUtils, 'getNewAccessToken').mockImplementation(function () {
                         return Promise.resolve({
@@ -250,8 +270,8 @@ describe('getAccessToken', function () {
                     return [4 /*yield*/, (0, config_1.getAccessToken)(target, true)];
                 case 1:
                     token = _a.sent();
-                    expect(authUtils.isAccessTokenExpiring).toHaveBeenCalledTimes(1);
-                    expect(authUtils.isRefreshTokenExpiring).toHaveBeenCalledTimes(1);
+                    expect(sasjsAuthUtils.isAccessTokenExpiring).toHaveBeenCalledTimes(1);
+                    expect(sasjsAuthUtils.isRefreshTokenExpiring).toHaveBeenCalledTimes(1);
                     expect(authUtils.refreshTokens).not.toHaveBeenCalled();
                     expect(authUtils.getNewAccessToken).toHaveBeenCalledTimes(1);
                     expect(token).toEqual('N3WT0K3N');
@@ -264,12 +284,9 @@ describe('getAccessToken', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest
-                        .spyOn(authUtils, 'isAccessTokenExpiring')
-                        .mockImplementation(function () { return true; });
-                    jest
-                        .spyOn(authUtils, 'isRefreshTokenExpiring')
-                        .mockImplementation(function () { return true; });
+                    ;
+                    sasjsAuthUtils.isAccessTokenExpiring.mockImplementation(function () { return true; });
+                    sasjsAuthUtils.isRefreshTokenExpiring.mockImplementation(function () { return true; });
                     jest.spyOn(authUtils, 'refreshTokens');
                     jest.spyOn(authUtils, 'getNewAccessToken').mockImplementation(function () {
                         return Promise.resolve({
@@ -287,8 +304,8 @@ describe('getAccessToken', function () {
                     return [4 /*yield*/, (0, config_1.getAccessToken)(target, true)];
                 case 1:
                     token = _a.sent();
-                    expect(authUtils.isAccessTokenExpiring).toHaveBeenCalledTimes(1);
-                    expect(authUtils.isRefreshTokenExpiring).toHaveBeenCalledTimes(1);
+                    expect(sasjsAuthUtils.isAccessTokenExpiring).toHaveBeenCalledTimes(1);
+                    expect(sasjsAuthUtils.isRefreshTokenExpiring).toHaveBeenCalledTimes(1);
                     expect(authUtils.refreshTokens).not.toHaveBeenCalled();
                     expect(authUtils.getNewAccessToken).toHaveBeenCalledTimes(1);
                     expect(token).toEqual('N3WT0K3N');
@@ -301,17 +318,17 @@ describe('getAccessToken', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest
-                        .spyOn(authUtils, 'isAccessTokenExpiring')
-                        .mockImplementation(function () { return true; });
+                    ;
+                    sasjsAuthUtils.isAccessTokenExpiring.mockImplementation(function () { return true; });
                     target = {
+                        name: 'viya',
                         authConfig: {
                             access_token: 'T0K3N',
                             secret: '53CR3T'
                         }
                     };
                     process.env.CLIENT = undefined;
-                    return [4 /*yield*/, expect((0, config_1.getAccessToken)(target)).rejects.toThrow()];
+                    return [4 /*yield*/, expect((0, config_1.getAccessToken)(target)).rejects.toThrow(/sasjs auth login -t viya/)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -323,17 +340,98 @@ describe('getAccessToken', function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    jest
-                        .spyOn(authUtils, 'isAccessTokenExpiring')
-                        .mockImplementation(function () { return true; });
+                    ;
+                    sasjsAuthUtils.isAccessTokenExpiring.mockImplementation(function () { return true; });
                     target = {
+                        name: 'viya',
                         authConfig: {
                             access_token: 'T0K3N',
                             client: 'CL13NT'
                         }
                     };
                     process.env.SECRET = undefined;
-                    return [4 /*yield*/, expect((0, config_1.getAccessToken)(target)).rejects.toThrow()];
+                    return [4 /*yield*/, expect((0, config_1.getAccessToken)(target)).rejects.toThrow(/sasjs auth login -t viya/)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});
+describe('getAuthConfig', function () {
+    beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            process.projectDir = process.cwd();
+            process.env.ACCESS_TOKEN = undefined;
+            process.env.CLIENT = undefined;
+            process.env.SECRET = undefined;
+            process.env.REFRESH_TOKEN = undefined;
+            return [2 /*return*/];
+        });
+    }); });
+    afterEach(function () {
+        jest.resetAllMocks();
+    });
+    it('should return a fresh access token even when client and secret are not configured', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var target, authConfig;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    ;
+                    sasjsAuthUtils.isAccessTokenExpiring.mockImplementation(function () { return false; });
+                    target = {
+                        name: 'viya',
+                        authConfig: {
+                            access_token: 'T0K3N'
+                        }
+                    };
+                    return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
+                case 1:
+                    authConfig = _a.sent();
+                    expect(authConfig.access_token).toEqual('T0K3N');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should return the configured secret on the fresh-token early return when client/secret are set', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var target, authConfig;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    ;
+                    sasjsAuthUtils.isAccessTokenExpiring.mockImplementation(function () { return false; });
+                    target = {
+                        name: 'viya',
+                        authConfig: {
+                            access_token: 'T0K3N',
+                            client: 'CL13NT',
+                            secret: '53CR3T'
+                        }
+                    };
+                    return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
+                case 1:
+                    authConfig = _a.sent();
+                    expect(authConfig.access_token).toEqual('T0K3N');
+                    expect(authConfig.client).toEqual('CL13NT');
+                    expect(authConfig.secret).toEqual('53CR3T');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should throw an error mentioning sasjs auth login when the token is expiring and no client is available', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var target;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    ;
+                    sasjsAuthUtils.isAccessTokenExpiring.mockImplementation(function () { return true; });
+                    target = {
+                        name: 'viya',
+                        authConfig: {
+                            access_token: 'T0K3N'
+                        }
+                    };
+                    return [4 /*yield*/, expect((0, config_1.getAuthConfig)(target)).rejects.toThrow(/sasjs auth login/)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -341,6 +439,210 @@ describe('getAccessToken', function () {
         });
     }); });
 });
+describe('getAuthConfig - opaque refresh tokens', function () {
+    var opaqueRefreshToken = '1f8da55057bd4f50a6577f0bc2b38b1a-r';
+    var projectDir;
+    var setupLocalProjectWithTarget = function (target) { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    projectDir = path_1.default.join(process.env.TEMP || process.env.TMP || '/tmp', "sasjs-cli-test-".concat((0, utils_1.generateTimestamp)()));
+                    process.projectDir = projectDir;
+                    return [4 /*yield*/, (0, setConstants_1.setConstants)()];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(projectDir, 'sasjs', 'sasjsconfig.json'), JSON.stringify({ targets: [target.toJson()] }))];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); };
+    beforeEach(function () {
+        process.env.ACCESS_TOKEN = undefined;
+        process.env.CLIENT = undefined;
+        process.env.SECRET = undefined;
+        process.env.REFRESH_TOKEN = undefined;
+    });
+    afterEach(function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    jest.resetAllMocks();
+                    return [4 /*yield*/, (0, utils_1.deleteFile)(projectDir).catch(function () { })];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should refresh without crashing and persist the rotated pair in the client/secret branch', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var target, authConfig, envContent;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    // The real isRefreshTokenExpiring must be used - it should treat the
+                    // opaque token as usable rather than throwing InvalidTokenError.
+                    ;
+                    sasjsAuthUtils.isAccessTokenExpiring.mockImplementation(function () { return true; });
+                    jest.spyOn(authUtils, 'refreshTokens').mockImplementation(function () {
+                        return Promise.resolve({
+                            access_token: 'N3WT0K3N',
+                            refresh_token: 'N3WR3FR35H'
+                        });
+                    });
+                    target = new utils_1.Target({
+                        name: 'opaq',
+                        serverType: utils_1.ServerType.SasViya,
+                        serverUrl: 'https://example.com',
+                        appLoc: '/Public/app',
+                        contextName: 'test context',
+                        authConfig: {
+                            access_token: 'T0K3N',
+                            refresh_token: opaqueRefreshToken,
+                            client: 'CL13NT',
+                            secret: '53CR3T'
+                        }
+                    });
+                    return [4 /*yield*/, setupLocalProjectWithTarget(target)];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
+                case 2:
+                    authConfig = _a.sent();
+                    expect(authUtils.refreshTokens).toHaveBeenCalledTimes(1);
+                    expect(authConfig.access_token).toEqual('N3WT0K3N');
+                    return [4 /*yield*/, (0, file_1.readFile)(path_1.default.join(projectDir, '.env.opaq'))];
+                case 3:
+                    envContent = _a.sent();
+                    expect(envContent).toContain('ACCESS_TOKEN=N3WT0K3N');
+                    expect(envContent).toContain('REFRESH_TOKEN=N3WR3FR35H');
+                    expect(envContent).toContain('CLIENT=CL13NT');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should refresh via the sas.cli public client and persist the rotated pair when no client is configured', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var refreshTokensSpy, target, authConfig, envContent;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    ;
+                    sasjsAuthUtils.isAccessTokenExpiring.mockImplementation(function () { return true; });
+                    refreshTokensSpy = jest
+                        .spyOn(authUtils, 'refreshTokens')
+                        .mockImplementation(function () {
+                        return Promise.resolve({
+                            access_token: 'N3WT0K3N',
+                            refresh_token: 'N3WR3FR35H'
+                        });
+                    });
+                    target = new utils_1.Target({
+                        name: 'opaq',
+                        serverType: utils_1.ServerType.SasViya,
+                        serverUrl: 'https://example.com',
+                        appLoc: '/Public/app',
+                        contextName: 'test context',
+                        authConfig: {
+                            access_token: 'T0K3N',
+                            refresh_token: opaqueRefreshToken
+                        }
+                    });
+                    return [4 /*yield*/, setupLocalProjectWithTarget(target)];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
+                case 2:
+                    authConfig = _a.sent();
+                    expect(refreshTokensSpy).toHaveBeenCalledWith(expect.anything(), 'sas.cli', '', opaqueRefreshToken);
+                    expect(authConfig.access_token).toEqual('N3WT0K3N');
+                    expect(authConfig.client).toBeUndefined();
+                    expect(authConfig.secret).toBeUndefined();
+                    return [4 /*yield*/, (0, file_1.readFile)(path_1.default.join(projectDir, '.env.opaq'))];
+                case 3:
+                    envContent = _a.sent();
+                    expect(envContent).toContain('ACCESS_TOKEN=N3WT0K3N');
+                    expect(envContent).toContain('REFRESH_TOKEN=N3WR3FR35H');
+                    expect(envContent).not.toContain('CLIENT=');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should persist tokens refreshed internally by the adapter without dropping client/secret', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var target, envContent;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    target = new utils_1.Target({
+                        name: 'opaq',
+                        serverType: utils_1.ServerType.SasViya,
+                        serverUrl: 'https://example.com',
+                        appLoc: '/Public/app',
+                        contextName: 'test context',
+                        authConfig: {
+                            access_token: 'T0K3N',
+                            refresh_token: opaqueRefreshToken,
+                            client: 'CL13NT',
+                            secret: '53CR3T'
+                        }
+                    });
+                    return [4 /*yield*/, setupLocalProjectWithTarget(target)];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, (0, config_1.persistTokensRefreshedByAdapter)(target)({
+                            access_token: '4D4PT3R',
+                            refresh_token: '4D4PT3RR3FR35H'
+                        })];
+                case 2:
+                    _a.sent();
+                    return [4 /*yield*/, (0, file_1.readFile)(path_1.default.join(projectDir, '.env.opaq'))];
+                case 3:
+                    envContent = _a.sent();
+                    expect(envContent).toContain('ACCESS_TOKEN=4D4PT3R');
+                    expect(envContent).toContain('REFRESH_TOKEN=4D4PT3RR3FR35H');
+                    expect(envContent).toContain('CLIENT=CL13NT');
+                    expect(envContent).toContain('SECRET=53CR3T');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should persist tokens refreshed by the adapter without adding CLIENT=/SECRET= lines for a password-grant-only target', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var target, envContent;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    target = new utils_1.Target({
+                        name: 'opaq',
+                        serverType: utils_1.ServerType.SasViya,
+                        serverUrl: 'https://example.com',
+                        appLoc: '/Public/app',
+                        contextName: 'test context',
+                        authConfig: {
+                            access_token: 'T0K3N',
+                            refresh_token: opaqueRefreshToken
+                        }
+                    });
+                    return [4 /*yield*/, setupLocalProjectWithTarget(target)];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, (0, config_1.persistTokensRefreshedByAdapter)(target)({
+                            access_token: '4D4PT3R',
+                            refresh_token: '4D4PT3RR3FR35H'
+                        })];
+                case 2:
+                    _a.sent();
+                    return [4 /*yield*/, (0, file_1.readFile)(path_1.default.join(projectDir, '.env.opaq'))];
+                case 3:
+                    envContent = _a.sent();
+                    expect(envContent).toContain('ACCESS_TOKEN=4D4PT3R');
+                    expect(envContent).toContain('REFRESH_TOKEN=4D4PT3RR3FR35H');
+                    expect(envContent).not.toContain('CLIENT=');
+                    expect(envContent).not.toContain('SECRET=');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});
 describe('sanitizeAppLoc', function () {
     var notValidAppLoc = '///Public/app///';
     var validAppLoc = '/Public/app';

package/package.json

@@ -69,10 +69,10 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@sasjs/adapter": "4.17.2",
+    "@sasjs/adapter": "^4.18.0",
     "@sasjs/core": "4.68.1",
     "@sasjs/lint": "2.4.3",
-    "@sasjs/utils": "3.5.9",
+    "@sasjs/utils": "^3.6.0",
     "adm-zip": "0.6.0",
     "chalk": "4.1.2",
     "dotenv": "16.0.3",
@@ -85,6 +85,7 @@
     "node-graphviz": "0.1.1",
     "node-powershell": "5.0.1",
     "ora": "5.4.1",
+    "prompts": "2.4.1",
     "shelljs": "0.10.0",
     "ssl-root-cas": "1.3.1",
     "xml": "1.0.1",
@@ -123,5 +124,5 @@
     "ws": "8.21.0",
     "nanoid": "3.3.18"
   },
-  "version": "4.18.5"
+  "version": "4.19.0"
 }