feat: Add option to set UMA Auth Server URL on Solid Server initialization

Author: Dexagod

package.json

@@ -56,6 +56,7 @@
     "build": "yarn workspaces foreach --include 'packages/*' -A -pi -j unlimited -t run build",
     "test": "yarn workspaces foreach --include 'packages/*' -A -pi -j unlimited run test",
     "start": "yarn workspaces foreach --include 'packages/*' -A -pi -j unlimited run start",
+    "start:demo": "yarn workspaces foreach --include 'packages/*' -A -pi -j unlimited run demo",
     "script:public": "yarn exec ts-node ./scripts/test-public.ts",
     "script:private": "yarn exec ts-node ./scripts/test-private.ts",
     "script:registration": "yarn exec ts-node ./scripts/test-registration.ts",

packages/css/config/uma/default.json

@@ -73,6 +73,9 @@
       "umaPatStore": {
         "@id": "urn:solid-server:default:UmaPatStore",
         "@type": "MemoryMapStorage"
+      }, 
+      "umaServerURL": {
+        "@id": "urn:solid-server:uma:variable:AuthorizationServer"
       }
     },
     {
@@ -98,6 +101,41 @@
           "@id": "urn:solid-server:default:ResourceRegistrar"
         }
       ]
+    },
+    {
+      "@id": "urn:solid-server-app-setup:default:CliExtractor",
+      "@type": "YargsCliExtractor",
+      "parameters": [
+        {
+          "@type": "YargsParameter",
+          "name": "authServer",
+          "options": {
+            "alias": "a",
+            "requiresArg": true,
+            "type": "string",
+            "describe": "The URL of the UMA Authorization Server."
+          }
+        }
+      ]
+    }, {
+      "comment": "Converts an input key/value object into an object mapping values to Components.js variables",
+      "@id": "urn:solid-server-app-setup:default:ShorthandResolver",
+      "@type": "CombinedShorthandResolver",
+      "resolvers": [
+        {
+          "CombinedShorthandResolver:_resolvers_key": "urn:solid-server:uma:variable:AuthorizationServer",
+          "CombinedShorthandResolver:_resolvers_value": {
+            "@type": "KeyExtractor",
+            "key": "authServer",
+            "defaultValue": "http://localhost:4000"
+          }
+        }
+      ]
+    },
+    {
+      "comment": "URL of the UMA Authorization Server.",
+      "@id": "urn:solid-server:uma:variable:AuthorizationServer",
+      "@type": "Variable"
     }
   ]
 }

packages/css/package.json

@@ -60,10 +60,11 @@
     "build:ts": "yarn run -T tsc",
     "build:components": "yarn run -T componentsjs-generator -r uma-css -s src/ -c dist/components -i .componentsignore --lenient",
     "test": "yarn run -T jest --coverage",
-    "start": "yarn run community-solid-server -m . -c ./config/default.json --seedConfig ./config/seed.json",
+    "start:unseeded": "yarn run community-solid-server -m . -c ./config/default.json -a http://localhost:4000/",
+    "start": "yarn run community-solid-server -m . -c ./config/default.json --seedConfig ./config/seed.json -a http://localhost:4000/",
     "demo": "yarn run demo:setup && yarn run demo:start",
     "demo:setup": "yarn run -T shx rm -rf ./tmp && yarn run -T shx cp -R ../../demo/data ./tmp",
-    "demo:start": "yarn run community-solid-server -m . -c ./config/demo.json -f ./tmp"
+    "demo:start": "yarn run community-solid-server -m . -c ./config/demo.json -f ./tmp -a http://localhost:4000/"
   },
   "dependencies": {
     "@solid/community-server": "^7.0.2",

packages/css/src/util/OwnerUtil.ts

@@ -19,6 +19,7 @@ export class OwnerUtil {
     protected accountStore: AccountStore,
     protected storageStrategy: StorageLocationStrategy,
     protected umaPatStore: KeyValueStorage<string, { issuer: string, pat: string }>,
+    protected umaServerURL: string,
   ) {}
 
   /**
@@ -74,7 +75,15 @@ export class OwnerUtil {
   }
 
   public async findIssuer(webid: string): Promise<string | undefined> {
-    return 'http://localhost:4000/uma';
+    if (!this.umaServerURL) {
+      this.logger.warn(`No UMA Authorization Server variable set. Falling back on http://localhost:4000/`)
+      return 'http://localhost:4000/uma';
+    }
+    this.logger.verbose(`Using UMA Authorization Server at ${this.umaServerURL} for WebID ${webid}.`)
+    return this.umaServerURL.endsWith('/') ? this.umaServerURL + 'uma' : this.umaServerURL + '/uma'
+
+    // Dunno if it makes sense to code this as retrieving it from the WebID at this point? 
+    // I think we are far off from dynamically attaching multiple auth servers to a single solid server.
 
     // TODO: softcode