@luigi-project/plugin-auth-oauth2 1.23.1 → 1.25.0

package/README.md

@@ -1,17 +1,19 @@
 <!-- meta
 {
   "node": {
-    "label": "OAuth2",
+    "label": "OAuth2 Plugin",
     "category": {
-      "label": "Authorization Plugins"
+      "label": "Authorization",
+      "collapsible": true
     },
     "metaData": {
-      "categoryPosition": 2,
-      "position": 12
+      "categoryPosition": 4,
+      "position": 2
     }
   }
 }
 meta -->
+
 # OAuth2 - Authorization Plugin for Luigi Core
 
 ## Overview
@@ -76,4 +78,4 @@ If your application does not use webpack or you installed Luigi without a framew
 "copyCallbackOAuth": "copyfiles -f node_modules/@luigi-project/plugin-auth-oauth2/callback.html public/assets/auth-oauth2"
 ```
 
-Running `npm run build` should then suffice to bundle the config and also copy the callback file.
+Running `npm run build` should then suffice to bundle the config and also copy the callback file.

package/callback.html

@@ -5,24 +5,8 @@
     <script type="text/javascript">
       const tokenLifetimeDays = 7;
 
-      /**
-       * get query parameter from url
-       * defaults to use location.href
-       * examples:
-       * // query string: ?foo=lorem&bar=&baz
-       * var foo = getParameterByName('foo'); // "lorem"
-       * var bar = getParameterByName('bar'); // "" (present with empty value)
-       * var baz = getParameterByName('baz'); // "" (present with no value)
-       * var qux = getParameterByName('qux'); // null (absent)
-       */
-      const getParameterByName = (name, url) => {
-        if (!url) url = encodeURIComponent(window.location.href);
-        name = name.replace(/[\[\]]/g, '\\$&');
-        const regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'),
-          results = regex.exec(url);
-        if (!results) return null;
-        if (!results[2]) return '';
-        return decodeURIComponent(results[2].replace(/\+/g, ' '));
+      const getParameterByName = name => {
+        return new URLSearchParams(location.search).get(name);
       };
 
       const setAuthData = data => {
@@ -57,8 +41,7 @@
         if (!isNaN(expiresIn) && expiresIn > 0) {
           const nsToMsMultiplier = 1000;
           expirationDate =
-            Number(new Date()) +
-            nsToMsMultiplier * (expiresIn - tokenLifetimeDays);
+            Number(new Date()) + nsToMsMultiplier * (expiresIn - tokenLifetimeDays);
         }
         return expirationDate;
       };
@@ -99,9 +82,9 @@
 
           setAuthData(data);
 
-          const decodedState = atob(
-            decodeURIComponent(hashParams['state'])
-          ).split('_luigiNonce=');
+          const decodedState = atob(decodeURIComponent(hashParams['state'])).split(
+            '_luigiNonce='
+          );
           const appState = decodeURI(decodedState[0] || '');
           const nonce = decodedState[1];
 

package/package.json

@@ -16,5 +16,5 @@
     "oauth2",
     "provider"
   ],
-  "version": "1.23.1"
+  "version": "1.25.0"
 }