From e7ab402589507068e68c8c49810f80a7043dc7ff Mon Sep 17 00:00:00 2001
From: f0x <f0x@cthu.lu>
Date: Tue, 7 Jun 2022 22:38:43 +0200
Subject: [PATCH] oauth restructure

---
 web/source/{panels/admin => lib}/oauth.js | 4 +++-
 web/source/panels/admin/auth.js           | 2 +-
 web/source/panels/admin/index.js          | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename web/source/{panels/admin => lib}/oauth.js (98%)

diff --git a/web/source/panels/admin/oauth.js b/web/source/lib/oauth.js
similarity index 98%
rename from web/source/panels/admin/oauth.js
rename to web/source/lib/oauth.js
index 748fd8e7e..d59b3bfe3 100644
--- a/web/source/panels/admin/oauth.js
+++ b/web/source/lib/oauth.js
@@ -138,7 +138,9 @@ module.exports = function oauthClient(config, initState) {
 		let url = new URL(config.instance);
 		let [p, s] = path.split("?");
 		url.pathname = p;
-		url.search = s;
+		if (s != undefined) {
+			url.search = s;
+		}
 		let headers = {
 			"Authorization": `Bearer ${state.access_token}`
 		};
diff --git a/web/source/panels/admin/auth.js b/web/source/panels/admin/auth.js
index f87287ff7..58260f10e 100644
--- a/web/source/panels/admin/auth.js
+++ b/web/source/panels/admin/auth.js
@@ -2,7 +2,7 @@
 
 const Promise = require("bluebird");
 const React = require("react");
-const oauthLib = require("./oauth");
+const oauthLib = require("../../lib/oauth");
 
 module.exports = function Auth({setOauth}) {
 	const [ instance, setInstance ] = React.useState("");
diff --git a/web/source/panels/admin/index.js b/web/source/panels/admin/index.js
index 614e45a64..3463b3257 100644
--- a/web/source/panels/admin/index.js
+++ b/web/source/panels/admin/index.js
@@ -4,7 +4,7 @@ const Promise = require("bluebird");
 const React = require("react");
 const ReactDom = require("react-dom");
 
-const oauthLib = require("./oauth.js");
+const oauthLib = require("../../lib/oauth.js");
 const Auth = require("./auth");
 const Settings = require("./settings");
 const Blocks = require("./blocks");