scimgateway 5.3.1 → 5.3.3

package/README.md

@@ -1405,6 +1405,19 @@ MIT © [Jarle Elshaug](https://www.elshaug.xyz)
 
 ## Change log  
 
+### v5.3.3
+
+[Fixed]  
+
+- helper-rest, SamlBearer token-request now includes `new_token=true` to avoid retrieving an existing token that is about to expire
+
+### v5.3.2
+
+[Improved]  
+
+- helper-rest, retry on request error 504 Gateway Timeout
+- performance micro-optimization on log mask logic
+
 ### v5.3.1
 
 [Fixed]  

package/lib/helper-rest.ts

@@ -142,6 +142,7 @@ export class HelperRest {
             grant_type: 'urn:ietf:params:oauth:grant-type:saml2-bearer',
             client_id: clientId,
             company_id: companyId,
+            new_token: true,
             assertion: await samlAssertion.run(context, cert, key, issuer, lifetime, clientId, nameId, userIdentifierFormat, tokenEndpoint, audience, delay),
           }
           break
@@ -699,7 +700,7 @@ export class HelperRest {
       try { urlObj = new URL(path) } catch (err) { void 0 }
       let isServiceClient = !urlObj && this._serviceClient[baseEntity] && !this.lock.isLocked() // !isLocked to avoid retry ongoing doRequest with failing getAccessToken()
       let oAuthTokeErr = statusCode === 401 && this.config_entity[baseEntity].connection?.auth?.type && this.config_entity[baseEntity].connection.auth.type.startsWith('oauth')
-      if (isServiceClient && (err.code === 'ECONNREFUSED' || err.code === 'ENOTFOUND' || err.code === 'ABORT_ERR' || err.code === 'ETIMEDOUT' || oAuthTokeErr || retryAfter)) {
+      if (isServiceClient && (err.code === 'ECONNREFUSED' || err.code === 'ENOTFOUND' || err.code === 'ABORT_ERR' || err.code === 'ETIMEDOUT' || statusCode === 504 || oAuthTokeErr || retryAfter)) {
         this.scimgateway.logDebug(baseEntity, `doRequest ${method} ${path} Body = ${JSON.stringify(body)} Error Response = ${err.message}`)
         if (retryAfter) {
           this.scimgateway.logDebug(baseEntity, `doRequest ${method} ${path} throttle/ratelimit error - awaiting ${retryAfter} seconds before automatic retry`)

package/lib/logger.ts

@@ -176,21 +176,23 @@ export class Logger {
     msg = msg.replace(
       this.reJson,
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      (_, keyValuePair, value) => `${keyValuePair}"********"`,
+      (_, keyValuePair, value) => `${keyValuePair}"******"`,
     )
 
     // Mask JSON path/value secrets (SCIM 2.0 PATCH Operations)
-    msg = msg.replace(
-      this.reJsonPathValue,
-      (_, prefix, value, suffix) => `${prefix}********${suffix}`,
-    )
+    if (msg.includes('"path"')) {
+      msg = msg.replace(
+        this.reJsonPathValue,
+        (_, prefix, value, suffix) => `${prefix}******${suffix}`,
+      )
+    }
 
-    if (msg.includes('<?xml')) {
     // Mask XML/Soap secrets
     // console.log('XML matches found:', msg.match(this.reXml)
+    if (msg.includes('<?xml')) {
       msg = msg.replace(
         this.reXml,
-        (_, startTag, tagName, value, endTag) => `${startTag}********${endTag}`,
+        (_, startTag, tagName, value, endTag) => `${startTag}******${endTag}`,
       )
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scimgateway",
-  "version": "5.3.1",
+  "version": "5.3.3",
   "type": "module",
   "description": "Using SCIM protocol as a gateway for user provisioning to other endpoints",
   "author": "Jarle Elshaug <jarle.elshaug@gmail.com> (https://elshaug.xyz)",