@sasjs/cli 3.6.0 → 3.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -3
- package/build/cli.js +4 -4
- package/build/cli.spec.js +6 -6
- package/build/commands/add/addCommand.js +2 -2
- package/build/commands/add/addCredential.js +27 -27
- package/build/commands/add/addTarget.js +10 -10
- package/build/commands/add/internal/input.js +30 -30
- package/build/commands/add/internal/saveConfig.js +2 -2
- package/build/commands/add/spec/addCommand.spec.js +24 -20
- package/build/commands/add/spec/addCredential.spec.js +14 -14
- package/build/commands/add/spec/addTarget.spec.js +22 -22
- package/build/commands/build/build.js +81 -77
- package/build/commands/build/buildCommand.js +3 -3
- package/build/commands/build/compileBuildCommand.js +4 -4
- package/build/commands/build/internal/config.js +8 -8
- package/build/commands/build/internal/getLaunchPageCode.js +2 -2
- package/build/commands/build/spec/build.spec.js +10 -10
- package/build/commands/build/spec/buildCommand.spec.js +16 -12
- package/build/commands/build/spec/cb.spec.server.js +18 -18
- package/build/commands/build/spec/compileBuildCommand.spec.js +17 -13
- package/build/commands/compile/compile.js +61 -61
- package/build/commands/compile/compileCommand.js +10 -10
- package/build/commands/compile/compileSingleFile.js +17 -17
- package/build/commands/compile/internal/checkCompileStatus.js +11 -11
- package/build/commands/compile/internal/compareFolders.js +11 -11
- package/build/commands/compile/internal/compileJobFile.js +3 -3
- package/build/commands/compile/internal/compileServiceFile.js +14 -14
- package/build/commands/compile/internal/compileTestFile.js +41 -37
- package/build/commands/compile/internal/getAllJobFolders.js +13 -9
- package/build/commands/compile/internal/getAllServiceFolders.js +13 -9
- package/build/commands/compile/internal/getServerType.js +1 -1
- package/build/commands/compile/internal/identifySasFile.js +2 -2
- package/build/commands/compile/internal/loadDependencies.js +5 -5
- package/build/commands/compile/internal/spec/compileTestFile.spec.js +40 -40
- package/build/commands/compile/spec/compareFolders.spec.js +27 -27
- package/build/commands/compile/spec/compile.spec.js +93 -93
- package/build/commands/compile/spec/compileCommand.spec.js +37 -33
- package/build/commands/compile/spec/compileJobFile.spec.js +12 -22
- package/build/commands/compile/spec/compileServiceFile.spec.js +12 -22
- package/build/commands/compile/spec/copyFilesToBuildFolder.spec.js +7 -7
- package/build/commands/compile/spec/loadDependencies.spec.js +31 -162
- package/build/commands/context/contextCommand.js +16 -16
- package/build/commands/context/create.js +1 -1
- package/build/commands/context/delete.js +2 -2
- package/build/commands/context/edit.js +1 -1
- package/build/commands/context/export.js +5 -5
- package/build/commands/context/internal/validateConfigPath.js +1 -1
- package/build/commands/context/list.js +4 -4
- package/build/commands/context/spec/contextCommand.spec.js +80 -76
- package/build/commands/context/spec/create.spec.js +3 -3
- package/build/commands/context/spec/delete.spec.js +3 -3
- package/build/commands/context/spec/edit.spec.js +3 -3
- package/build/commands/context/spec/export.spec.js +8 -8
- package/build/commands/context/spec/list.spec.js +5 -5
- package/build/commands/create/create.js +12 -12
- package/build/commands/create/createCommand.js +2 -2
- package/build/commands/create/internal/createReadme.js +2 -2
- package/build/commands/create/spec/create.spec.js +39 -39
- package/build/commands/create/spec/createCommand.spec.js +14 -10
- package/build/commands/db/db.js +22 -22
- package/build/commands/db/dbCommand.js +1 -1
- package/build/commands/db/spec/db.spec.js +8 -8
- package/build/commands/db/spec/dbCommand.spec.js +11 -7
- package/build/commands/deploy/compileBuildDeployCommand.js +6 -6
- package/build/commands/deploy/deploy.js +39 -39
- package/build/commands/deploy/deployCommand.js +2 -2
- package/build/commands/deploy/internal/getDeployScripts.js +14 -10
- package/build/commands/deploy/spec/cbd.spec.js +14 -14
- package/build/commands/deploy/spec/cbd.spec.server.js +40 -40
- package/build/commands/deploy/spec/compileBuildDeployCommand.spec.js +18 -14
- package/build/commands/deploy/spec/deployCommand.spec.js +15 -11
- package/build/commands/deploy/spec/getDeployScripts.spec.js +8 -8
- package/build/commands/deploy/spec/utils.js +17 -17
- package/build/commands/docs/docsCommand.js +7 -7
- package/build/commands/docs/generateDocs.js +33 -29
- package/build/commands/docs/generateDot.js +12 -8
- package/build/commands/docs/initDocs.js +1 -1
- package/build/commands/docs/internal/createDotFiles.js +6 -6
- package/build/commands/docs/internal/getDotFileContent.js +17 -17
- package/build/commands/docs/internal/getFileInputs.js +1 -1
- package/build/commands/docs/internal/getFileOutputs.js +1 -1
- package/build/commands/docs/internal/getFoldersForDocs.js +4 -4
- package/build/commands/docs/internal/populateNodeDictionary.js +1 -1
- package/build/commands/docs/spec/docsCommand.spec.js +25 -21
- package/build/commands/docs/spec/generateDocs.spec.js +60 -60
- package/build/commands/docs/spec/generateDot.spec.js +23 -23
- package/build/commands/docs/spec/getDocConfig.spec.js +2 -2
- package/build/commands/docs/spec/initDocs.spec.js +7 -7
- package/build/commands/flow/execute.js +8 -8
- package/build/commands/flow/flowCommand.js +5 -5
- package/build/commands/flow/internal/checkPredecessorDeadlock.js +11 -7
- package/build/commands/flow/internal/executeFlow.js +23 -23
- package/build/commands/flow/internal/failAllSuccessors.js +1 -1
- package/build/commands/flow/internal/generateFileName.js +2 -2
- package/build/commands/flow/internal/normalizeFilePath.js +1 -1
- package/build/commands/flow/internal/parseJobDetails.js +3 -3
- package/build/commands/flow/internal/printError.js +1 -1
- package/build/commands/flow/internal/saveLog.js +8 -8
- package/build/commands/flow/internal/saveToCsv.js +2 -2
- package/build/commands/flow/internal/spec/allFlowsCompleted.spec.js +4 -4
- package/build/commands/flow/internal/spec/checkPredecessorDeadlock.spec.js +4 -4
- package/build/commands/flow/internal/spec/executeFlow.spec.js +10 -10
- package/build/commands/flow/internal/spec/failAllSuccessors.spec.js +1 -1
- package/build/commands/flow/internal/spec/saveToCsv.spec.js +16 -16
- package/build/commands/flow/internal/spec/validateParams.spec.js +33 -33
- package/build/commands/flow/internal/validateParams.js +17 -17
- package/build/commands/flow/spec/flow.spec.js +1 -1
- package/build/commands/flow/spec/flow.spec.server.js +60 -60
- package/build/commands/flow/spec/flowCommand.spec.js +16 -12
- package/build/commands/folder/create.js +2 -2
- package/build/commands/folder/delete.js +2 -2
- package/build/commands/folder/folderCommand.js +11 -11
- package/build/commands/folder/move.js +2 -2
- package/build/commands/folder/spec/folder.spec.server.js +35 -35
- package/build/commands/folder/spec/folderCommand.spec.js +23 -19
- package/build/commands/help/help.js +46 -46
- package/build/commands/help/helpCommand.js +1 -1
- package/build/commands/help/spec/help.spec.js +8 -8
- package/build/commands/help/spec/helpCommand.spec.js +11 -7
- package/build/commands/init/init.js +7 -7
- package/build/commands/init/initCommand.js +1 -1
- package/build/commands/init/spec/init.spec.server.js +17 -17
- package/build/commands/init/spec/initCommand.spec.js +11 -7
- package/build/commands/job/internal/execute/sasjs.js +1 -1
- package/build/commands/job/internal/execute/viya.js +35 -35
- package/build/commands/job/internal/utils.js +6 -6
- package/build/commands/job/jobCommand.js +6 -6
- package/build/commands/job/spec/execute.spec.js +6 -6
- package/build/commands/job/spec/getContextName.spec.js +2 -2
- package/build/commands/job/spec/job.spec.server.js +53 -53
- package/build/commands/job/spec/jobCommand.spec.js +17 -13
- package/build/commands/lint/initLint.js +2 -2
- package/build/commands/lint/lintCommand.js +10 -10
- package/build/commands/lint/processLint.js +5 -5
- package/build/commands/lint/spec/lintCommand.spec.js +19 -15
- package/build/commands/request/request.js +16 -16
- package/build/commands/request/requestCommand.js +5 -5
- package/build/commands/request/spec/request.spec.server.js +210 -178
- package/build/commands/request/spec/requestCommand.spec.js +17 -13
- package/build/commands/run/run.js +23 -23
- package/build/commands/run/runCommand.js +2 -2
- package/build/commands/run/spec/run.spec.server.js +51 -51
- package/build/commands/run/spec/runCommand.spec.js +10 -6
- package/build/commands/servicepack/deploy.js +6 -6
- package/build/commands/servicepack/servicePackCommand.js +3 -3
- package/build/commands/servicepack/spec/servicepack.spec.server.js +6 -6
- package/build/commands/servicepack/spec/servicepackCommand.spec.js +10 -6
- package/build/commands/shared/createConfigFile.js +2 -2
- package/build/commands/shared/createFileStructure.js +6 -6
- package/build/commands/shared/createLintConfigFile.js +1 -1
- package/build/commands/shared/deployToSasViyaWithServicePack.js +4 -4
- package/build/commands/shared/fetchLogFileContent.js +10 -6
- package/build/commands/testing/internal/saveOutput.js +39 -35
- package/build/commands/testing/spec/testCommand.spec.js +17 -13
- package/build/commands/testing/spec/testing.spec.server.js +38 -38
- package/build/commands/testing/test.js +45 -41
- package/build/commands/testing/testCommand.js +2 -2
- package/build/commands/version/spec/version.spec.js +1 -1
- package/build/commands/version/spec/versionCommand.spec.js +11 -7
- package/build/commands/version/version.js +3 -3
- package/build/commands/version/versionCommand.js +2 -2
- package/build/commands/web/internal/createAssetServices.js +28 -24
- package/build/commands/web/internal/getWebServiceContent.js +6 -6
- package/build/commands/web/internal/sasjsout.d.ts +1 -1
- package/build/commands/web/internal/sasjsout.js +1 -1
- package/build/commands/web/internal/spec/updateLinkTag.spec.js +2 -2
- package/build/commands/web/internal/spec/updateScriptTag.spec.js +10 -10
- package/build/commands/web/internal/updateAllTags.js +19 -15
- package/build/commands/web/internal/updateLinkTag.js +2 -2
- package/build/commands/web/internal/updateScriptTag.js +6 -6
- package/build/commands/web/spec/web.spec.js +23 -23
- package/build/commands/web/spec/webCommand.spec.js +16 -12
- package/build/commands/web/web.js +25 -25
- package/build/commands/web/webCommand.js +3 -3
- package/build/types/command/commandBase.js +19 -15
- package/build/types/command/parse.js +1 -1
- package/build/types/command/spec/commandBase.spec.js +16 -12
- package/build/types/command/targetCommand.js +4 -4
- package/build/types/command/unalias.js +9 -5
- package/build/utils/auth.js +7 -7
- package/build/utils/config.js +53 -49
- package/build/utils/displayResult.js +4 -4
- package/build/utils/file.js +11 -11
- package/build/utils/fileStructures/builtFiles.js +2 -2
- package/build/utils/fileStructures/builtFilesCustom1.js +2 -2
- package/build/utils/getLogFilePath.js +2 -3
- package/build/utils/loadEnvVariables.js +3 -3
- package/build/utils/prefixAppLoc.js +1 -1
- package/build/utils/saveLog.js +7 -7
- package/build/utils/setConstants.js +4 -4
- package/build/utils/setProjectDir.js +2 -2
- package/build/utils/spec/config.spec.js +80 -80
- package/build/utils/spec/displayResult.spec.js +7 -7
- package/build/utils/spec/file.spec.js +15 -15
- package/build/utils/spec/removeComments.spec.js +11 -11
- package/build/utils/spec/setConstants.spec.js +3 -3
- package/build/utils/spec/utils.spec.js +55 -55
- package/build/utils/test.js +59 -59
- package/build/utils/utils.js +47 -43
- package/package.json +11 -11
|
@@ -70,10 +70,14 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
70
70
|
}
|
|
71
71
|
return ar;
|
|
72
72
|
};
|
|
73
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
74
|
-
for (var i = 0,
|
|
75
|
-
|
|
76
|
-
|
|
73
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
74
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
75
|
+
if (ar || !(i in from)) {
|
|
76
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
77
|
+
ar[i] = from[i];
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
77
81
|
};
|
|
78
82
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
79
83
|
var webModule = __importStar(require("../web"));
|
|
@@ -93,7 +97,7 @@ describe('WebCommand', function () {
|
|
|
93
97
|
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
94
98
|
return __generator(this, function (_a) {
|
|
95
99
|
switch (_a.label) {
|
|
96
|
-
case 0: return [4 /*yield*/, utils_2.setConstants()];
|
|
100
|
+
case 0: return [4 /*yield*/, (0, utils_2.setConstants)()];
|
|
97
101
|
case 1:
|
|
98
102
|
_a.sent();
|
|
99
103
|
return [2 /*return*/];
|
|
@@ -115,13 +119,13 @@ describe('WebCommand', function () {
|
|
|
115
119
|
jest.spyOn(process.logger, 'error');
|
|
116
120
|
});
|
|
117
121
|
it('should parse a simple sasjs web command', function () {
|
|
118
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['web']);
|
|
122
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['web'], false);
|
|
119
123
|
var command = new webCommand_1.WebCommand(args);
|
|
120
124
|
expect(command.name).toEqual('web');
|
|
121
125
|
expect(command.subCommand).toEqual('');
|
|
122
126
|
});
|
|
123
127
|
it('should parse a shorthand sasjs web command', function () {
|
|
124
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['w']);
|
|
128
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['w'], false);
|
|
125
129
|
var command = new webCommand_1.WebCommand(args);
|
|
126
130
|
expect(command.name).toEqual('web');
|
|
127
131
|
expect(command.subCommand).toEqual('');
|
|
@@ -131,7 +135,7 @@ describe('WebCommand', function () {
|
|
|
131
135
|
return __generator(this, function (_a) {
|
|
132
136
|
switch (_a.label) {
|
|
133
137
|
case 0:
|
|
134
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['web', '--target', 'test']);
|
|
138
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['web', '--target', 'test'], false);
|
|
135
139
|
command = new webCommand_1.WebCommand(args);
|
|
136
140
|
return [4 /*yield*/, command.getTargetInfo()];
|
|
137
141
|
case 1:
|
|
@@ -149,7 +153,7 @@ describe('WebCommand', function () {
|
|
|
149
153
|
return __generator(this, function (_a) {
|
|
150
154
|
switch (_a.label) {
|
|
151
155
|
case 0:
|
|
152
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['web', '-t', 'test']);
|
|
156
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['web', '-t', 'test'], false);
|
|
153
157
|
command = new webCommand_1.WebCommand(args);
|
|
154
158
|
return [4 /*yield*/, command.getTargetInfo()];
|
|
155
159
|
case 1:
|
|
@@ -167,7 +171,7 @@ describe('WebCommand', function () {
|
|
|
167
171
|
return __generator(this, function (_a) {
|
|
168
172
|
switch (_a.label) {
|
|
169
173
|
case 0:
|
|
170
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['web', '-t', 'test']);
|
|
174
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['web', '-t', 'test'], false);
|
|
171
175
|
command = new webCommand_1.WebCommand(args);
|
|
172
176
|
return [4 /*yield*/, command.execute()];
|
|
173
177
|
case 1:
|
|
@@ -182,7 +186,7 @@ describe('WebCommand', function () {
|
|
|
182
186
|
return __generator(this, function (_a) {
|
|
183
187
|
switch (_a.label) {
|
|
184
188
|
case 0:
|
|
185
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['web', '-t', 'test']);
|
|
189
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['web', '-t', 'test'], false);
|
|
186
190
|
command = new webCommand_1.WebCommand(args);
|
|
187
191
|
return [4 /*yield*/, command.execute()];
|
|
188
192
|
case 1:
|
|
@@ -198,7 +202,7 @@ describe('WebCommand', function () {
|
|
|
198
202
|
return __generator(this, function (_a) {
|
|
199
203
|
switch (_a.label) {
|
|
200
204
|
case 0:
|
|
201
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['web', '-t', 'test']);
|
|
205
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['web', '-t', 'test'], false);
|
|
202
206
|
jest
|
|
203
207
|
.spyOn(webModule, 'createWebAppServices')
|
|
204
208
|
.mockImplementation(function () { return Promise.reject(new Error('Test Error')); });
|
|
@@ -63,13 +63,13 @@ function createWebAppServices(target) {
|
|
|
63
63
|
switch (_c.label) {
|
|
64
64
|
case 0:
|
|
65
65
|
buildDestinationServicesFolder = process.sasjsConstants.buildDestinationServicesFolder;
|
|
66
|
-
return [4 /*yield*/, config_1.getStreamConfig(target)];
|
|
66
|
+
return [4 /*yield*/, (0, config_1.getStreamConfig)(target)];
|
|
67
67
|
case 1:
|
|
68
68
|
streamConfig = _c.sent();
|
|
69
69
|
return [4 /*yield*/, validateStreamConfig(streamConfig)];
|
|
70
70
|
case 2:
|
|
71
71
|
_b = _c.sent(), webSourcePathFull = _b.webSourcePathFull, indexHtmlPath = _b.indexHtmlPath;
|
|
72
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Compiling web app services for target "
|
|
72
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Compiling web app services for target ".concat(target.name, "..."));
|
|
73
73
|
return [4 /*yield*/, createBuildDestinationFolder()];
|
|
74
74
|
case 3:
|
|
75
75
|
_c.sent();
|
|
@@ -77,17 +77,17 @@ function createWebAppServices(target) {
|
|
|
77
77
|
return [4 /*yield*/, createTargetDestinationFolder(destinationPath)];
|
|
78
78
|
case 4:
|
|
79
79
|
_c.sent();
|
|
80
|
-
return [4 /*yield*/, createAssetServices_1.createAssetServices(target, destinationPath, streamConfig).then(function (map) {
|
|
80
|
+
return [4 /*yield*/, (0, createAssetServices_1.createAssetServices)(target, destinationPath, streamConfig).then(function (map) {
|
|
81
81
|
var indexHtmlIndex = map.findIndex(function (assetPath) { return assetPath.source === 'index.html'; });
|
|
82
82
|
map.splice(indexHtmlIndex, 1);
|
|
83
83
|
return map;
|
|
84
84
|
})];
|
|
85
85
|
case 5:
|
|
86
86
|
assetPathMap = _c.sent();
|
|
87
|
-
return [4 /*yield*/, utils_1.readFile(indexHtmlPath).then(function (content) { return new jsdom_1.default.JSDOM(content); })];
|
|
87
|
+
return [4 /*yield*/, (0, utils_1.readFile)(indexHtmlPath).then(function (content) { return new jsdom_1.default.JSDOM(content); })];
|
|
88
88
|
case 6:
|
|
89
89
|
indexHtml = _c.sent();
|
|
90
|
-
return [4 /*yield*/, updateAllTags_1.updateAllTags(indexHtml, {
|
|
90
|
+
return [4 /*yield*/, (0, updateAllTags_1.updateAllTags)(indexHtml, {
|
|
91
91
|
webSourcePathFull: webSourcePathFull,
|
|
92
92
|
destinationPath: destinationPath,
|
|
93
93
|
serverType: target.serverType,
|
|
@@ -117,26 +117,26 @@ var validateStreamConfig = function (streamConfig) { return __awaiter(void 0, vo
|
|
|
117
117
|
switch (_a.label) {
|
|
118
118
|
case 0:
|
|
119
119
|
if (!streamConfig) {
|
|
120
|
-
throw new Error("Invalid stream config: Please specify the `streamConfig` in your target in the following format: \n "
|
|
120
|
+
throw new Error("Invalid stream config: Please specify the `streamConfig` in your target in the following format: \n ".concat(JSON.stringify(exampleStreamConfig, null, 2)));
|
|
121
121
|
}
|
|
122
122
|
webSourcePath = streamConfig.webSourcePath, streamWebFolder = streamConfig.streamWebFolder;
|
|
123
123
|
if (!webSourcePath) {
|
|
124
|
-
throw new Error("Invalid web sourcePath: Please specify the `streamConfig` in your target in the following format: \n "
|
|
124
|
+
throw new Error("Invalid web sourcePath: Please specify the `streamConfig` in your target in the following format: \n ".concat(JSON.stringify(exampleStreamConfig, null, 2)));
|
|
125
125
|
}
|
|
126
126
|
if (!streamWebFolder) {
|
|
127
|
-
throw new Error("Invalid stream web folder: Please specify the `streamConfig` in your target in the following format: \n "
|
|
127
|
+
throw new Error("Invalid stream web folder: Please specify the `streamConfig` in your target in the following format: \n ".concat(JSON.stringify(exampleStreamConfig, null, 2)));
|
|
128
128
|
}
|
|
129
|
-
webSourcePathFull = utils_1.getAbsolutePath(streamConfig.webSourcePath, process.projectDir);
|
|
130
|
-
return [4 /*yield*/, utils_1.folderExists(webSourcePathFull)];
|
|
129
|
+
webSourcePathFull = (0, utils_1.getAbsolutePath)(streamConfig.webSourcePath, process.projectDir);
|
|
130
|
+
return [4 /*yield*/, (0, utils_1.folderExists)(webSourcePathFull)];
|
|
131
131
|
case 1:
|
|
132
132
|
if (!(_a.sent())) {
|
|
133
|
-
throw new Error("webSourcePath: '"
|
|
133
|
+
throw new Error("webSourcePath: '".concat(webSourcePathFull, "' present in 'streamConfig' doesn't exist."));
|
|
134
134
|
}
|
|
135
135
|
indexHtmlPath = path_1.default.join(webSourcePathFull, 'index.html');
|
|
136
|
-
return [4 /*yield*/, utils_1.fileExists(indexHtmlPath)];
|
|
136
|
+
return [4 /*yield*/, (0, utils_1.fileExists)(indexHtmlPath)];
|
|
137
137
|
case 2:
|
|
138
138
|
if (!(_a.sent())) {
|
|
139
|
-
throw new Error("'index.html' doesn't exist at webSourcePath: '"
|
|
139
|
+
throw new Error("'index.html' doesn't exist at webSourcePath: '".concat(webSourcePathFull, "' present in 'streamConfig'"));
|
|
140
140
|
}
|
|
141
141
|
return [2 /*return*/, { webSourcePathFull: webSourcePathFull, indexHtmlPath: indexHtmlPath }];
|
|
142
142
|
}
|
|
@@ -149,11 +149,11 @@ function createBuildDestinationFolder() {
|
|
|
149
149
|
switch (_a.label) {
|
|
150
150
|
case 0:
|
|
151
151
|
buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
|
|
152
|
-
return [4 /*yield*/, utils_1.fileExists(buildDestinationFolder)];
|
|
152
|
+
return [4 /*yield*/, (0, utils_1.fileExists)(buildDestinationFolder)];
|
|
153
153
|
case 1:
|
|
154
154
|
pathExists = _a.sent();
|
|
155
155
|
if (!!pathExists) return [3 /*break*/, 3];
|
|
156
|
-
return [4 /*yield*/, utils_1.createFolder(buildDestinationFolder)];
|
|
156
|
+
return [4 /*yield*/, (0, utils_1.createFolder)(buildDestinationFolder)];
|
|
157
157
|
case 2:
|
|
158
158
|
_a.sent();
|
|
159
159
|
_a.label = 3;
|
|
@@ -167,15 +167,15 @@ function createTargetDestinationFolder(destinationPath) {
|
|
|
167
167
|
var pathExists;
|
|
168
168
|
return __generator(this, function (_a) {
|
|
169
169
|
switch (_a.label) {
|
|
170
|
-
case 0: return [4 /*yield*/, utils_1.fileExists(destinationPath)];
|
|
170
|
+
case 0: return [4 /*yield*/, (0, utils_1.fileExists)(destinationPath)];
|
|
171
171
|
case 1:
|
|
172
172
|
pathExists = _a.sent();
|
|
173
173
|
if (!pathExists) return [3 /*break*/, 3];
|
|
174
|
-
return [4 /*yield*/, utils_1.deleteFolder(destinationPath)];
|
|
174
|
+
return [4 /*yield*/, (0, utils_1.deleteFolder)(destinationPath)];
|
|
175
175
|
case 2:
|
|
176
176
|
_a.sent();
|
|
177
177
|
_a.label = 3;
|
|
178
|
-
case 3: return [4 /*yield*/, utils_1.createFolder(destinationPath)];
|
|
178
|
+
case 3: return [4 /*yield*/, (0, utils_1.createFolder)(destinationPath)];
|
|
179
179
|
case 4:
|
|
180
180
|
_a.sent();
|
|
181
181
|
return [2 /*return*/];
|
|
@@ -190,20 +190,20 @@ function createClickMeService(indexHtmlContent, fileName) {
|
|
|
190
190
|
switch (_a.label) {
|
|
191
191
|
case 0:
|
|
192
192
|
lines = indexHtmlContent.replace(/\r\n/g, '\n').split('\n');
|
|
193
|
-
clickMeServiceContent = sasjsout_1.sasjsout
|
|
193
|
+
clickMeServiceContent = "".concat(sasjsout_1.sasjsout, "\nfilename sasjs temp lrecl=99999999;\ndata _null_;\nfile sasjs;\n");
|
|
194
194
|
lines.forEach(function (line) {
|
|
195
|
-
var chunkedLines = utils_1.chunk(line);
|
|
195
|
+
var chunkedLines = (0, utils_1.chunk)(line);
|
|
196
196
|
if (chunkedLines.length === 1) {
|
|
197
197
|
if (chunkedLines[0].length == 0)
|
|
198
198
|
chunkedLines[0] = ' ';
|
|
199
|
-
clickMeServiceContent += "put '"
|
|
199
|
+
clickMeServiceContent += "put '".concat(chunkedLines[0]
|
|
200
200
|
.split("'")
|
|
201
|
-
.join("''")
|
|
201
|
+
.join("''"), "';\n");
|
|
202
202
|
}
|
|
203
203
|
else {
|
|
204
204
|
var combinedLines_1 = '';
|
|
205
205
|
chunkedLines.forEach(function (chunkedLine, index) {
|
|
206
|
-
var text = "put '"
|
|
206
|
+
var text = "put '".concat(chunkedLine.split("'").join("''"), "'");
|
|
207
207
|
if (index !== chunkedLines.length - 1) {
|
|
208
208
|
text += '@;\n';
|
|
209
209
|
}
|
|
@@ -217,7 +217,7 @@ function createClickMeService(indexHtmlContent, fileName) {
|
|
|
217
217
|
});
|
|
218
218
|
clickMeServiceContent += 'run;\n%sasjsout(HTML)';
|
|
219
219
|
buildDestinationServicesFolder = process.sasjsConstants.buildDestinationServicesFolder;
|
|
220
|
-
return [4 /*yield*/, utils_1.createFile(path_1.default.join(buildDestinationServicesFolder, fileName
|
|
220
|
+
return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(buildDestinationServicesFolder, "".concat(fileName, ".sas")), clickMeServiceContent)];
|
|
221
221
|
case 1:
|
|
222
222
|
_a.sent();
|
|
223
223
|
return [2 /*return*/];
|
|
@@ -232,7 +232,7 @@ function createClickMeFile(indexHtmlContent, fileName) {
|
|
|
232
232
|
switch (_a.label) {
|
|
233
233
|
case 0:
|
|
234
234
|
buildDestinationServicesFolder = process.sasjsConstants.buildDestinationServicesFolder;
|
|
235
|
-
return [4 /*yield*/, utils_1.createFile(path_1.default.join(buildDestinationServicesFolder, fileName
|
|
235
|
+
return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(buildDestinationServicesFolder, "".concat(fileName, ".html")), indexHtmlContent)];
|
|
236
236
|
case 1:
|
|
237
237
|
_a.sent();
|
|
238
238
|
return [2 /*return*/];
|
|
@@ -85,15 +85,15 @@ var WebCommand = /** @class */ (function (_super) {
|
|
|
85
85
|
case 1:
|
|
86
86
|
target = (_a.sent()).target;
|
|
87
87
|
buildDestinationFolder = process.sasjsConstants.buildDestinationFolder;
|
|
88
|
-
return [4 /*yield*/, web_1.createWebAppServices(target)
|
|
88
|
+
return [4 /*yield*/, (0, web_1.createWebAppServices)(target)
|
|
89
89
|
.then(function () { return __awaiter(_this, void 0, void 0, function () {
|
|
90
90
|
return __generator(this, function (_a) {
|
|
91
|
-
utils_1.displaySuccess("Web app services have been successfully built!\nThe build output is located in the "
|
|
91
|
+
(0, utils_1.displaySuccess)("Web app services have been successfully built!\nThe build output is located in the ".concat(buildDestinationFolder, " directory."));
|
|
92
92
|
return [2 /*return*/, command_1.ReturnCode.Success];
|
|
93
93
|
});
|
|
94
94
|
}); })
|
|
95
95
|
.catch(function (err) {
|
|
96
|
-
utils_1.displayError(err, 'An error has occurred when building web app services.');
|
|
96
|
+
(0, utils_1.displayError)(err, 'An error has occurred when building web app services.');
|
|
97
97
|
return command_1.ReturnCode.InternalError;
|
|
98
98
|
})];
|
|
99
99
|
case 2: return [2 /*return*/, _a.sent()];
|
|
@@ -62,10 +62,14 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
62
62
|
}
|
|
63
63
|
return ar;
|
|
64
64
|
};
|
|
65
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
66
|
-
for (var i = 0,
|
|
67
|
-
|
|
68
|
-
|
|
65
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
66
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
67
|
+
if (ar || !(i in from)) {
|
|
68
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
69
|
+
ar[i] = from[i];
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
69
73
|
};
|
|
70
74
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
71
75
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
@@ -98,14 +102,14 @@ var CommandBase = /** @class */ (function () {
|
|
|
98
102
|
if (options === void 0) { options = exports.defaultCommandOptions; }
|
|
99
103
|
var commandOptions = __assign(__assign({}, exports.defaultCommandOptions), options);
|
|
100
104
|
var parseOptions = commandOptions.parseOptions, syntax = commandOptions.syntax, aliases = commandOptions.aliases, usage = commandOptions.usage, description = commandOptions.description, examples = commandOptions.examples, strict = commandOptions.strict;
|
|
101
|
-
var command = unalias_1.unalias(syntax.split(' ')[0]);
|
|
105
|
+
var command = (0, unalias_1.unalias)(syntax.split(' ')[0]);
|
|
102
106
|
var builder = function (y) {
|
|
103
107
|
return y.example(examples.map(function (example) { return [
|
|
104
108
|
example.command,
|
|
105
109
|
example.description
|
|
106
110
|
]; }));
|
|
107
111
|
};
|
|
108
|
-
if (__spreadArray([], __read(subCommandMap.keys())).includes(command)) {
|
|
112
|
+
if (__spreadArray([], __read(subCommandMap.keys()), false).includes(command)) {
|
|
109
113
|
builder = function (y) {
|
|
110
114
|
return y
|
|
111
115
|
.example(examples.map(function (example) { return [
|
|
@@ -117,20 +121,20 @@ var CommandBase = /** @class */ (function () {
|
|
|
117
121
|
});
|
|
118
122
|
};
|
|
119
123
|
}
|
|
120
|
-
this.parsed = yargs_1.default(args.slice(2))
|
|
124
|
+
this.parsed = (0, yargs_1.default)(args.slice(2))
|
|
121
125
|
.help(false)
|
|
122
126
|
.version(false)
|
|
123
127
|
.options(parseOptions)
|
|
124
|
-
.command(__spreadArray([syntax], __read(aliases)), description, builder)
|
|
128
|
+
.command(__spreadArray([syntax], __read(aliases), false), description, builder)
|
|
125
129
|
.usage(usage)
|
|
126
130
|
.strict(strict).argv;
|
|
127
131
|
}
|
|
128
132
|
Object.defineProperty(CommandBase.prototype, "name", {
|
|
129
133
|
get: function () {
|
|
130
134
|
if (this.parsed.name) {
|
|
131
|
-
return unalias_1.unalias(this.parsed.name);
|
|
135
|
+
return (0, unalias_1.unalias)(this.parsed.name);
|
|
132
136
|
}
|
|
133
|
-
return unalias_1.unalias(""
|
|
137
|
+
return (0, unalias_1.unalias)("".concat(this.parsed._[0]));
|
|
134
138
|
},
|
|
135
139
|
enumerable: false,
|
|
136
140
|
configurable: true
|
|
@@ -141,8 +145,8 @@ var CommandBase = /** @class */ (function () {
|
|
|
141
145
|
return this.parsed.subCommand;
|
|
142
146
|
}
|
|
143
147
|
if (this.parsed._.length > 1 &&
|
|
144
|
-
__spreadArray([], __read(subCommandMap.keys())).includes(unalias_1.unalias(this.name))) {
|
|
145
|
-
return ""
|
|
148
|
+
__spreadArray([], __read(subCommandMap.keys()), false).includes((0, unalias_1.unalias)(this.name))) {
|
|
149
|
+
return "".concat(this.parsed._[1]);
|
|
146
150
|
}
|
|
147
151
|
return '';
|
|
148
152
|
},
|
|
@@ -155,11 +159,11 @@ var CommandBase = /** @class */ (function () {
|
|
|
155
159
|
return this.parsed.value;
|
|
156
160
|
}
|
|
157
161
|
if (this.parsed._.length > 2) {
|
|
158
|
-
return ""
|
|
162
|
+
return "".concat(this.parsed._[2]);
|
|
159
163
|
}
|
|
160
164
|
else if (this.parsed._.length > 1 &&
|
|
161
|
-
!__spreadArray([], __read(subCommandMap.keys())).includes(unalias_1.unalias(this.name))) {
|
|
162
|
-
return ""
|
|
165
|
+
!__spreadArray([], __read(subCommandMap.keys()), false).includes((0, unalias_1.unalias)(this.name))) {
|
|
166
|
+
return "".concat(this.parsed._[1]);
|
|
163
167
|
}
|
|
164
168
|
return '';
|
|
165
169
|
},
|
|
@@ -5,7 +5,7 @@ var getBaseCommand_1 = require("../../utils/getBaseCommand");
|
|
|
5
5
|
var commandFactory_1 = require("./commandFactory");
|
|
6
6
|
var parse = function (args) {
|
|
7
7
|
var _a;
|
|
8
|
-
var baseCommand = getBaseCommand_1.getBaseCommand(args);
|
|
8
|
+
var baseCommand = (0, getBaseCommand_1.getBaseCommand)(args);
|
|
9
9
|
if (!Array.from(commandFactory_1.commandFactory.keys()).includes(baseCommand.name)) {
|
|
10
10
|
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Invalid SASjs command! Run `sasjs help` for a full list of available commands.');
|
|
11
11
|
process.exit(1);
|
|
@@ -51,10 +51,14 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
51
51
|
}
|
|
52
52
|
return ar;
|
|
53
53
|
};
|
|
54
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
55
|
-
for (var i = 0,
|
|
56
|
-
|
|
57
|
-
|
|
54
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
55
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
56
|
+
if (ar || !(i in from)) {
|
|
57
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
58
|
+
ar[i] = from[i];
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
58
62
|
};
|
|
59
63
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
60
64
|
var commandBase_1 = require("../commandBase");
|
|
@@ -67,7 +71,7 @@ describe('CommandBase', function () {
|
|
|
67
71
|
.mockImplementation(function (code) { return code; });
|
|
68
72
|
});
|
|
69
73
|
it('should parse a simple sasjs command', function () {
|
|
70
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['create', 'test-app']);
|
|
74
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['create', 'test-app'], false);
|
|
71
75
|
var command = new commandBase_1.CommandBase(args, {
|
|
72
76
|
syntax: '* <name> [value]'
|
|
73
77
|
});
|
|
@@ -76,26 +80,26 @@ describe('CommandBase', function () {
|
|
|
76
80
|
expect(command.subCommand).toEqual('');
|
|
77
81
|
});
|
|
78
82
|
it('should parse a sasjs command with a subcommand', function () {
|
|
79
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['flow', 'execute']);
|
|
83
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['flow', 'execute'], false);
|
|
80
84
|
var command = new commandBase_1.CommandBase(args, { syntax: '* <name> <subCommand>' });
|
|
81
85
|
expect(command.name).toEqual('flow');
|
|
82
86
|
expect(command.value).toEqual('');
|
|
83
87
|
expect(command.subCommand).toEqual('execute');
|
|
84
88
|
});
|
|
85
89
|
it('should parse a sasjs command with a value', function () {
|
|
86
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['create', 'test-app']);
|
|
90
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['create', 'test-app'], false);
|
|
87
91
|
var command = new commandBase_1.CommandBase(args);
|
|
88
92
|
expect(command.name).toEqual('create');
|
|
89
93
|
expect(command.value).toEqual('test-app');
|
|
90
94
|
expect(command.subCommand).toEqual('');
|
|
91
95
|
});
|
|
92
96
|
it('should parse a sasjs command with a subcommand and a value', function () {
|
|
93
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), [
|
|
97
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), [
|
|
94
98
|
'job',
|
|
95
99
|
'execute',
|
|
96
100
|
'/path/to/job',
|
|
97
101
|
'--ignoreWarnings'
|
|
98
|
-
]);
|
|
102
|
+
], false);
|
|
99
103
|
var command = new commandBase_1.CommandBase(args, {
|
|
100
104
|
parseOptions: { ignoreWarnings: { type: 'boolean' } },
|
|
101
105
|
syntax: '* <name> <subCommand> [value]'
|
|
@@ -105,12 +109,12 @@ describe('CommandBase', function () {
|
|
|
105
109
|
expect(command.value).toEqual('/path/to/job');
|
|
106
110
|
});
|
|
107
111
|
it('should fail and exit when there is an unknown option', function () {
|
|
108
|
-
var args = __spreadArray(__spreadArray([], __read(defaultArgs)), [
|
|
112
|
+
var args = __spreadArray(__spreadArray([], __read(defaultArgs), false), [
|
|
109
113
|
'job',
|
|
110
114
|
'execute',
|
|
111
115
|
'/path/to/job',
|
|
112
116
|
'--invalidOption'
|
|
113
|
-
]);
|
|
117
|
+
], false);
|
|
114
118
|
new commandBase_1.CommandBase(args);
|
|
115
119
|
expect(process.exit).toHaveBeenCalledWith(1);
|
|
116
120
|
});
|
|
@@ -119,7 +123,7 @@ describe('CommandBase', function () {
|
|
|
119
123
|
return __generator(this, function (_a) {
|
|
120
124
|
switch (_a.label) {
|
|
121
125
|
case 0:
|
|
122
|
-
args = __spreadArray(__spreadArray([], __read(defaultArgs)), ['test', 'command']);
|
|
126
|
+
args = __spreadArray(__spreadArray([], __read(defaultArgs), false), ['test', 'command'], false);
|
|
123
127
|
command = new commandBase_1.CommandBase(args);
|
|
124
128
|
return [4 /*yield*/, command.execute().catch(function (e) { return e; })];
|
|
125
129
|
case 1:
|
|
@@ -88,15 +88,15 @@ var TargetCommand = /** @class */ (function (_super) {
|
|
|
88
88
|
if (this._targetInfo) {
|
|
89
89
|
return [2 /*return*/, Promise.resolve(this._targetInfo)];
|
|
90
90
|
}
|
|
91
|
-
targetName = utils_1.validateTargetName(this.parsed.target);
|
|
92
|
-
return [4 /*yield*/, utils_1.loadTargetEnvVariables(targetName).catch(function (err) {
|
|
91
|
+
targetName = (0, utils_1.validateTargetName)(this.parsed.target);
|
|
92
|
+
return [4 /*yield*/, (0, utils_1.loadTargetEnvVariables)(targetName).catch(function (err) {
|
|
93
93
|
var _a;
|
|
94
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Error loading environment variables for target "
|
|
94
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Error loading environment variables for target ".concat(targetName, ": "), err);
|
|
95
95
|
process.exit(returnCode_1.ReturnCode.InternalError);
|
|
96
96
|
})];
|
|
97
97
|
case 1:
|
|
98
98
|
_a.sent();
|
|
99
|
-
return [4 /*yield*/, utils_1.findTargetInConfiguration(targetName)
|
|
99
|
+
return [4 /*yield*/, (0, utils_1.findTargetInConfiguration)(targetName)
|
|
100
100
|
.then(function (res) {
|
|
101
101
|
_this._targetInfo = res;
|
|
102
102
|
return res;
|
|
@@ -15,16 +15,20 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
15
15
|
}
|
|
16
16
|
return ar;
|
|
17
17
|
};
|
|
18
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
19
|
-
for (var i = 0,
|
|
20
|
-
|
|
21
|
-
|
|
18
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
19
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
20
|
+
if (ar || !(i in from)) {
|
|
21
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
22
|
+
ar[i] = from[i];
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
22
26
|
};
|
|
23
27
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
28
|
exports.unalias = void 0;
|
|
25
29
|
var commandAliases_1 = require("./commandAliases");
|
|
26
30
|
var unalias = function (name) {
|
|
27
|
-
var entry = __spreadArray([], __read(commandAliases_1.aliasMap.entries())).find(function (_a) {
|
|
31
|
+
var entry = __spreadArray([], __read(commandAliases_1.aliasMap.entries()), false).find(function (_a) {
|
|
28
32
|
var _b = __read(_a, 2), k = _b[0], v = _b[1];
|
|
29
33
|
return k === name || v.includes(name);
|
|
30
34
|
});
|
package/build/utils/auth.js
CHANGED
|
@@ -44,8 +44,8 @@ var utils_1 = require("@sasjs/utils");
|
|
|
44
44
|
var jwt_decode_1 = __importDefault(require("jwt-decode"));
|
|
45
45
|
var getAuthUrl = function (serverType, serverUrl, clientId) {
|
|
46
46
|
return serverType === utils_1.ServerType.Sasjs
|
|
47
|
-
? serverUrl
|
|
48
|
-
: serverUrl
|
|
47
|
+
? "".concat(serverUrl, "/#/SASjsLogon?client_id=").concat(clientId, "&response_type=code")
|
|
48
|
+
: "".concat(serverUrl, "/SASLogon/oauth/authorize?client_id=").concat(clientId, "&response_type=code");
|
|
49
49
|
};
|
|
50
50
|
exports.getAuthUrl = getAuthUrl;
|
|
51
51
|
function getAuthCode(authUrl) {
|
|
@@ -56,10 +56,10 @@ function getAuthCode(authUrl) {
|
|
|
56
56
|
case 0:
|
|
57
57
|
logger = process.logger || console;
|
|
58
58
|
logger.log('Please perform the following steps to get your authorization code:\n');
|
|
59
|
-
logger.log("1. Visit "
|
|
59
|
+
logger.log("1. Visit ".concat(authUrl, "\n"));
|
|
60
60
|
logger.log("2. Sign in with your SAS credentials if necessary.");
|
|
61
61
|
logger.log("3. Enter/paste the authorization code here.");
|
|
62
|
-
return [4 /*yield*/, utils_1.getString('Please enter your authorization code: ', function (v) { return !!v || 'Authorization code is required'; })];
|
|
62
|
+
return [4 /*yield*/, (0, utils_1.getString)('Please enter your authorization code: ', function (v) { return !!v || 'Authorization code is required'; })];
|
|
63
63
|
case 1:
|
|
64
64
|
authCode = _a.sent();
|
|
65
65
|
return [2 /*return*/, authCode];
|
|
@@ -79,7 +79,7 @@ function isAccessTokenExpiring(token) {
|
|
|
79
79
|
if (!token) {
|
|
80
80
|
return true;
|
|
81
81
|
}
|
|
82
|
-
var payload = jwt_decode_1.default(token);
|
|
82
|
+
var payload = (0, jwt_decode_1.default)(token);
|
|
83
83
|
var timeToLive = payload.exp - new Date().valueOf() / 1000;
|
|
84
84
|
return timeToLive <= 60 * 60; // 1 hour
|
|
85
85
|
}
|
|
@@ -95,7 +95,7 @@ function isRefreshTokenExpiring(token) {
|
|
|
95
95
|
if (!token) {
|
|
96
96
|
return true;
|
|
97
97
|
}
|
|
98
|
-
var payload = jwt_decode_1.default(token);
|
|
98
|
+
var payload = (0, jwt_decode_1.default)(token);
|
|
99
99
|
var timeToLive = payload.exp - new Date().valueOf() / 1000;
|
|
100
100
|
return timeToLive <= 30; // 30 seconds
|
|
101
101
|
}
|
|
@@ -120,7 +120,7 @@ function getNewAccessToken(sasjsInstance, clientId, clientSecret, target) {
|
|
|
120
120
|
return __generator(this, function (_b) {
|
|
121
121
|
switch (_b.label) {
|
|
122
122
|
case 0:
|
|
123
|
-
authUrl = exports.getAuthUrl(target.serverType, target.serverUrl, clientId);
|
|
123
|
+
authUrl = (0, exports.getAuthUrl)(target.serverType, target.serverUrl, clientId);
|
|
124
124
|
return [4 /*yield*/, getAuthCode(authUrl)];
|
|
125
125
|
case 1:
|
|
126
126
|
authCode = _b.sent();
|