better auth failure logging

matomo-org · Nov 14, 2024 · 6adc6b2 · 6adc6b2
1 parent 6618509
commit 6adc6b2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/auth.ts b/src/auth.ts
@@ -7,7 +7,7 @@
 
 import * as Api from './api';
 import cc from './connector';
-import { debugLog } from './log';
+import { log } from './log';
 
 export function getAuthType() {
     return cc.newAuthTypeResponse()
@@ -22,9 +22,18 @@ export function checkForValidCreds(instanceUrl?: string, token?: string) {
         instanceUrl,
         token,
     });
-    return Array.isArray(responseContent) && !!responseContent.length;
+
+    if (!Array.isArray(responseContent)) {
+      log('checkForValidCreds', `auth response is not an array (found ${typeof responseContent})`);
+      return false;
+    }
+
+    if (!!responseContent.length) {
+      log('checkForValidCreds', 'auth response is an empty array');
+      return false;
+    }
   } catch (error) {
-    debugLog('checkForValidCreds:', 'failed to get sites ID with parameters', error.stack || error.message);
+    log('checkForValidCreds', 'failed to get sites ID with parameters', error.connectorErrorMessage || error.stack || error.message);
     return false;
   }
 }

diff --git a/src/error.ts b/src/error.ts
@@ -24,6 +24,7 @@ export function throwUserError(message: string) {
     cc.newUserError().setText(message).throwException();
   } catch (e) {
     e.isConnectorThrownError = true;
+    e.connectorErrorMessage = message; // so we can inspect the message later
     throw e;
   }
 }