Tests done for solid backend

pondersource · Aug 11, 2024 · 07bcf1c · 07bcf1c
1 parent 4a55b71
commit 07bcf1c
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 36 deletions.
diff --git a/release/remotestorage.js b/release/remotestorage.js
@@ -50299,7 +50299,7 @@ class Authorize {
      * browser will navigate back to redirectUri and OAuth will continue
      * with onFeaturesLoaded.
      */
-    static authorize(remoteStoFrage, options) {
+    static authorize(remoteStorage, options) {
         (0, log_1.default)('[Authorize] authURL = ', options.authURL, 'scope = ', options.scope, 'redirectUri = ', options.redirectUri, 'clientId = ', options.clientId, 'response_type =', options.response_type);
         if (!options.scope) {
             throw new Error("Cannot authorize due to undefined or empty scope; did you forget to access.claim()?");

diff --git a/release/remotestorage.js.map b/release/remotestorage.js.map
diff --git a/src/solid/configObserver.ts → src/interfaces/configObserver.ts b/src/solid/configObserver.ts → src/interfaces/configObserver.ts
diff --git a/src/solid.ts b/src/solid.ts
@@ -15,8 +15,8 @@ import {
   localStorageAvailable
 } from './util';
 import {Remote, RemoteBase, RemoteResponse, RemoteSettings} from "./remote";
-import ConfigObserver from "./solid/configObserver";
-import ConfigStorage from "./solid/solidStorage";
+import ConfigObserver from "./interfaces/configObserver";
+import ConfigStorage from "./solidStorage";
 import Blob from "blob";
 
 const SETTINGS_KEY = 'remotestorage:solid';
@@ -174,13 +174,12 @@ class Solid extends RemoteBase implements Remote, ConfigObserver {
    *
    * @protected
    */
-  configure (settings: RemoteSettings) { // Settings parameter compatible with WireClient
-    // TODO fix comments
+  configure (settings: RemoteSettings) {
     // We only update this.userAddress if settings.userAddress is set to a string or to null
     if (typeof settings.userAddress !== 'undefined') { this.userAddress = settings.userAddress; }
-    // We only update this.userAddress if settings.userAddress is set to a string or to null
+    // We only update this.authURL if settings.href is set to a string or to null
     if (typeof settings.href !== 'undefined') { this.authURL = settings.href; }
-    // Same for this.token. If only one of these two is set, we leave the other one at its existing value
+    // Read session properties and pod URL from the properties if it exists
     if (typeof settings.properties !== 'undefined') {
       const properties = settings.properties as {sessionProperties: object, podURL: string};
 
@@ -227,9 +226,7 @@ class Solid extends RemoteBase implements Remote, ConfigObserver {
 
     if (this.sessionProperties) {
       this.configStorage.setConfig(JSON.stringify(this.sessionProperties));
-      this.connected = false;
-
-      // TODO this.connect();
+      this.connected = this.session.info && this.session.info.isLoggedIn;
       writeSettingsToCache.apply(this);
     } else {
       handleError.apply(this);
@@ -253,25 +250,36 @@ class Solid extends RemoteBase implements Remote, ConfigObserver {
   }
 
   setPodURL(podURL: string): void {
+    if (this.selectedPodURL === podURL) {
+      return;
+    }
+
     this.selectedPodURL = podURL;
 
     if (this.session.info && this.session.info.isLoggedIn) {
-      let settings = getJSONFromLocalStorage(SETTINGS_KEY);
-      if (!settings) {
-        settings = { };
+      if (this.selectedPodURL) {
+        let settings = getJSONFromLocalStorage(SETTINGS_KEY);
+        if (!settings) {
+          settings = { };
+        }
+
+        settings.userAddress = this.session.info.webId;
+        settings.href = this.authURL;
+        settings.properties = {
+          sessionProperties: this.sessionProperties,
+          podURL: this.selectedPodURL
+        };
+
+        localStorage.setItem(SETTINGS_KEY, JSON.stringify(settings));
+
+        this.connected = true;
+        this._emit('connected');
+      }
+      else {
+        this.connected = false;
+        this.rs._emit('pod-not-selected');
       }
-
-      settings.userAddress = this.session.info.webId;
-      settings.href = this.authURL;
-      settings.properties = {
-        sessionProperties: this.sessionProperties,
-        podURL: this.selectedPodURL
-      };
-
-      localStorage.setItem(SETTINGS_KEY, JSON.stringify(settings));
     }
-
-    this._emit('connected');
   }
 
   getPodURL(): string|null {
@@ -284,6 +292,11 @@ class Solid extends RemoteBase implements Remote, ConfigObserver {
   connect (): void {
     this.rs.setBackend('solid');
 
+    if (!this.authURL) {
+      this.rs._emit('error', new Error(`No authURL is configured.`));
+      return;
+    }
+
     this.session.login({
       oidcIssuer: this.authURL,
       redirectUrl: new URL("/", window.location.href).toString(),

diff --git a/src/solid/solidStorage.ts → src/solidStorage.ts b/src/solid/solidStorage.ts → src/solidStorage.ts
@@ -1,7 +1,7 @@
 import {
     IStorage,
   } from "@inrupt/solid-client-authn-browser";
-import ConfigObserver from "./configObserver";
+import ConfigObserver from "./interfaces/configObserver";
 
 class BrowserStorage implements IStorage {
   get storage(): typeof window.localStorage {

diff --git a/test/unit/solid-suite.js b/test/unit/solid-suite.js
@@ -95,31 +95,76 @@ define(['util', 'require', './build/eventhandling', './build/solid',
 
   var tests = [
     {
-      desc: "#configure sets 'connected' to true, once sessionProperties is given",
+      desc: "#configure sets userAddress when given",
       run: function (env, test) {
         env.client.configure({
-          sessionProperties: { }
+          userAddress: '[email protected]'
         });
-        test.assert(env.client.connected, true);
+        test.assert(env.client.userAddress, '[email protected]');
       }
     },
-
     {
-      desc: "#configure sets userAddress when given",
+      desc: "#configure sets authURL when given",
       run: function (env, test) {
         env.client.configure({
-          userAddress: '[email protected]'
+          href: 'https://solidcommunity.net'
         });
-        test.assert(env.client.userAddress, '[email protected]');
+        test.assert(env.client.authURL, 'https://solidcommunity.net');
       }
     },
-
-
+    {
+      desc: "#configure sets sessionProperties when given",
+      run: function (env, test) {
+        env.client.configure({
+          properties: {
+            sessionProperties: { check: true }
+          }
+        });
+        test.assert(env.client.sessionProperties, { check: true });
+      }
+    },
+    {
+      desc: "#configure sets podURL when given",
+      run: function (env, test) {
+        env.client.configure({
+          properties: {
+            podURL: 'https://example.solidcommunity.net/'
+          }
+        });
+        test.assert(env.client.selectedPodURL, 'https://example.solidcommunity.net/');
+      }
+    },
+    {
+      desc: "#setAuthURL will update auth URL",
+      run: function (env, test) {
+        env.client.setAuthURL('https://solidcommunity.net');
+        test.assert(env.client.authURL, 'https://solidcommunity.net');
+      }
+    },
+    {
+      desc: "#setPodURL will update the selected pod URL",
+      run: function (env, test) {
+        env.client.setPodURL('https://example.solidcommunity.net/');
+        test.assert(env.client.selectedPodURL, 'https://example.solidcommunity.net/');
+      }
+    },
+    {
+      desc: "#connect will emit error if the auth URL is not set",
+      run: function (env, test) {
+        const errorCheck = { hasError: false };
+        env.rs.on('error', function(error) {
+          test.assert(error.message, 'No authURL is configured.');
+          errorCheck.hasError = true;
+        });
+        env.client.connect();
+        test.assert(errorCheck.hasError, true);
+      }
+    }
   ];
 
   suites.push({
     name: "Solid",
-    desc: "Solid back-end",
+    desc: "session configuration & setup",
     setup: setup,
     beforeEach: beforeEach,
     afterEach: afterEach,