@sasjs/cli 3.8.0 → 3.8.1
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.
|
@@ -174,7 +174,7 @@ var getTokens = function (target, client, secret, httpsAgentOptions) { return __
|
|
|
174
174
|
});
|
|
175
175
|
return [4 /*yield*/, (0, auth_1.getNewAccessToken)(adapter, client, secret, target).catch(function (e) {
|
|
176
176
|
var _a;
|
|
177
|
-
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("An error has occurred while validating your credentials: "
|
|
177
|
+
(_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("An error has occurred while validating your credentials: ", e, "\nPlease check your Client ID ".concat(target.serverType === types_1.ServerType.Sasjs ? '' : 'and Client Secret ', "and try again.\n"));
|
|
178
178
|
throw e;
|
|
179
179
|
})];
|
|
180
180
|
case 1:
|
|
@@ -318,11 +318,11 @@ describe('JobCommand', function () {
|
|
|
318
318
|
});
|
|
319
319
|
}); });
|
|
320
320
|
});
|
|
321
|
-
describe
|
|
321
|
+
describe('for server type sas9', function () {
|
|
322
322
|
beforeEach(function () {
|
|
323
323
|
setupMocksForSAS9();
|
|
324
324
|
});
|
|
325
|
-
it
|
|
325
|
+
it('should return the error code when user credentials are not found', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
326
326
|
var username, password, returnCode;
|
|
327
327
|
return __generator(this, function (_a) {
|
|
328
328
|
switch (_a.label) {
|
package/build/utils/auth.js
CHANGED
|
@@ -124,7 +124,14 @@ function getNewAccessToken(sasjsInstance, clientId, clientSecret, target) {
|
|
|
124
124
|
return [4 /*yield*/, getAuthCode(authUrl)];
|
|
125
125
|
case 1:
|
|
126
126
|
authCode = _b.sent();
|
|
127
|
-
return [4 /*yield*/, sasjsInstance
|
|
127
|
+
return [4 /*yield*/, sasjsInstance
|
|
128
|
+
.getAccessToken(clientId, clientSecret, authCode)
|
|
129
|
+
.then(function (res) {
|
|
130
|
+
var access_token = res.access_token, refresh_token = res.refresh_token;
|
|
131
|
+
if (access_token && refresh_token)
|
|
132
|
+
return res;
|
|
133
|
+
throw res;
|
|
134
|
+
})];
|
|
128
135
|
case 2:
|
|
129
136
|
_a = _b.sent(), access_token = _a.access_token, refresh_token = _a.refresh_token;
|
|
130
137
|
return [2 /*return*/, { access_token: access_token, refresh_token: refresh_token }];
|
package/package.json
CHANGED
|
@@ -47,8 +47,8 @@
|
|
|
47
47
|
"access": "public"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@sasjs/adapter": "3.7.
|
|
51
|
-
"@sasjs/core": "4.
|
|
50
|
+
"@sasjs/adapter": "3.7.8",
|
|
51
|
+
"@sasjs/core": "4.12.0",
|
|
52
52
|
"@sasjs/lint": "1.11.2",
|
|
53
53
|
"@sasjs/utils": "2.36.0",
|
|
54
54
|
"chalk": "4.1.2",
|
|
@@ -94,5 +94,5 @@
|
|
|
94
94
|
"typescript": "4.5.4",
|
|
95
95
|
"util": "0.12.4"
|
|
96
96
|
},
|
|
97
|
-
"version": "3.8.
|
|
97
|
+
"version": "3.8.1"
|
|
98
98
|
}
|