do not overwrite idGoal parameter if found in API metadata (#70)

* do not overwrite idGoal parameter if found in API metadata

* throw if localtunnel setup fails

* debug failing test

* try to fix the test failure with a timeout?

* more debugging

* remove debugging code

* remove default filter when getting all reports in tests

* add missing expected test files

src/data.ts

@@ -290,9 +290,11 @@ function getReportData(request: GoogleAppsScript.Data_Studio.Request<ConnectorPa
       filter_limit: `${limitToUse}`,
       filter_offset: `${offset}`,
       showColumns,
+      apiModule: null,
+      apiAction: null,
     };
 
-    if (reportParams.apiModule !== 'Goals') {
+    if (reportParams.apiModule !== 'Goals' && typeof params.idGoal === 'undefined') {
       params.filter_update_columns_when_show_all_goals = '1';
       params.idGoal = '0'; // calculate extra metrics for all goals
     }

tests/appscript/api.spec.ts

@@ -20,6 +20,10 @@ describe('api', () => {
         port: 3000,
         host: process.env.USE_LOCALTUNNEL,
       });
+
+      if ( ! tunnel.url ) {
+        throw new Error('Failed to setup localtunnel!');
+      }
     });
 
     beforeAll(async () => {
@@ -128,7 +132,7 @@ describe('api', () => {
       const result = await Clasp.run('setCredentials', {
         userToken: {
           username: `${ tunnel.url }/forced-random-error/`,
-          token: 'ignored',
+          token: 'forcedrandomerror',
         },
       });
 
@@ -167,6 +171,9 @@ describe('api', () => {
         },
       });
 
+      // waiting seems to be required here, or the mock server isn't used in time
+      await new Promise((resolve) => setTimeout(resolve, 5000));
+
       // use the mock server's path that forces a non-random error
       await Clasp.run('setCredentials', {
         userToken: {

tests/appscript/expected/config_oldMatomoVersion.json

@@ -25,4 +25,4 @@
     }
   ],
   "isSteppedConfig": true
-}
+}