Merge pull request #6 from jaxoncreed/fix/NSS#1208

fix/NSS#1208

Author: jaxoncreed

src/SolidClient.js

@@ -1,4 +1,4 @@
-const { resolve, parse: parseUrl } = require('url');
+const { URL, resolve, parse: parseUrl } = require('url');
 const https = require('https');
 const querystring = require('querystring');
 const RelyingParty = require('@trust/oidc-rp');
@@ -174,8 +174,29 @@ class SolidClient {
     }
 
     // Redirect to the authentication page, passing the session cookie
-    const authUrl = loginResponse.headers.location;
+    let authUrl = loginResponse.headers.location;
     const cookie = loginResponse.headers['set-cookie'][0].replace(/;.*/, '');
+
+    // Handle the new consent page in 5.1.1
+    if (this.isAboveVersion511(loginResponse.headers['x-powered-by'])) {
+      const consentUrl = new URL(authUrl);
+      const search = consentUrl.search.substring(1);
+      let consPostData = JSON.parse('{"' + decodeURIComponent(search).replace(/"/g, '\\"').replace(/&/g, '","').replace(/\=/g, '":"') + '"}');
+      consPostData.consent = true;
+      consPostData.access_mode = ['Read', 'Write', 'Append', 'Control'];
+      consPostData = querystring.stringify(consPostData);
+      const consOptions = parseUrl(`${consentUrl.origin}${consentUrl.pathname}`);
+      consOptions.method = 'POST';
+      consOptions.headers = {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        'Content-Length': consPostData.length,
+        cookie,
+      };
+      const consentResponse = await this.fetch(consOptions, consPostData);
+
+      authUrl = consentResponse.headers.location;
+    }
+
     const authResponse = await this.fetch(Object.assign(parseUrl(authUrl), {
       headers: { cookie },
     }));
@@ -185,6 +206,10 @@ class SolidClient {
     return accessUrl;
   }
 
+  isAboveVersion511(version) {
+    return /^solid-server\/5\.(1\.[1-9]|[2-9]|1\d)/.test(version);
+  }
+
   /**
    * Fetches the given resource over HTTP.
    *