Refactoring test suite

Author: perki

src/appTemplates/AppClientAccount.js

@@ -41,12 +41,14 @@ class AppClientAccount extends Application {
       const collectorClient = this.cache.collectorClientsMap[collectorClientKey];
       logger.debug('AppClient:handleIncomingRequest found existing', { collectorClient });
       if (incomingEventId && collectorClient.requesterEventId !== incomingEventId) {
-        logger.error('Found existing collectorClient with a different eventId', { actual: collectorClient.requesterEventId, incoming: incomingEventId });
-        return await collectorClient.reset(apiEndpoint, incomingEventId, accessInfo);
+        throw new HDSLibError('Found existing collectorClient with a different eventId', { actual: collectorClient.requesterEventId, incoming: incomingEventId });
+        // we might consider reseting() in the future;
+        // return await collectorClient.reset(apiEndpoint, incomingEventId, accessInfo);
       }
       if (collectorClient.apiEndpoint !== apiEndpoint) {
         logger.error('Found existing collectorClient with a different apiEndpoint', { actual: collectorClient.requesterApiEndpoint, incoming: apiEndpoint });
-        return await collectorClient.reset(apiEndpoint, incomingEventId, accessInfo);
+        // we might consider reseting() in the future;
+        // return await collectorClient.reset(apiEndpoint, incomingEventId, accessInfo);
       }
       return collectorClient;
     }

src/appTemplates/Application.js

@@ -146,6 +146,9 @@ async function createAppStreams (app) {
       { method: 'streams.create', params: { id: app.baseStreamId, name: app.appName, parentId: 'applications' } }
     ];
     const streamCreateResult = await app.connection.api(apiCalls);
+    for (const r of streamCreateResult) {
+      if (r.error) throw new Error('Failed creating app streams', { apiCalls, streamCreateResult });
+    }
     const stream = streamCreateResult[1].stream;
     app.cache.streamData = stream;
   }

src/patchedPryv.js

@@ -15,7 +15,7 @@ if (!pryv.Connection.prototype.apiOne) {
  * @param {string} [resultKey] - if given, returns the value or throws an error if not present
  * @throws {Error} if .error is present the response
  */
-  pryv.Connection.prototype.apiOne = async function (method, params = {}, expectedKey) {
+  pryv.Connection.prototype.apiOne = async function apiOne (method, params = {}, expectedKey) {
     const result = await this.api([{ method, params }]);
     if (result[0] == null || result[0].error || (expectedKey != null && result[0][expectedKey] == null)) {
       const innerObject = result[0]?.error || result;
@@ -26,6 +26,35 @@ if (!pryv.Connection.prototype.apiOne) {
     if (expectedKey != null) return result[0][expectedKey];
     return result[0];
   };
+
+  /**
+   * Revoke : Delete the accessId
+   * - Do not thow error if access is already revoked, just return null;
+   * @param {boolean} [throwOnFail = true] - if set to false do not throw Error on failure
+   * @param {Connection} [usingConnection] - specify which connection issues the revoke, might be necessary when selfRovke
+   */
+  pryv.Connection.prototype.revoke = async function revoke (throwOnFail = true, usingConnection) {
+    usingConnection = usingConnection || this;
+    let accessInfo = null;
+    // get accessId
+    try {
+      accessInfo = await this.accessInfo();
+    } catch (e) {
+      if (e.response?.body?.error?.id === 'invalid-access-token') {
+        return null; // Already revoked OK..
+      }
+      if (throwOnFail) throw e;
+      return null;
+    }
+    // delete access
+    try {
+      const result = usingConnection.apiOne('accesses.delete', { id: accessInfo.id });
+      return result;
+    } catch (e) {
+      if (throwOnFail) throw e;
+      return null;
+    }
+  };
 }
 
 module.exports = pryv;