@zowe/core-for-zowe-sdk 7.17.0 → 7.18.0
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/lib/apiml/Services.js +1 -1
- package/lib/apiml/Services.js.map +1 -1
- package/lib/auth/Login.js +2 -1
- package/lib/auth/Login.js.map +1 -1
- package/lib/auth/Logout.d.ts +1 -1
- package/lib/auth/Logout.js +35 -4
- package/lib/auth/Logout.js.map +1 -1
- package/lib/auth/LogoutConstants.d.ts +9 -0
- package/lib/auth/LogoutConstants.js +12 -0
- package/lib/auth/LogoutConstants.js.map +1 -1
- package/lib/constants/Core.constants.js +4 -1
- package/lib/constants/Core.constants.js.map +1 -1
- package/lib/rest/ZosmfRestClient.js +6 -4
- package/lib/rest/ZosmfRestClient.js.map +1 -1
- package/package.json +3 -3
package/lib/apiml/Services.js
CHANGED
|
@@ -77,7 +77,7 @@ class Services {
|
|
|
77
77
|
imperative_1.ImperativeExpect.toNotBeNullOrUndefined(session.ISession.password, "Password for API ML basic login must be defined.");
|
|
78
78
|
}
|
|
79
79
|
else {
|
|
80
|
-
imperative_1.ImperativeExpect.
|
|
80
|
+
imperative_1.ImperativeExpect.toMatchRegExp(session.ISession.tokenType, "^apimlAuthenticationToken.*", `Token type (${session.ISession.tokenType}) for API ML token login must start with 'apimlAuthenticationToken'.`);
|
|
81
81
|
imperative_1.ImperativeExpect.toNotBeNullOrUndefined(session.ISession.tokenValue, "Token value for API ML token login must be defined.");
|
|
82
82
|
}
|
|
83
83
|
// Perform GET request on APIML services endpoint
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Services.js","sourceRoot":"","sources":["../../src/apiml/Services.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;;AAEF,iDACmE;AACnE,qDAAkD;AAIlD,sCAAsC;AAEtC;;;;GAIG;AACH,MAAa,QAAQ;IACjB;;;;;;;;;OASG;IACI,MAAM,CAAC,qBAAqB;QAC/B,MAAM,YAAY,GAA2B,EAAE,CAAC;QAChD,6BAAgB,CAAC,sBAAsB,CAAC,6BAAgB,CAAC,QAAQ,CAAC,YAAY,EAC1E,iEAAiE,CACpE,CAAC;QAEF,0DAA0D;QAC1D,KAAK,MAAM,WAAW,IAAI,CAAC,6BAAgB,CAAC,QAAQ,CAAC,YAAY,CAAC,eAAe,IAAI,EAAE,CAAC,EAAE;YACtF,YAAY,CAAC,IAAI,iCACV,WAAW,KACd,YAAY,EAAE,WAAW,CAAC,YAAY,IAAI,6BAAgB,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,EACjG,UAAU,EAAE,6BAAgB,CAAC,QAAQ,CAAC,eAAe,IACvD,CAAC;SACN;QAED,sCAAsC;QACtC,KAAK,MAAM,cAAc,IAAI,qCAAwB,CAAC,QAAQ,CAAC,iBAAiB,EAAE;YAC9E,KAAK,MAAM,WAAW,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,eAAe,IAAI,EAAE,CAAC,EAAE;gBACxE,YAAY,CAAC,IAAI,iCACV,WAAW,KACd,YAAY,EAAE,WAAW,CAAC,YAAY,IAAI,cAAc,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,EACnF,UAAU,EAAE,cAAc,CAAC,UAAU,IACvC,CAAC;aACN;SACJ;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;IAED;;;;;;;;;;;;;OAaG;IACI,MAAM,CAAO,mBAAmB,CAAC,OAAwB,EAAE,OAA+B;;YAC7F,mBAAM,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;YACtD,6BAAgB,CAAC,sBAAsB,CAAC,OAAO,EAAE,kCAAkC,CAAC,CAAC;YACrF,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE;gBACnC,6BAAgB,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,mDAAmD,CAAC,CAAC;gBACpH,6BAAgB,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,kDAAkD,CAAC,CAAC;aAC1H;iBAAM;gBACH,6BAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"Services.js","sourceRoot":"","sources":["../../src/apiml/Services.ts"],"names":[],"mappings":"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"}
|
package/lib/auth/Login.js
CHANGED
|
@@ -40,7 +40,7 @@ class Login {
|
|
|
40
40
|
return __awaiter(this, void 0, void 0, function* () {
|
|
41
41
|
imperative_1.Logger.getAppLogger().trace("Login.login()");
|
|
42
42
|
imperative_1.ImperativeExpect.toNotBeNullOrUndefined(session, "Required session must be defined");
|
|
43
|
-
imperative_1.ImperativeExpect.
|
|
43
|
+
imperative_1.ImperativeExpect.toMatchRegExp(session.ISession.tokenType, "^apimlAuthenticationToken.*", `Token type (${session.ISession.tokenType}) for API ML token login must start with 'apimlAuthenticationToken'.`);
|
|
44
44
|
const client = new ZosmfRestClient_1.ZosmfRestClient(session);
|
|
45
45
|
yield client.request({
|
|
46
46
|
request: "POST",
|
|
@@ -53,6 +53,7 @@ class Login {
|
|
|
53
53
|
source: imperative_1.SessConstants.HTTP_PROTOCOL
|
|
54
54
|
}));
|
|
55
55
|
}
|
|
56
|
+
session.ISession.user = session.ISession.password = session.ISession.base64EncodedAuth = undefined;
|
|
56
57
|
// return token to the caller
|
|
57
58
|
return session.ISession.tokenValue;
|
|
58
59
|
});
|
package/lib/auth/Login.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Login.js","sourceRoot":"","sources":["../../src/auth/Login.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;;AAEF,iDAA4H;AAC5H,6DAA0D;AAC1D,qDAAkD;AAElD;;;;GAIG;AACH,MAAa,KAAK;IAEd;;;;;;OAMG;IACI,MAAM,CAAO,UAAU,CAAC,OAAwB;;YACnD,mBAAM,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAC7C,6BAAgB,CAAC,sBAAsB,CAAC,OAAO,EAAE,kCAAkC,CAAC,CAAC;YACrF,6BAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"Login.js","sourceRoot":"","sources":["../../src/auth/Login.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;;AAEF,iDAA4H;AAC5H,6DAA0D;AAC1D,qDAAkD;AAElD;;;;GAIG;AACH,MAAa,KAAK;IAEd;;;;;;OAMG;IACI,MAAM,CAAO,UAAU,CAAC,OAAwB;;YACnD,mBAAM,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAC7C,6BAAgB,CAAC,sBAAsB,CAAC,OAAO,EAAE,kCAAkC,CAAC,CAAC;YACrF,6BAAgB,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,6BAA6B,EACpF,eAAe,OAAO,CAAC,QAAQ,CAAC,SAAS,sEAAsE,CAAC,CAAC;YAErH,MAAM,MAAM,GAAG,IAAI,iCAAe,CAAC,OAAO,CAAC,CAAC;YAC5C,MAAM,MAAM,CAAC,OAAO,CAAC;gBACjB,OAAO,EAAE,MAAM;gBACf,QAAQ,EAAE,+BAAc,CAAC,iBAAiB;aAC7C,CAAC,CAAC;YAEH,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,KAAK,0BAAa,CAAC,eAAe,EAAE;gBAC9D,MAAM,IAAI,4BAAe,CAAE,MAAc,CAAC,aAAa,CAAC;oBACpD,GAAG,EAAE,wCAAwC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE;oBACzE,WAAW,EAAE,MAAM,CAAC,UAAU;oBAC9B,MAAM,EAAE,0BAAa,CAAC,aAAa;iBACtC,CAAC,CAAC,CAAC;aACP;YACD,OAAO,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,GAAG,SAAS,CAAC;YACnG,6BAA6B;YAC7B,OAAO,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;QACvC,CAAC;KAAA;CAEJ;AAjCD,sBAiCC"}
|
package/lib/auth/Logout.d.ts
CHANGED
package/lib/auth/Logout.js
CHANGED
|
@@ -34,13 +34,13 @@ class Logout {
|
|
|
34
34
|
* @static
|
|
35
35
|
* @param {AbstractSession} session
|
|
36
36
|
* @returns
|
|
37
|
-
* @memberof
|
|
37
|
+
* @memberof Logout
|
|
38
38
|
*/
|
|
39
39
|
static apimlLogout(session) {
|
|
40
40
|
return __awaiter(this, void 0, void 0, function* () {
|
|
41
41
|
imperative_1.Logger.getAppLogger().trace("Logout.logout()");
|
|
42
42
|
imperative_1.ImperativeExpect.toNotBeNullOrUndefined(session, "Required session must be defined");
|
|
43
|
-
imperative_1.ImperativeExpect.
|
|
43
|
+
imperative_1.ImperativeExpect.toMatchRegExp(session.ISession.tokenType, "^apimlAuthenticationToken.*", `Token type (${session.ISession.tokenType}) for API ML logout must start with 'apimlAuthenticationToken'.`);
|
|
44
44
|
imperative_1.ImperativeExpect.toNotBeNullOrUndefined(session.ISession.tokenValue, "Session token not populated. Unable to log out.");
|
|
45
45
|
const client = new ZosmfRestClient_1.ZosmfRestClient(session);
|
|
46
46
|
try {
|
|
@@ -50,8 +50,39 @@ class Logout {
|
|
|
50
50
|
});
|
|
51
51
|
}
|
|
52
52
|
catch (err) {
|
|
53
|
-
|
|
54
|
-
|
|
53
|
+
let errorToThrow = err;
|
|
54
|
+
for (const errorKey in LogoutConstants_1.LogoutConstants.APIML_V2_LOGOUT_ERR_LIST) {
|
|
55
|
+
if (err.message.includes(LogoutConstants_1.LogoutConstants.APIML_V2_LOGOUT_ERR_LIST[errorKey])) {
|
|
56
|
+
switch (errorKey) {
|
|
57
|
+
case "V2_TOKEN_INVALID": // Token is invalid (logged out)
|
|
58
|
+
case "V2_TOKEN_EXPIRED": // Token expired (trully expired)
|
|
59
|
+
case "V2_TOKEN_MISSING": // Token type is not ^apimlAuthenticationToken.*
|
|
60
|
+
errorToThrow = new imperative_1.ImperativeError({
|
|
61
|
+
msg: "Token is not valid or expired.\n" +
|
|
62
|
+
"For CLI usage, see `zowe auth logout apiml --help`",
|
|
63
|
+
errorCode: client.response.statusCode.toString()
|
|
64
|
+
});
|
|
65
|
+
break;
|
|
66
|
+
case "V1_TOKEN_EXPIRED":
|
|
67
|
+
default:
|
|
68
|
+
errorToThrow = null;
|
|
69
|
+
break;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* NOTE: We will continue to check for `V2_TOKEN_...` keys until we know for sure that
|
|
75
|
+
* invalid credentials do not return a 403 on certain APIML configurations with ACF2
|
|
76
|
+
*/
|
|
77
|
+
// if (client.response.statusCode.toString() === "401") {
|
|
78
|
+
// errorToThrow = new ImperativeError({
|
|
79
|
+
// msg: "Token is not valid or expired.\n" +
|
|
80
|
+
// "For CLI usage, see `zowe auth logout apiml --help`",
|
|
81
|
+
// errorCode: client.response.statusCode.toString()
|
|
82
|
+
// });
|
|
83
|
+
// }
|
|
84
|
+
if (errorToThrow) {
|
|
85
|
+
throw errorToThrow;
|
|
55
86
|
}
|
|
56
87
|
}
|
|
57
88
|
if (client.response.statusCode !== imperative_1.RestConstants.HTTP_STATUS_204) {
|
package/lib/auth/Logout.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logout.js","sourceRoot":"","sources":["../../src/auth/Logout.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;;AAEF,iDAA4H;AAC5H,6DAA0D;AAC1D,uDAAoD;AAEpD;;;;GAIG;AACH,MAAa,MAAM;IAEf;;;;;;OAMG;IACI,MAAM,CAAO,WAAW,CAAC,OAAwB;;YACpD,mBAAM,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YAC/C,6BAAgB,CAAC,sBAAsB,CAAC,OAAO,EAAE,kCAAkC,CAAC,CAAC;YACrF,6BAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"Logout.js","sourceRoot":"","sources":["../../src/auth/Logout.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;;AAEF,iDAA4H;AAC5H,6DAA0D;AAC1D,uDAAoD;AAEpD;;;;GAIG;AACH,MAAa,MAAM;IAEf;;;;;;OAMG;IACI,MAAM,CAAO,WAAW,CAAC,OAAwB;;YACpD,mBAAM,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;YAC/C,6BAAgB,CAAC,sBAAsB,CAAC,OAAO,EAAE,kCAAkC,CAAC,CAAC;YACrF,6BAAgB,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,6BAA6B,EACpF,eAAe,OAAO,CAAC,QAAQ,CAAC,SAAS,iEAAiE,CAAC,CAAC;YAChH,6BAAgB,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE,iDAAiD,CAAC,CAAC;YAExH,MAAM,MAAM,GAAG,IAAI,iCAAe,CAAC,OAAO,CAAC,CAAC;YAC5C,IAAG;gBACC,MAAM,MAAM,CAAC,OAAO,CAAC;oBACjB,OAAO,EAAE,MAAM;oBACf,QAAQ,EAAE,iCAAe,CAAC,iBAAiB;iBAC9C,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,YAAY,GAAG,GAAG,CAAC;gBACvB,KAAK,MAAM,QAAQ,IAAI,iCAAe,CAAC,wBAAwB,EAAE;oBAC7D,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,iCAAe,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC,EAAE;wBAC1E,QAAQ,QAAQ,EAAE;4BACd,KAAK,kBAAkB,CAAC,CAAC,gCAAgC;4BACzD,KAAK,kBAAkB,CAAC,CAAC,iCAAiC;4BAC1D,KAAK,kBAAkB,EAAE,gDAAgD;gCACrE,YAAY,GAAG,IAAI,4BAAe,CAAC;oCAC/B,GAAG,EAAE,kCAAkC;wCACnC,oDAAoD;oCACxD,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE;iCACnD,CAAC,CAAC;gCACH,MAAM;4BACV,KAAK,kBAAkB,CAAC;4BACxB;gCACI,YAAY,GAAG,IAAI,CAAC;gCACpB,MAAM;yBACb;qBACJ;iBACJ;gBAED;;;mBAGG;gBACH,yDAAyD;gBACzD,2CAA2C;gBAC3C,oDAAoD;gBACpD,oEAAoE;gBACpE,2DAA2D;gBAC3D,UAAU;gBACV,IAAI;gBACJ,IAAI,YAAY,EAAE;oBACd,MAAM,YAAY,CAAC;iBACtB;aACJ;YAED,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,KAAK,0BAAa,CAAC,eAAe,EAAE;gBAC9D,IAAI,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,KAAK,0BAAa,CAAC,eAAe;oBAC5D,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,iCAAe,CAAC,sBAAsB,CAAC,CAAC,EAAE;oBACvE,MAAM,IAAI,4BAAe,CAAE,MAAc,CAAC,aAAa,CAAC;wBACpD,GAAG,EAAE,wCAAwC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE;wBACzE,WAAW,EAAE,MAAM,CAAC,UAAU;wBAC9B,MAAM,EAAE,0BAAa,CAAC,aAAa;qBACtC,CAAC,CAAC,CAAC;iBACP;aACJ;QACL,CAAC;KAAA;CACJ;AAvED,wBAuEC"}
|
|
@@ -18,4 +18,13 @@ export declare class LogoutConstants {
|
|
|
18
18
|
* @memberof LogoutConstants
|
|
19
19
|
*/
|
|
20
20
|
static readonly APIML_V1_TOKEN_EXP_ERR: string;
|
|
21
|
+
/**
|
|
22
|
+
* Zowe Token Expired Error Codes
|
|
23
|
+
* @static
|
|
24
|
+
* @type {string}
|
|
25
|
+
* @memberof LogoutConstants
|
|
26
|
+
*/
|
|
27
|
+
static readonly APIML_V2_LOGOUT_ERR_LIST: {
|
|
28
|
+
[key: string]: string;
|
|
29
|
+
};
|
|
21
30
|
}
|
|
@@ -33,4 +33,16 @@ LogoutConstants.APIML_V1_RESOURCE = "/gateway/api/v1/auth/logout";
|
|
|
33
33
|
* @memberof LogoutConstants
|
|
34
34
|
*/
|
|
35
35
|
LogoutConstants.APIML_V1_TOKEN_EXP_ERR = "TokenExpireException";
|
|
36
|
+
/**
|
|
37
|
+
* Zowe Token Expired Error Codes
|
|
38
|
+
* @static
|
|
39
|
+
* @type {string}
|
|
40
|
+
* @memberof LogoutConstants
|
|
41
|
+
*/
|
|
42
|
+
LogoutConstants.APIML_V2_LOGOUT_ERR_LIST = {
|
|
43
|
+
V1_TOKEN_EXPIRED: LogoutConstants.APIML_V1_TOKEN_EXP_ERR,
|
|
44
|
+
V2_TOKEN_EXPIRED: "org.zowe.apiml.security.expiredToken",
|
|
45
|
+
V2_TOKEN_INVALID: "org.zowe.apiml.security.query.invalidToken",
|
|
46
|
+
V2_TOKEN_MISSING: "org.zowe.apiml.security.query.tokenNotProvided",
|
|
47
|
+
};
|
|
36
48
|
//# sourceMappingURL=LogoutConstants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogoutConstants.js","sourceRoot":"","sources":["../../src/auth/LogoutConstants.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAGF;;;;GAIG;AACH,MAAa,eAAe;;AAA5B,
|
|
1
|
+
{"version":3,"file":"LogoutConstants.js","sourceRoot":"","sources":["../../src/auth/LogoutConstants.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAGF;;;;GAIG;AACH,MAAa,eAAe;;AAA5B,0CA+BC;AA5BG;;;;;GAKG;AACoB,iCAAiB,GAAW,6BAA6B,CAAC;AAEjF;;;;;GAKG;AACoB,sCAAsB,GAAW,sBAAsB,CAAC;AAE/E;;;;;GAKG;AACoB,wCAAwB,GAA2B;IACtE,gBAAgB,EAAE,eAAe,CAAC,sBAAsB;IACxD,gBAAgB,EAAE,sCAAsC;IACxD,gBAAgB,EAAE,4CAA4C;IAC9D,gBAAgB,EAAE,gDAAgD;CACrE,CAAC"}
|
|
@@ -243,7 +243,10 @@ ProfileConstants.APIML_LOGOUT_EXAMPLE2 = {
|
|
|
243
243
|
/**
|
|
244
244
|
* Option used in APIML logout command for token-type
|
|
245
245
|
*/
|
|
246
|
-
ProfileConstants.APIML_LOGOUT_OPTION_TOKEN_TYPE = Object.assign(Object.assign({}, ProfileConstants.BASE_OPTION_TOKEN_TYPE), { allowableValues: {
|
|
246
|
+
ProfileConstants.APIML_LOGOUT_OPTION_TOKEN_TYPE = Object.assign(Object.assign({}, ProfileConstants.BASE_OPTION_TOKEN_TYPE), { allowableValues: {
|
|
247
|
+
values: imperative_1.SessConstants.ALL_TOKEN_TYPES
|
|
248
|
+
.map(tk => tk.indexOf(imperative_1.SessConstants.TOKEN_TYPE_APIML) >= 0 ? `^${imperative_1.SessConstants.TOKEN_TYPE_APIML}.*` : tk)
|
|
249
|
+
} });
|
|
247
250
|
/**
|
|
248
251
|
* Profile configuration for SSH profiles
|
|
249
252
|
* @type {ICommandProfileTypeConfiguration}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Core.constants.js","sourceRoot":"","sources":["../../src/constants/Core.constants.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAEF,iDAAwI;AAGxI;;GAEG;AACH,MAAa,gBAAgB;;AAA7B,
|
|
1
|
+
{"version":3,"file":"Core.constants.js","sourceRoot":"","sources":["../../src/constants/Core.constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -119,7 +119,8 @@ class ZosmfRestClient extends imperative_1.RestClient {
|
|
|
119
119
|
}
|
|
120
120
|
else {
|
|
121
121
|
original.msg += "\nToken is not valid or expired.\n" +
|
|
122
|
-
"
|
|
122
|
+
"To obtain a new valid token, use the following command: `zowe config secure`\n" +
|
|
123
|
+
"For CLI usage, see `zowe config secure --help`";
|
|
123
124
|
}
|
|
124
125
|
// TODO: Add PFX support in the future
|
|
125
126
|
}
|
|
@@ -140,14 +141,15 @@ class ZosmfRestClient extends imperative_1.RestClient {
|
|
|
140
141
|
if (this.session.ISession.type === imperative_1.SessConstants.AUTH_TYPE_BASIC) {
|
|
141
142
|
original.additionalDetails = "Username or password are not valid or expired.\n\n";
|
|
142
143
|
}
|
|
143
|
-
else if (this.session.ISession.type === imperative_1.SessConstants.AUTH_TYPE_TOKEN) {
|
|
144
|
+
else if (this.session.ISession.type === imperative_1.SessConstants.AUTH_TYPE_TOKEN && this.session.ISession.tokenValue != null) {
|
|
144
145
|
if (this.session.ISession.tokenType === imperative_1.SessConstants.TOKEN_TYPE_APIML && !this.session.ISession.basePath) {
|
|
145
146
|
original.additionalDetails = `Token type "${imperative_1.SessConstants.TOKEN_TYPE_APIML}" requires base path to be defined.\n\n` +
|
|
146
147
|
"You must either connect with username and password or provide a base path.";
|
|
147
148
|
}
|
|
148
149
|
else {
|
|
149
|
-
original.additionalDetails = "Token is not valid or expired.\n
|
|
150
|
-
"
|
|
150
|
+
original.additionalDetails = "Token is not valid or expired.\n" +
|
|
151
|
+
"To obtain a new valid token, use the following command: `zowe config secure`\n" +
|
|
152
|
+
"For CLI usage, see `zowe config secure --help`";
|
|
151
153
|
}
|
|
152
154
|
// TODO: Add PFX support in the future
|
|
153
155
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ZosmfRestClient.js","sourceRoot":"","sources":["../../src/rest/ZosmfRestClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ZosmfRestClient.js","sourceRoot":"","sources":["../../src/rest/ZosmfRestClient.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zowe/core-for-zowe-sdk",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.18.0",
|
|
4
4
|
"description": "Core libraries shared by Zowe SDK packages",
|
|
5
5
|
"author": "Zowe",
|
|
6
6
|
"license": "EPL-2.0",
|
|
@@ -49,8 +49,8 @@
|
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@types/node": "^14.18.28",
|
|
52
|
-
"@zowe/cli-test-utils": "7.
|
|
53
|
-
"@zowe/imperative": "5.
|
|
52
|
+
"@zowe/cli-test-utils": "7.18.0",
|
|
53
|
+
"@zowe/imperative": "5.18.0",
|
|
54
54
|
"chalk": "^4.1.0",
|
|
55
55
|
"eslint": "^8.22.0",
|
|
56
56
|
"madge": "^4.0.1",
|