@zowe/core-for-zowe-sdk 7.16.3 → 7.16.5

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.
Files changed (3) hide show
  1. package/lib/rest/ZosmfRestClient.js +11 -5
  2. package/lib/rest/ZosmfRestClient.js.map +1 -1
  3. package/package.json +3 -3
package/lib/rest/ZosmfRestClient.js CHANGED
@@ -83,12 +83,18 @@ class ZosmfRestClient extends imperative_1.RestClient {
83
83
  if (this.session.ISession.type === imperative_1.SessConstants.AUTH_TYPE_BASIC) {
84
84
  original.additionalDetails = "Username or password are not valid or expired.\n\n";
85
85
  }
86
- if (this.session.ISession.type === imperative_1.SessConstants.AUTH_TYPE_TOKEN) {
87
- original.additionalDetails = "Token is not valid or expired.\n\n" +
88
- "For CLI usage, see `zowe auth login apiml --help`";
86
+ else if (this.session.ISession.type === imperative_1.SessConstants.AUTH_TYPE_TOKEN) {
87
+ if (this.session.ISession.tokenType === imperative_1.SessConstants.TOKEN_TYPE_APIML && !this.session.ISession.basePath) {
88
+ original.additionalDetails = `Token type "${imperative_1.SessConstants.TOKEN_TYPE_APIML}" requires base path to be defined.\n\n` +
89
+ "You must either connect with username and password or provide a base path.";
90
+ }
91
+ else {
92
+ original.additionalDetails = "Token is not valid or expired.\n\n" +
93
+ "For CLI usage, see `zowe auth login apiml --help`";
94
+ }
95
+ // TODO: Add PFX support in the future
89
96
  }
90
- // TODO: Add PFX support in the future
91
- if (this.session.ISession.type === imperative_1.SessConstants.AUTH_TYPE_CERT_PEM) {
97
+ else if (this.session.ISession.type === imperative_1.SessConstants.AUTH_TYPE_CERT_PEM) {
92
98
  original.additionalDetails = "Certificate is not valid or expired.\n\n";
93
99
  }
94
100
  }
package/lib/rest/ZosmfRestClient.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ZosmfRestClient.js","sourceRoot":"","sources":["../../src/rest/ZosmfRestClient.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;AAEF,iDAAiH;AACjH,iDAA8C;AAE9C;;;;;;GAMG;AACH,MAAa,eAAgB,SAAQ,uBAAU;IAE3C;;;OAGG;IACH,IAAW,GAAG;QACV,OAAO,mBAAM,CAAC,YAAY,EAAE,CAAC;IACjC,CAAC;IAED;;;;;OAKG;IACO,aAAa,CAAC,OAA0B;QAC9C,IAAI,OAAO,IAAI,IAAI,EAAE;YACjB,OAAO,GAAG,CAAC,2BAAY,CAAC,mBAAmB,CAAC,CAAC;SAChD;aAAM;YACH,OAAO,CAAC,IAAI,CAAC,2BAAY,CAAC,mBAAmB,CAAC,CAAC;SAClD;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED;;;;;OAKG;IACO,YAAY,CAAC,QAA0B;QAC7C,QAAQ,CAAC,GAAG,GAAG,0BAA0B,GAAG,QAAQ,CAAC,GAAG,CAAC;QAEzD,IAAI,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC;QACnC,IAAI;YACA,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACjC,4EAA4E;YAC5E,kCAAkC;YAClC,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,EAAE;gBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kDAAkD;oBAC7D,wDAAwD,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;gBACpF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mFAAmF,CAAC,CAAC;gBACpG,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,yBAAyB;aAC/C;YAED,uEAAuE;YACvE,OAAO,GAAG,sBAAS,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;SAC1D;QAAC,OAAO,CAAC,EAAE;YACR,wDAAwD;YACxD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mGAAmG,CAAC,CAAC;SACvH;QACD,QAAQ,CAAC,GAAG,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,kDAAkD;QAElF,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,KAAK,0BAAa,CAAC,eAAe,EAAE;YAC7E,QAAQ,CAAC,GAAG,GAAG,6CAA6C,GAAG,QAAQ,CAAC,GAAG;gBACvE,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAChD,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAC5C,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAChD,eAAe,GAAG,IAAI,CAAC,SAAS;gBAChC,eAAe,GAAG,IAAI,CAAC,QAAQ;gBAC/B,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC;gBAClD,eAAe,GAAG,IAAI,CAAC,QAAQ;gBAC/B,IAAI,CACP;YAED,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,0BAAa,CAAC,eAAe,EAAE;gBAC9D,QAAQ,CAAC,iBAAiB,GAAG,oDAAoD,CAAC;aACrF;YACD,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,0BAAa,CAAC,eAAe,EAAE;gBAC9D,QAAQ,CAAC,iBAAiB,GAAG,oCAAoC;oBAC7D,mDAAmD,CAAC;aAC3D;YACD,sCAAsC;YACtC,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,0BAAa,CAAC,kBAAkB,EAAE;gBACjE,QAAQ,CAAC,iBAAiB,GAAG,0CAA0C,CAAC;aAC3E;SACJ;QAED,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ;AAjFD,0CAiFC"}
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.16.3",
3
+ "version": "7.16.5",
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.16.3",
53
- "@zowe/imperative": "5.14.1",
52
+ "@zowe/cli-test-utils": "7.16.5",
53
+ "@zowe/imperative": "5.15.1",
54
54
  "chalk": "^4.1.0",
55
55
  "eslint": "^8.22.0",
56
56
  "madge": "^4.0.1",