@solid/solid-auth-oidc 0.5.6 → 0.5.8-2b0114c1

package/lib/index.js

@@ -26,10 +26,12 @@
  */
 'use strict';
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var RelyingParty = require('@solid/oidc-rp');
 var PoPToken = require('@solid/oidc-rp/src/PoPToken');
 var providerSelectPopupSource = require('./provider-select-popup');
@@ -40,8 +42,7 @@ var QUERY = 'query';
 
 // AuthenticationRequest sending methods
 var REDIRECT = 'redirect';
-
-var ClientAuthOIDC = function () {
+var ClientAuthOIDC = /*#__PURE__*/function () {
   /**
    * @constructor
    * @param [options={}]
@@ -50,12 +51,9 @@ var ClientAuthOIDC = function () {
    */
   function ClientAuthOIDC() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
     _classCallCheck(this, ClientAuthOIDC);
-
     this.window = options.window || global.window;
     this.store = options.store || global.localStorage;
-
     this.currentClient = null;
     this.providerUri = null;
     this.webId = null;
@@ -63,9 +61,8 @@ var ClientAuthOIDC = function () {
     this.accessToken = null;
     this.method = REDIRECT; // only redirect is currently supported
   }
-
-  _createClass(ClientAuthOIDC, [{
-    key: 'initEventListeners',
+  return _createClass(ClientAuthOIDC, [{
+    key: "initEventListeners",
     value: function initEventListeners(window) {
       window.addEventListener('message', this.onMessage.bind(this));
     }
@@ -75,25 +72,21 @@ var ClientAuthOIDC = function () {
      *
      * @return {string|null}
      */
-
   }, {
-    key: 'currentLocation',
+    key: "currentLocation",
     value: function currentLocation() {
       var window = this.window;
-
       if (!window || !window.location) {
         return null;
       }
-
       return window.location.href;
     }
 
     /**
      * @return {Promise<string>} Resolves to current user's WebID URI
      */
-
   }, {
-    key: 'currentUser',
+    key: "currentUser",
     value: function currentUser() {
       if (this.webId) {
         return Promise.resolve(this.webId);
@@ -101,7 +94,6 @@ var ClientAuthOIDC = function () {
 
       // Attempt to find a provider based on the 'state' param of the current URI
       var providerUri = this.providerFromCurrentUri();
-
       if (providerUri) {
         return this.login(providerUri);
       } else {
@@ -115,22 +107,17 @@ var ClientAuthOIDC = function () {
      *
      * @return {string|null}
      */
-
   }, {
-    key: 'providerEndSessionEndpoint',
+    key: "providerEndSessionEndpoint",
     value: function providerEndSessionEndpoint() {
       var rp = this.currentClient;
-
       if (!rp || !rp.provider || !rp.provider.configuration) {
         return null;
       }
-
       var config = rp.provider.configuration;
-
       if (!config.end_session_endpoint) {
         return null;
       }
-
       return config.end_session_endpoint;
     }
 
@@ -142,42 +129,37 @@ var ClientAuthOIDC = function () {
      *
      * @return {string|null} Value of the `state` query or hash fragment param
      */
-
   }, {
-    key: 'extractState',
+    key: "extractState",
     value: function extractState(uri) {
       var uriType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : HASH;
-
       if (!uri) {
         return null;
       }
       var uriObj = new URL(uri);
-      var state = void 0;
-
+      var state;
       if (uriType === HASH) {
         var hash = uriObj.hash || '#';
         var params = new URLSearchParams(hash.substr(1));
         state = params.get('state');
       }
-
       if (uriType === QUERY) {
         state = uriObj.searchParams.get('state');
       }
-
       return state;
     }
   }, {
-    key: 'keyByProvider',
+    key: "keyByProvider",
     value: function keyByProvider(providerUri) {
-      return 'oidc.rp.by-provider.' + providerUri;
+      return "oidc.rp.by-provider.".concat(providerUri);
     }
   }, {
-    key: 'keyByState',
+    key: "keyByState",
     value: function keyByState(state) {
       if (!state) {
         throw new TypeError('No state provided to keyByState()');
       }
-      return 'oidc.rp.by-state.' + state;
+      return "oidc.rp.by-state.".concat(state);
     }
 
     /**
@@ -185,14 +167,11 @@ var ClientAuthOIDC = function () {
      *
      * @return {Promise<RelyingParty>}
      */
-
   }, {
-    key: 'loadOrRegisterClient',
+    key: "loadOrRegisterClient",
     value: function loadOrRegisterClient(providerUri) {
       var _this = this;
-
       this.currentClient = null;
-
       return this.loadClient(providerUri).then(function (loadedClient) {
         if (loadedClient) {
           _this.currentClient = loadedClient;
@@ -208,9 +187,8 @@ var ClientAuthOIDC = function () {
      * @param providerUri {string}
      * @return {Promise<RelyingParty>}
      */
-
   }, {
-    key: 'loadClient',
+    key: "loadClient",
     value: function loadClient(providerUri) {
       if (!providerUri) {
         var error = new Error('Cannot load or register client, providerURI missing');
@@ -224,7 +202,6 @@ var ClientAuthOIDC = function () {
       // Check for client config stored locally
       var key = this.keyByProvider(providerUri);
       var clientConfig = this.store.getItem(key);
-
       if (clientConfig) {
         clientConfig = JSON.parse(clientConfig);
         return RelyingParty.from(clientConfig);
@@ -238,9 +215,8 @@ var ClientAuthOIDC = function () {
      * @param state {string}
      * @return {string}
      */
-
   }, {
-    key: 'loadProvider',
+    key: "loadProvider",
     value: function loadProvider(state) {
       var key = this.keyByState(state);
       var providerUri = this.store.getItem(key);
@@ -258,14 +234,11 @@ var ClientAuthOIDC = function () {
      *
      * @return {Promise<string>} Resolves to the logged in user's WebID URI
      */
-
   }, {
-    key: 'login',
+    key: "login",
     value: function login(providerUri) {
       var _this2 = this;
-
       this.clearCurrentUser();
-
       return Promise.resolve(providerUri).then(function (providerUri) {
         return _this2.selectProvider(providerUri);
       }).then(function (selectedProviderUri) {
@@ -279,7 +252,7 @@ var ClientAuthOIDC = function () {
       });
     }
   }, {
-    key: 'clearCurrentUser',
+    key: "clearCurrentUser",
     value: function clearCurrentUser() {
       this.webId = null;
       this.accessToken = null;
@@ -292,22 +265,16 @@ var ClientAuthOIDC = function () {
      * A redirect is done (instead of an ajax 'get') to enable the provider to
      * clear any http-only session cookies.
      */
-
   }, {
-    key: 'logout',
+    key: "logout",
     value: function logout() {
       this.clearCurrentUser();
-
       var logoutEndpoint = this.providerEndSessionEndpoint();
-
       if (!logoutEndpoint) {
         return;
       }
-
       var logoutUrl = new URL(logoutEndpoint);
-
       logoutUrl.searchParams.set('returnToUrl', this.currentLocation());
-
       this.redirectTo(logoutUrl.toString());
     }
 
@@ -327,9 +294,8 @@ var ClientAuthOIDC = function () {
      *   app developer, just pass it through, no need to take further action.
      * @return {Promise<string>}
      */
-
   }, {
-    key: 'selectProvider',
+    key: "selectProvider",
     value: function selectProvider(providerUri) {
       if (providerUri) {
         return Promise.resolve(providerUri);
@@ -352,13 +318,11 @@ var ClientAuthOIDC = function () {
      *
      * @return {string|null} Provider URI, if present
      */
-
   }, {
-    key: 'providerFromCurrentUri',
+    key: "providerFromCurrentUri",
     value: function providerFromCurrentUri() {
       var currentUri = this.currentLocation();
       var stateParam = this.extractState(currentUri, HASH);
-
       if (stateParam) {
         return this.loadProvider(stateParam);
       } else {
@@ -366,18 +330,16 @@ var ClientAuthOIDC = function () {
       }
     }
   }, {
-    key: 'providerFromUI',
+    key: "providerFromUI",
     value: function providerFromUI() {
       console.log('Getting provider from default popup UI');
       this.initEventListeners(this.window);
-
       if (this.selectProviderWindow) {
         // Popup has already been opened
         this.selectProviderWindow.focus();
       } else {
         // Open a new Provider Select popup window
         this.selectProviderWindow = this.window.open('', 'selectProviderWindow', 'menubar=no,resizable=yes,width=300,height=300');
-
         this.selectProviderWindow.document.write(providerSelectPopupSource);
         this.selectProviderWindow.document.close();
       }
@@ -388,13 +350,11 @@ var ClientAuthOIDC = function () {
      * return redirect.
      * @return {boolean}
      */
-
   }, {
-    key: 'currentUriHasAuthResponse',
+    key: "currentUriHasAuthResponse",
     value: function currentUriHasAuthResponse() {
       var currentUri = this.currentLocation();
       var stateParam = this.extractState(currentUri, HASH);
-
       return !!stateParam;
     }
 
@@ -402,12 +362,10 @@ var ClientAuthOIDC = function () {
      * Redirects the current window to the given uri.
      * @param uri {string}
      */
-
   }, {
-    key: 'redirectTo',
+    key: "redirectTo",
     value: function redirectTo(uri) {
       this.window.location.href = uri;
-
       return false;
     }
 
@@ -417,15 +375,12 @@ var ClientAuthOIDC = function () {
      * @throws {Error}
      * @return {Promise<null>}
      */
-
   }, {
-    key: 'sendAuthRequest',
+    key: "sendAuthRequest",
     value: function sendAuthRequest(client) {
       var _this3 = this;
-
       var options = {};
       var providerUri = client.provider.url;
-
       return client.createRequest(options, this.store).then(function (authUri) {
         var state = _this3.extractState(authUri, QUERY);
         if (!state) {
@@ -445,23 +400,20 @@ var ClientAuthOIDC = function () {
      *   being sent (`null`), or to the webId of the current user (extracted
      *   from the authentication response).
      */
-
   }, {
-    key: 'validateOrSendAuthRequest',
+    key: "validateOrSendAuthRequest",
     value: function validateOrSendAuthRequest(client) {
       if (!client) {
         var error = new Error('Could not load or register a RelyingParty client');
         return Promise.reject(error);
       }
-
       if (this.currentUriHasAuthResponse()) {
         return this.initUserFromResponse(client);
       }
-
       return this.sendAuthRequest(client);
     }
   }, {
-    key: 'issuePoPTokenFor',
+    key: "issuePoPTokenFor",
     value: function issuePoPTokenFor(uri, session) {
       return PoPToken.issueFor(uri, session);
     }
@@ -476,21 +428,17 @@ var ClientAuthOIDC = function () {
      *
      * @returns {Promise<string>} Current user's web id
      */
-
   }, {
-    key: 'initUserFromResponse',
+    key: "initUserFromResponse",
     value: function initUserFromResponse(client) {
       var _this4 = this;
-
       return client.validateResponse(this.currentLocation(), this.store).then(function (response) {
         _this4.idToken = response.authorization.id_token;
         _this4.accessToken = response.authorization.access_token;
         _this4.session = response;
-
         _this4.clearAuthResponseFromUrl();
-
         return _this4.extractAndValidateWebId(response.idClaims.sub);
-      }).catch(function (error) {
+      })["catch"](function (error) {
         _this4.clearAuthResponseFromUrl();
         if (error.message === 'Cannot resolve signing key for ID Token.') {
           console.log('ID Token found, but could not validate. Provider likely has changed their public keys. Please retry login.');
@@ -508,9 +456,8 @@ var ClientAuthOIDC = function () {
      *
      * @return {string}
      */
-
   }, {
-    key: 'extractAndValidateWebId',
+    key: "extractAndValidateWebId",
     value: function extractAndValidateWebId(idToken) {
       var webId = idToken;
       this.webId = webId;
@@ -521,37 +468,31 @@ var ClientAuthOIDC = function () {
      * Removes authentication response data (access token, id token etc) from
      * the current url's hash fragment.
      */
-
   }, {
-    key: 'clearAuthResponseFromUrl',
+    key: "clearAuthResponseFromUrl",
     value: function clearAuthResponseFromUrl() {
       var clearedUrl = this.currentLocationNoHash();
-
       this.replaceCurrentUrl(clearedUrl);
     }
   }, {
-    key: 'currentLocationNoHash',
+    key: "currentLocationNoHash",
     value: function currentLocationNoHash() {
       var currentLocation = this.currentLocation();
       if (!currentLocation) {
         return null;
       }
-
       var currentUrl = new URL(this.currentLocation());
       currentUrl.hash = ''; // remove the hash fragment
       var clearedUrl = currentUrl.toString();
-
       return clearedUrl;
     }
   }, {
-    key: 'replaceCurrentUrl',
+    key: "replaceCurrentUrl",
     value: function replaceCurrentUrl(newUrl) {
       var history = this.window.history;
-
       if (!history) {
         return;
       }
-
       history.replaceState(history.state, history.title, newUrl);
     }
 
@@ -563,14 +504,11 @@ var ClientAuthOIDC = function () {
      * @throws {TypeError} If providerUri is missing
      * @return {Promise<RelyingParty>} Registered RelyingParty client instance
      */
-
   }, {
-    key: 'registerClient',
+    key: "registerClient",
     value: function registerClient(providerUri) {
       var _this5 = this;
-
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
       return this.registerPublicClient(providerUri, options).then(function (registeredClient) {
         _this5.storeClient(registeredClient, providerUri);
         return registeredClient;
@@ -586,12 +524,10 @@ var ClientAuthOIDC = function () {
      * @throws {TypeError} If providerUri is missing
      * @return {Promise<RelyingParty>} Registered RelyingParty client instance
      */
-
   }, {
-    key: 'registerPublicClient',
+    key: "registerPublicClient",
     value: function registerPublicClient(providerUri) {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
       console.log('Registering public client...');
       if (!providerUri) {
         throw new TypeError('Cannot registerClient auth client, missing providerUri');
@@ -609,7 +545,8 @@ var ClientAuthOIDC = function () {
         defaults: {
           authenticate: {
             redirect_uri: redirectUri,
-            response_type: 'id_token token'
+            response_type: 'id_token token',
+            scope: options.scope || 'openid profile'
           }
         },
         store: this.store
@@ -617,7 +554,7 @@ var ClientAuthOIDC = function () {
       return RelyingParty.register(providerUri, registration, rpOptions);
     }
   }, {
-    key: 'onMessage',
+    key: "onMessage",
     value: function onMessage(event) {
       console.log('Auth client received event: ', event);
       if (!event || !event.data) {
@@ -642,9 +579,8 @@ var ClientAuthOIDC = function () {
      * @param providerUri {string}
      * @throws {Error}
      */
-
   }, {
-    key: 'saveProviderByState',
+    key: "saveProviderByState",
     value: function saveProviderByState(state, providerUri) {
       if (!state) {
         throw new Error('Cannot save providerUri - state not provided');
@@ -658,16 +594,12 @@ var ClientAuthOIDC = function () {
      * @param client {RelyingParty}
      * @param providerUri {string}
      */
-
   }, {
-    key: 'storeClient',
+    key: "storeClient",
     value: function storeClient(client, providerUri) {
       this.currentClient = client;
       this.store.setItem(this.keyByProvider(providerUri), client.serialize());
     }
   }]);
-
-  return ClientAuthOIDC;
 }();
-
 module.exports = ClientAuthOIDC;

package/lib/provider-select-popup.js

@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = '<!doctype html>\n<html lang="en">\n<head>\n  <meta charset="utf-8">\n  <meta http-equiv="Content-type" content="text/html;charset=utf-8">\n  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" />\n\n</head>\n<body>\n<div class="container">\n  <div class="row">\n    <div class="col-xs-12 text-center" style="margin-top: 3em;">\n      Login with:\n    </div>\n  </div>\n  <div class="row">\n    <div class="col-xs-12 text-center" style="padding-top: 2em;">\n      <button type="button" class="btn btn-md btn-primary" id="testProvider">\n        solidtest.space\n      </button>\n    </div>\n  </div>\n  <div class="row">\n    <div class="col-xs-12 text-center" style="padding-top: 2em;">\n      or custom:<br />\n      <input type="text" id="customProviderUri" value="https://" />\n      <button type="button" class="btn btn-md" id="customProvider">Go</button>\n    </div>\n  </div>\n</div>\n<script type="text/javascript">\n  window.addEventListener(\'load\', function () { init() });\n\n  function init () {\n    initEvents()\n  }\n\n  function initButton(id, action) {\n    document.getElementById(id).addEventListener(\'click\', action)\n  }\n\n  function initEvents () {\n    initButton(\'testProvider\',\n      function () { selectProvider(\'https://solidtest.space\') })\n    initButton(\'customProvider\',\n      function () {\n        var defaultValue = \'https://\'\n        var customUri = document.getElementById(\'customProviderUri\')\n        if (customUri && customUri.value !== defaultValue) {\n          selectProvider(customUri.value)\n        }\n      })\n  }\n\n  function selectProvider (providerUri) {\n    console.log(\'Provider selected: \', providerUri)\n    var message = {\n      event_type: \'providerSelected\',\n      value: providerUri\n    }\n    console.log(\'opener.window.location: \', opener.window.location.href)\n\n    opener.postMessage(message, opener.window.location.origin)\n  }\n</script>\n</body>\n</html>\n';
+module.exports = "<!doctype html>\n<html lang=\"en\">\n<head>\n  <meta charset=\"utf-8\">\n  <meta http-equiv=\"Content-type\" content=\"text/html;charset=utf-8\">\n  <link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css\" />\n\n</head>\n<body>\n<div class=\"container\">\n  <div class=\"row\">\n    <div class=\"col-xs-12 text-center\" style=\"margin-top: 3em;\">\n      Login with:\n    </div>\n  </div>\n  <div class=\"row\">\n    <div class=\"col-xs-12 text-center\" style=\"padding-top: 2em;\">\n      <button type=\"button\" class=\"btn btn-md btn-primary\" id=\"testProvider\">\n        solidtest.space\n      </button>\n    </div>\n  </div>\n  <div class=\"row\">\n    <div class=\"col-xs-12 text-center\" style=\"padding-top: 2em;\">\n      or custom:<br />\n      <input type=\"text\" id=\"customProviderUri\" value=\"https://\" />\n      <button type=\"button\" class=\"btn btn-md\" id=\"customProvider\">Go</button>\n    </div>\n  </div>\n</div>\n<script type=\"text/javascript\">\n  window.addEventListener('load', function () { init() });\n\n  function init () {\n    initEvents()\n  }\n\n  function initButton(id, action) {\n    document.getElementById(id).addEventListener('click', action)\n  }\n\n  function initEvents () {\n    initButton('testProvider',\n      function () { selectProvider('https://solidtest.space') })\n    initButton('customProvider',\n      function () {\n        var defaultValue = 'https://'\n        var customUri = document.getElementById('customProviderUri')\n        if (customUri && customUri.value !== defaultValue) {\n          selectProvider(customUri.value)\n        }\n      })\n  }\n\n  function selectProvider (providerUri) {\n    console.log('Provider selected: ', providerUri)\n    var message = {\n      event_type: 'providerSelected',\n      value: providerUri\n    }\n    console.log('opener.window.location: ', opener.window.location.href)\n\n    opener.postMessage(message, opener.window.location.origin)\n  }\n</script>\n</body>\n</html>\n";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solid/solid-auth-oidc",
-  "version": "0.5.6",
+  "version": "0.5.8-2b0114c1",
   "engines": {
     "node": ">= 6.0"
   },
@@ -12,12 +12,12 @@
   ],
   "scripts": {
     "build": "npm run build-lib",
-    "build-dist": "webpack --progress --colors --optimize-minimize",
+    "build-dist": "webpack --progress",
     "build-lib": "babel src -d lib",
     "dist": "npm run build && npm run build-dist",
     "mocha": "nyc mocha test/*.js",
     "postversion": "git push --follow-tags",
-    "prepublish": "npm run build && npm run test",
+    "ignore:prepublishOnly": "npm run build && npm run test",
     "preversion": "npm test",
     "standard": "standard src/*",
     "test": "npm run standard && npm run mocha"
@@ -52,28 +52,28 @@
   "author": "Dmitri Zagidulin <dzagidulin@gmail.com>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/solid/solid-auth-oidc/issues"
+    "url": "https://github.com/node-solid-server/solid-auth-oidc/issues"
   },
-  "homepage": "https://github.com/solid/solid-auth-oidc",
+  "homepage": "https://github.com/node-solid-server/solid-auth-oidc",
   "dependencies": {
-    "@solid/oidc-rp": "^0.11.7"
+    "@solid/oidc-rp": "^0.11.10"
   },
   "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.3",
-    "babel-loader": "^8.2.5",
-    "babel-preset-es2015": "^6.24.1",
-    "chai": "^4.3.6",
-    "chai-as-promised": "^7.1.1",
+    "@babel/cli": "^7.28.3",
+    "@babel/core": "^7.28.5",
+    "@babel/preset-env": "^7.28.5",
+    "babel-loader": "^8.4.1",
+    "chai": "^4.5.0",
+    "chai-as-promised": "^7.1.2",
     "dirty-chai": "^2.0.1",
     "localstorage-memory": "^1.0.3",
-    "mocha": "^8.4.0",
-    "nyc": "^15.1.0",
+    "mocha": "^11.7.5",
+    "nyc": "^17.1.0",
     "sinon": "^9.2.4",
     "sinon-chai": "^3.7.0",
-    "standard": "^16.0.4",
-    "webpack": "^5.74.0",
-    "whatwg-url": "^8.7.0"
+    "standard": "^17.1.2",
+    "webpack": "^5.104.0",
+    "whatwg-url": "^15.1.0"
   },
   "standard": {
     "globals": [