WIP: OAuth: import changes from demo instance

Author: intelfx

kvmd/apps/kvmd/api/auth.py

@@ -167,7 +167,7 @@ async def __oauth(self, request: Request) -> None:
         if not self.__auth_manager.oauth_manager.valid_provider(provider):
             raise HTTPNotFound(reason="Unknown provider %s" % provider)
 
-        redirect_url = request.url.with_path(f"/api/auth/oauth/callback/{provider}").with_scheme('https')
+        redirect_url = request.url.with_path(f"/api/auth/oauth/callback/{provider}/").with_scheme('https')
         oauth_cookie = request.cookies.get(_COOKIE_OAUTH_SESSION, "")
 
         is_valid_session = await self.__auth_manager.oauth_manager.is_valid_session(provider, oauth_cookie)

kvmd/apps/kvmd/auth.py

@@ -42,10 +42,6 @@
 
 
 # =====
-class AuthManager:  # pylint: disable=too-many-instance-attributes
-    def __init__(  # pylint: disable=too-many-arguments
-
-
 @dataclasses.dataclass(frozen=True)
 class _Session:
     user:      str

web/share/js/login/main.js

@@ -54,24 +54,22 @@ export function main() {
 }
 
 function __loadProviders () {
-	let http = tools.makeRequest("GET", "/api/auth/oauth/providers", function() {
-		if (http.readyState === 4) {
-			if (http.status === 200) {
-				let oauthInfo = JSON.parse(http.responseText).result;
-				if (!oauthInfo.enabled) {
-					return;
-				}
-				let buttons = `<tr>
-                                          <td colspan="2">
-                                            <hr>
-                                          </td>
-                                        </tr>
-					<tr><td>&nbsp;</tr></td>`
-                                for (const [short_name, long_name] of Object.entries(oauthInfo.providers)) {
-					buttons += __makeProvider(short_name, long_name);
-				}
-                                $("oauth-tbody").innerHTML = buttons
+	tools.httpRequest("GET", "/api/auth/oauth/providers", null, function(http) {
+		if (http.status === 200) {
+			let oauthInfo = JSON.parse(http.responseText).result;
+			if (!oauthInfo.enabled) {
+				return;
+			}
+			let buttons = `<tr>
+									  <td colspan="2">
+										<hr>
+									  </td>
+									</tr>
+				<tr><td>&nbsp;</tr></td>`
+							for (const [short_name, long_name] of Object.entries(oauthInfo.providers)) {
+				buttons += __makeProvider(short_name, long_name);
 			}
+							$("oauth-tbody").innerHTML = buttons
 		}
 	})
 }