@nsshunt/stsappframework 3.1.152 → 3.1.154
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/dist/authutilsnode.js
CHANGED
|
@@ -179,6 +179,7 @@ class AuthUtilsNode {
|
|
|
179
179
|
};
|
|
180
180
|
GetAPITokenFromAuthServerUsingScope = async (options, errorCb) => {
|
|
181
181
|
const { scope, clientId, authClientSecret, endPoint, instrumentController } = options;
|
|
182
|
+
let stage = '1';
|
|
182
183
|
const invokeErrorCb = (error) => {
|
|
183
184
|
this.#LogDebugMessage(error);
|
|
184
185
|
if (instrumentController) {
|
|
@@ -189,9 +190,11 @@ class AuthUtilsNode {
|
|
|
189
190
|
errorCb(error);
|
|
190
191
|
};
|
|
191
192
|
try {
|
|
193
|
+
stage = '2';
|
|
192
194
|
const scopes = scope.split(' ');
|
|
193
195
|
let origin = null;
|
|
194
196
|
let error = null;
|
|
197
|
+
stage = '3';
|
|
195
198
|
for (let i = 0; i < scopes.length; i++) {
|
|
196
199
|
const s = scopes[i];
|
|
197
200
|
if (!origin) {
|
|
@@ -215,10 +218,12 @@ class AuthUtilsNode {
|
|
|
215
218
|
}
|
|
216
219
|
}
|
|
217
220
|
}
|
|
221
|
+
stage = '4';
|
|
218
222
|
if (error) {
|
|
219
223
|
invokeErrorCb(error);
|
|
220
224
|
return "";
|
|
221
225
|
}
|
|
226
|
+
stage = '5';
|
|
222
227
|
const headers = { 'Content-Type': 'application/json' };
|
|
223
228
|
const payload = {
|
|
224
229
|
client_id: clientId, // The service calling this method
|
|
@@ -229,9 +234,11 @@ class AuthUtilsNode {
|
|
|
229
234
|
//@@ need scope to be the API identifier
|
|
230
235
|
grant_type: "client_credentials"
|
|
231
236
|
};
|
|
237
|
+
stage = '6';
|
|
232
238
|
const url = (endPoint
|
|
233
239
|
? `${endPoint}${stsconfig_1.goptions.asoauthapiroot}/token`
|
|
234
240
|
: `${stsconfig_1.goptions.asendpoint}:${stsconfig_1.goptions.asport}${stsconfig_1.goptions.asoauthapiroot}/token`);
|
|
241
|
+
stage = `6.5: url: [${url}] payload: [${JSON.stringify(payload)}]`;
|
|
235
242
|
const retVal = await (0, axios_1.default)({
|
|
236
243
|
url,
|
|
237
244
|
method: 'post',
|
|
@@ -239,6 +246,7 @@ class AuthUtilsNode {
|
|
|
239
246
|
headers: headers,
|
|
240
247
|
httpsAgent: this.#GetHttpsAgent()
|
|
241
248
|
});
|
|
249
|
+
stage = '7';
|
|
242
250
|
if (retVal.status) {
|
|
243
251
|
if (retVal.status !== 200) {
|
|
244
252
|
// Just provide a warning here
|
|
@@ -249,21 +257,28 @@ class AuthUtilsNode {
|
|
|
249
257
|
invokeErrorCb(new Error(chalk_1.default.red(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.status)`)));
|
|
250
258
|
return "";
|
|
251
259
|
}
|
|
260
|
+
stage = '8';
|
|
252
261
|
if (retVal.data) {
|
|
262
|
+
stage = '9';
|
|
253
263
|
if (retVal.data.access_token) {
|
|
264
|
+
stage = '10';
|
|
254
265
|
if (instrumentController) {
|
|
266
|
+
stage = '11';
|
|
255
267
|
instrumentController.UpdateInstrument(stsobservability_1.Gauge.AUTHENTICATION_COUNT_GAUGE, {
|
|
256
268
|
Inc: 1
|
|
257
269
|
});
|
|
258
270
|
}
|
|
271
|
+
stage = '12';
|
|
259
272
|
return retVal.data.access_token;
|
|
260
273
|
}
|
|
261
274
|
else {
|
|
275
|
+
stage = '13';
|
|
262
276
|
invokeErrorCb(new Error(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.data.access_token)`));
|
|
263
277
|
return "";
|
|
264
278
|
}
|
|
265
279
|
}
|
|
266
280
|
else {
|
|
281
|
+
stage = '14';
|
|
267
282
|
invokeErrorCb(new Error(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.data)`));
|
|
268
283
|
return "";
|
|
269
284
|
}
|
|
@@ -279,7 +294,7 @@ class AuthUtilsNode {
|
|
|
279
294
|
details = `Could not JSON.stringify(error.response.data)`;
|
|
280
295
|
}
|
|
281
296
|
}
|
|
282
|
-
invokeErrorCb(new Error(`Error (AuthUtilsNode:GetAPITokenFromServer:catch): [${error}], Details: [${details}]`));
|
|
297
|
+
invokeErrorCb(new Error(`Error (AuthUtilsNode:GetAPITokenFromServer:catch): [${error}], Stage: [${stage}], Details: [${details}]`));
|
|
283
298
|
return "";
|
|
284
299
|
}
|
|
285
300
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authutilsnode.js","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"authutilsnode.js","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAiC;AACjC,kDAAyB;AACzB,gEAA+B;AAC/B,2CAAuC;AACvC,wDAAkC;AAElC,kDAA0B;AAE1B,kDAA6C;AAE7C,gDAA2E;AAE3E,gDAA2D;AAE3D,yDAAgD;AAEhD,kDAA0B;AAE1B,gEAA8E;AAE9E,+CAAmC;AAuBnC,MAAa,aAAa;IAEtB,MAAM,GAAiC,EAAG,CAAC;IAC3C,aAAa,GAAW,IAAI,CAAC;IAC7B,OAAO,CAAY;IACnB,UAAU,CAAkB;IAC5B,WAAW,GAAuB,IAAI,CAAC;IACvC,yCAAyC;IACzC,YAAY,GAAG,gBAAgB,CAAC;IAEhC,YAAY,MAAkB;QAC1B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,IAAI,sBAAK,CAAC,SAAS,EAAE,CAAC;IAC5C,CAAC;IAED,8DAA8D;IAC9D,gBAAgB,CAAC,OAAY;QACzB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAED,cAAc,GAAG,GAAG,EAAE;QAElB,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;YAC5B,mDAAmD;YACnD,IAAI,CAAC,WAAW,GAAG,IAAI,eAAK,CAAC,KAAK,CAAC;gBAC/B,SAAS,EAAE,oBAAQ,CAAC,SAAS;gBAC7B,UAAU,EAAE,oBAAQ,CAAC,UAAU;gBAC/B,eAAe,EAAE,oBAAQ,CAAC,eAAe;gBACzC,cAAc,EAAE,oBAAQ,CAAC,cAAc;gBACvC,OAAO,EAAE,oBAAQ,CAAC,OAAO;gBACzB,kBAAkB,EAAE,KAAK;aAC5B,CAAC,CAAC;QACP,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC,CAAA;IAED,8BAA8B,GAAG,CAAC,OAA8B,EAAE,EAAE;QAChE,8DAA8D;QAC9D,OAAO,KAAK,EAAE,GAAQ,EAAE,GAAQ,EAAE,IAAS,EAAE,EAAE;YAC3C,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;gBAEtB,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACrD,MAAM,QAAQ,GAAI,GAAG,CAAC,IAAI,CAAC,KAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAEjE,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC9E,IAAI,EAAE,CAAC;oBACP,OAAO;gBACX,CAAC;gBAED,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAEzC,MAAM,mBAAmB,GAAG,EAAG,CAAC;gBAChC,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBAChD,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;oBAC1C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;wBAC/B,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACzC,CAAC;gBACL,CAAC;gBACD,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACjC,MAAM,YAAY,GAAG,IAAA,0BAAe,EAAC,8BAAqB,CAAC,+BAA+B,EAAE,mBAAmB,CAAC,CAAC;oBACjH,GAAG,CAAC,MAAM,CAAC,+BAAW,CAAC,YAAY,CAAC,CAAC,IAAI,CAAE,EAAE,MAAM,EAAE,+BAAW,CAAC,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;oBACtG,OAAO;gBACX,CAAC;gBAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;oBAC/B,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG;wBAC1B,MAAM,EAAE,EAAG;qBACd,CAAA;gBACL,CAAC;gBAED,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG;oBAC3C,KAAK,EAAE,QAAQ;oBACf,OAAO,EAAE,UAAU,CAAC,GAAG,EAAE;wBACrB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;oBACvD,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE;iBACjC,CAAA;YACL,CAAC;YACD,IAAI,EAAE,CAAC;QACX,CAAC,CAAA;IACL,CAAC,CAAA;IACD;;;;;;;;;;;;;;;MAeD;IAEC,8DAA8D;IAC9D,KAAK,CAAC,uBAAuB,CAAC,GAAQ,EAAE,GAAQ,EAAE,IAAS;QAEvD,IAAI,EAAE,CAAC;QACP;;;;;;;;;;;;;;;;;;UAkBJ;IACA,CAAC;IAED,8DAA8D;IAC9D,eAAe,GAAG,KAAK,EAAE,OAA4B,EAAE,QAAgB,EAA2B,EAAE;QAEhG,IAAI,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACxB,8DAA8D;YAC9D,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,YAAiB,EAAE,EAAE;gBAC5C,8DAA8D;gBAC9D,MAAM,MAAM,GAAQ,sBAAK,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gBACrD,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACpD,CAAC,CAAC,CAAC;QACP,CAAC;aAAM,CAAC;YACJ,8DAA8D;YAC9D,MAAM,MAAM,GAAQ,sBAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;YAC9D,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACpD,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC,CAAC;IAEF,iBAAiB,GAAG,KAAK,EAAE,QAAgB,EAA2B,EAAE;QAEpE,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC,CAAC;IAEF,WAAW,GAAG,KAAK,EAAE,KAAa,EAAE,QAAgB,EAAE,QAAiB,EAAmB,EAAE;QACxF,MAAM,aAAa,GAAG,CAAC,QAAQ;YAC3B,CAAC,CAAC,GAAG,QAAQ,GAAG,oBAAQ,CAAC,cAAc,GAAG,oBAAQ,CAAC,cAAc,EAAE;YACnE,CAAC,CAAC,GAAG,oBAAQ,CAAC,UAAU,IAAI,oBAAQ,CAAC,MAAM,GAAG,oBAAQ,CAAC,cAAc,GAAG,oBAAQ,CAAC,cAAc,EAAE,CAAC,CAAC;QAEvG,MAAM,IAAI,GAAG,IAAA,kBAAU,EAAC;YACpB,KAAK,EAAE,IAAI,EAAE,qBAAqB;YAClC,eAAe,EAAE,CAAC,EAAE,gBAAgB;YACpC,WAAW,EAAE,MAAM,EAAE,kBAAkB;YACvC,SAAS,EAAE,IAAI;YACf,qBAAqB,EAAE,EAAE,EAAE,gBAAgB;YAC3C,OAAO,EAAE,aAAa;YACtB,OAAO,EAAE,KAAK,EAAE,WAAW;YAC3B,YAAY,EAAE,IAAI,CAAC,cAAc,EAAE;SACtC,CAAC,CAAC;QAEH,4BAA4B;QAC5B,MAAM,mBAAmB,GAAG,IAAA,sBAAS,EAAa,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3E,MAAM,GAAG,GAAG,mBAAmB,CAAC,GAAG,CAAC;QAEpC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;QAEtC,MAAM,aAAa,GAAG;YAClB,MAAM,EAAE,iBAAG;YACX,cAAc;YACd,QAAQ,EAAG,QAAQ;YACnB,gCAAgC;YAChC,SAAS,EAAG,CAAC,OAAO,CAAC,CAAG,uCAAuC;SAClE,CAAC;QAEF,OAAO,sBAAG,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,aAAa,CAAW,CAAC;IAClE,CAAC,CAAA;IAED,4CAA4C;IAC5C,aAAa,GAAG,CAAC,GAAW,EAAE,EAAE;QAC5B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC3C,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnC,CAAC,CAAA;IAED,mCAAmC,GAAG,KAAK,EAAE,OAAoD,EAAE,OAA+B,EAAmB,EAAE;QACnJ,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC;QAEtF,IAAI,KAAK,GAAG,GAAG,CAAC;QAEhB,MAAM,aAAa,GAAG,CAAC,KAAY,EAAE,EAAE;YACnC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC7B,IAAI,oBAAoB,EAAE,CAAC;gBACvB,oBAAoB,CAAC,gBAAgB,CAAC,wBAAK,CAAC,gCAAgC,EAAE;oBAC1E,GAAG,EAAE,CAAC;iBACT,CAAC,CAAC;YACP,CAAC;YACD,OAAO,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC,CAAC;QAEF,IAAI,CAAC;YACD,KAAK,GAAG,GAAG,CAAC;YACZ,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAChC,IAAI,MAAM,GAAkB,IAAI,CAAC;YACjC,IAAI,KAAK,GAAiB,IAAI,CAAC;YAC/B,KAAK,GAAG,GAAG,CAAC;YACZ,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACnC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,CAAC,MAAM,EAAE,CAAC;oBACV,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;oBAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;wBACV,KAAK,GAAG,IAAI,KAAK,CAAC,WAAW,KAAK,mGAAmG,CAAC,CAAC;wBACvI,MAAM;oBACV,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,MAAM,UAAU,GAAkB,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;oBACxD,IAAI,CAAC,UAAU,EAAE,CAAC;wBACd,KAAK,GAAG,IAAI,KAAK,CAAC,WAAW,KAAK,mGAAmG,CAAC,CAAC;wBACvI,MAAM;oBACV,CAAC;yBAAM,CAAC;wBACJ,IAAI,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;4BACzC,KAAK,GAAG,IAAI,KAAK,CAAC,WAAW,KAAK,oFAAoF,CAAC,CAAC;4BACxH,MAAM;wBACV,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;YACD,KAAK,GAAG,GAAG,CAAC;YACZ,IAAI,KAAK,EAAE,CAAC;gBACR,aAAa,CAAC,KAAK,CAAC,CAAC;gBACrB,OAAO,EAAE,CAAC;YACd,CAAC;YAED,KAAK,GAAG,GAAG,CAAC;YACZ,MAAM,OAAO,GAAG,EAAE,cAAc,EAAE,kBAAkB,EAAC,CAAC;YACtD,MAAM,OAAO,GAAG;gBACZ,SAAS,EAAE,QAAQ,EAAE,kCAAkC;gBACvD,aAAa,EAAE,gBAAgB,EAAE,6BAA6B;gBAC9D,6EAA6E;gBAC7E,KAAK,EAAE,KAAK,EAAE,eAAe;gBAC7B,oBAAoB;gBACpB,wCAAwC;gBACxC,UAAU,EAAE,oBAAoB;aACnC,CAAA;YACD,KAAK,GAAG,GAAG,CAAC;YACZ,MAAM,GAAG,GAAG,CAAC,QAAQ;gBACjB,CAAC,CAAC,GAAG,QAAQ,GAAG,oBAAQ,CAAC,cAAc,QAAQ;gBAC/C,CAAC,CAAC,GAAG,oBAAQ,CAAC,UAAU,IAAI,oBAAQ,CAAC,MAAM,GAAG,oBAAQ,CAAC,cAAc,QAAQ,CAAC,CAAC;YAEnF,KAAK,GAAG,cAAc,GAAG,eAAe,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAA;YAElE,MAAM,MAAM,GAAG,MAAM,IAAA,eAAK,EAAC;gBACvB,GAAG;gBACF,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,OAAO;gBAChB,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE;aACrC,CAAC,CAAC;YAEH,KAAK,GAAG,GAAG,CAAC;YACZ,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAChB,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBACxB,8BAA8B;oBAC9B,IAAI,CAAC,gBAAgB,CAAC,eAAK,CAAC,OAAO,CAAC,+EAA+E,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAC1I,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,aAAa,CAAC,IAAI,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC,CAAC,CAAC;gBACpG,OAAO,EAAE,CAAC;YACd,CAAC;YACD,KAAK,GAAG,GAAG,CAAC;YACZ,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;gBACd,KAAK,GAAG,GAAG,CAAC;gBACZ,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;oBAC3B,KAAK,GAAG,IAAI,CAAC;oBACb,IAAI,oBAAoB,EAAE,CAAC;wBACvB,KAAK,GAAG,IAAI,CAAC;wBACb,oBAAoB,CAAC,gBAAgB,CAAC,wBAAK,CAAC,0BAA0B,EAAE;4BACpE,GAAG,EAAE,CAAC;yBACT,CAAC,CAAC;oBACP,CAAC;oBAED,KAAK,GAAG,IAAI,CAAC;oBACb,OAAO,MAAM,CAAC,IAAI,CAAC,YAAsB,CAAC;gBAC9C,CAAC;qBAAM,CAAC;oBACJ,KAAK,GAAG,IAAI,CAAC;oBACb,aAAa,CAAC,IAAI,KAAK,CAAC,yEAAyE,CAAC,CAAC,CAAC;oBACpG,OAAO,EAAE,CAAC;gBACd,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,KAAK,GAAG,IAAI,CAAC;gBACb,aAAa,CAAC,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC,CAAC;gBACvF,OAAO,EAAE,CAAC;YACd,CAAC;YACL,8DAA8D;QAC9D,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YAClB,IAAI,OAAO,GAAG,iBAAiB,CAAC;YAChC,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACxC,IAAI,CAAC;oBACD,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAClD,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,OAAO,GAAG,+CAA+C,CAAC;gBAC9D,CAAC;YACL,CAAC;YACD,aAAa,CAAC,IAAI,KAAK,CAAC,uDAAuD,KAAK,cAAc,KAAK,gBAAgB,OAAO,GAAG,CAAC,CAAC,CAAC;YACpI,OAAO,EAAE,CAAC;QACd,CAAC;IACL,CAAC,CAAA;CACJ;AApTD,sCAoTC"}
|
package/package.json
CHANGED
package/src/authutilsnode.ts
CHANGED
|
@@ -230,6 +230,8 @@ export class AuthUtilsNode
|
|
|
230
230
|
GetAPITokenFromAuthServerUsingScope = async (options: IGetAPITokenFromAuthServerUsingScopeOptions, errorCb: (error: Error) => void): Promise<string> => {
|
|
231
231
|
const { scope, clientId, authClientSecret, endPoint, instrumentController } = options;
|
|
232
232
|
|
|
233
|
+
let stage = '1';
|
|
234
|
+
|
|
233
235
|
const invokeErrorCb = (error: Error) => {
|
|
234
236
|
this.#LogDebugMessage(error);
|
|
235
237
|
if (instrumentController) {
|
|
@@ -240,10 +242,12 @@ export class AuthUtilsNode
|
|
|
240
242
|
errorCb(error);
|
|
241
243
|
};
|
|
242
244
|
|
|
243
|
-
try
|
|
245
|
+
try {
|
|
246
|
+
stage = '2';
|
|
244
247
|
const scopes = scope.split(' ');
|
|
245
248
|
let origin: string | null = null;
|
|
246
249
|
let error: Error | null = null;
|
|
250
|
+
stage = '3';
|
|
247
251
|
for (let i=0; i < scopes.length; i++) {
|
|
248
252
|
const s = scopes[i];
|
|
249
253
|
if (!origin) {
|
|
@@ -265,11 +269,13 @@ export class AuthUtilsNode
|
|
|
265
269
|
}
|
|
266
270
|
}
|
|
267
271
|
}
|
|
272
|
+
stage = '4';
|
|
268
273
|
if (error) {
|
|
269
274
|
invokeErrorCb(error);
|
|
270
275
|
return "";
|
|
271
276
|
}
|
|
272
277
|
|
|
278
|
+
stage = '5';
|
|
273
279
|
const headers = { 'Content-Type': 'application/json'};
|
|
274
280
|
const payload = { //@@ make a type
|
|
275
281
|
client_id: clientId, // The service calling this method
|
|
@@ -280,9 +286,13 @@ export class AuthUtilsNode
|
|
|
280
286
|
//@@ need scope to be the API identifier
|
|
281
287
|
grant_type: "client_credentials"
|
|
282
288
|
}
|
|
289
|
+
stage = '6';
|
|
283
290
|
const url = (endPoint
|
|
284
291
|
? `${endPoint}${goptions.asoauthapiroot}/token`
|
|
285
292
|
: `${goptions.asendpoint}:${goptions.asport}${goptions.asoauthapiroot}/token`);
|
|
293
|
+
|
|
294
|
+
stage = `6.5: url: [${url}] payload: [${JSON.stringify(payload)}]`
|
|
295
|
+
|
|
286
296
|
const retVal = await axios({
|
|
287
297
|
url
|
|
288
298
|
,method: 'post'
|
|
@@ -291,6 +301,7 @@ export class AuthUtilsNode
|
|
|
291
301
|
,httpsAgent: this.#GetHttpsAgent()
|
|
292
302
|
});
|
|
293
303
|
|
|
304
|
+
stage = '7';
|
|
294
305
|
if (retVal.status) {
|
|
295
306
|
if (retVal.status !== 200) {
|
|
296
307
|
// Just provide a warning here
|
|
@@ -300,20 +311,27 @@ export class AuthUtilsNode
|
|
|
300
311
|
invokeErrorCb(new Error(chalk.red(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.status)`)));
|
|
301
312
|
return "";
|
|
302
313
|
}
|
|
314
|
+
stage = '8';
|
|
303
315
|
if (retVal.data) {
|
|
316
|
+
stage = '9';
|
|
304
317
|
if (retVal.data.access_token) {
|
|
318
|
+
stage = '10';
|
|
305
319
|
if (instrumentController) {
|
|
320
|
+
stage = '11';
|
|
306
321
|
instrumentController.UpdateInstrument(Gauge.AUTHENTICATION_COUNT_GAUGE, {
|
|
307
322
|
Inc: 1
|
|
308
323
|
});
|
|
309
324
|
}
|
|
310
325
|
|
|
326
|
+
stage = '12';
|
|
311
327
|
return retVal.data.access_token as string;
|
|
312
328
|
} else {
|
|
329
|
+
stage = '13';
|
|
313
330
|
invokeErrorCb(new Error(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.data.access_token)`));
|
|
314
331
|
return "";
|
|
315
332
|
}
|
|
316
333
|
} else {
|
|
334
|
+
stage = '14';
|
|
317
335
|
invokeErrorCb(new Error(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.data)`));
|
|
318
336
|
return "";
|
|
319
337
|
}
|
|
@@ -327,7 +345,7 @@ export class AuthUtilsNode
|
|
|
327
345
|
details = `Could not JSON.stringify(error.response.data)`;
|
|
328
346
|
}
|
|
329
347
|
}
|
|
330
|
-
invokeErrorCb(new Error(`Error (AuthUtilsNode:GetAPITokenFromServer:catch): [${error}], Details: [${details}]`));
|
|
348
|
+
invokeErrorCb(new Error(`Error (AuthUtilsNode:GetAPITokenFromServer:catch): [${error}], Stage: [${stage}], Details: [${details}]`));
|
|
331
349
|
return "";
|
|
332
350
|
}
|
|
333
351
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authutilsnode.d.ts","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,cAAc,CAAC;AAUjC,OAAO,EAAmB,UAAU,EAAc,MAAM,mBAAmB,CAAA;AAQ3E,OAAO,EAAS,2BAA2B,EAAE,MAAM,2BAA2B,CAAA;AAI9E,MAAM,WAAW,qBAAqB;IAClC,WAAW,EAAE,MAAM,EAAE,CAAA;CACxB;AAED,MAAM,WAAW,2CAA2C;IACxD,QAAQ,EAAE,MAAM,CAAA;IAChB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,oBAAoB,CAAC,EAAE,2BAA2B,CAAA;CACrD;AAWD,qBAAa,aAAa;;gBAUV,MAAM,EAAE,UAAU;IA0B9B,8BAA8B,YAAa,qBAAqB,WAEzC,GAAG,OAAO,GAAG,QAAQ,GAAG,mBAyC9C;IAmBK,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAyB3D,eAAe,YAAmB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,YAAY,MAAM,KAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAgB/F;IAEF,iBAAiB,aAAoB,MAAM,KAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAGnE;IAEF,WAAW,UAAiB,MAAM,YAAY,MAAM,aAAa,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,CAgCxF;IAGD,aAAa,QAAS,MAAM,mBAG3B;IAED,mCAAmC,YAAmB,2CAA2C,WAAW,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,KAAG,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"authutilsnode.d.ts","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,cAAc,CAAC;AAUjC,OAAO,EAAmB,UAAU,EAAc,MAAM,mBAAmB,CAAA;AAQ3E,OAAO,EAAS,2BAA2B,EAAE,MAAM,2BAA2B,CAAA;AAI9E,MAAM,WAAW,qBAAqB;IAClC,WAAW,EAAE,MAAM,EAAE,CAAA;CACxB;AAED,MAAM,WAAW,2CAA2C;IACxD,QAAQ,EAAE,MAAM,CAAA;IAChB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,oBAAoB,CAAC,EAAE,2BAA2B,CAAA;CACrD;AAWD,qBAAa,aAAa;;gBAUV,MAAM,EAAE,UAAU;IA0B9B,8BAA8B,YAAa,qBAAqB,WAEzC,GAAG,OAAO,GAAG,QAAQ,GAAG,mBAyC9C;IAmBK,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAyB3D,eAAe,YAAmB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,YAAY,MAAM,KAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAgB/F;IAEF,iBAAiB,aAAoB,MAAM,KAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAGnE;IAEF,WAAW,UAAiB,MAAM,YAAY,MAAM,aAAa,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,CAgCxF;IAGD,aAAa,QAAS,MAAM,mBAG3B;IAED,mCAAmC,YAAmB,2CAA2C,WAAW,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,KAAG,OAAO,CAAC,MAAM,CAAC,CAyHnJ;CACJ"}
|