From a8afddb02bd502ab7707f2a150997e232cade2c7 Mon Sep 17 00:00:00 2001
From: MrMelon54 <github@mrmelon54.com>
Date: Wed, 4 Oct 2023 21:51:11 +0100
Subject: [PATCH] Autofill login name sent from external service

---
 pages/login.go.html |  4 ++--
 server/login.go     | 19 +++++++++++++++++++
 server/server.go    |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pages/login.go.html b/pages/login.go.html
index 49cd4d7..c8f8021 100644
--- a/pages/login.go.html
+++ b/pages/login.go.html
@@ -18,11 +18,11 @@
         <input type="hidden" name="redirect" value="{{.Redirect}}"/>
         <div>
             <label for="field_username">User Name:</label>
-            <input type="text" name="username" id="field_username" required/>
+            <input type="text" name="username" id="field_username" {{if gt (len .LoginName) 0}} value="{{.LoginName}}" {{else}} autofocus {{end}} required/>
         </div>
         <div>
             <label for="field_password">Password:</label>
-            <input type="password" name="password" id="field_password" required/>
+            <input type="password" name="password" id="field_password" {{if gt (len .LoginName) 0}} autofocus {{end}} required/>
         </div>
         <button type="submit">Login</button>
     </form>
diff --git a/server/login.go b/server/login.go
index dbaecd3..2794b8d 100644
--- a/server/login.go
+++ b/server/login.go
@@ -16,18 +16,37 @@ import (
 	"time"
 )
 
+// getUserLoginName finds the `login_name` query parameter within the `/authorize` redirect url
+func getUserLoginName(req *http.Request) string {
+	q := req.URL.Query()
+	if !q.Has("redirect") {
+		return ""
+	}
+	originUrl, err := url.ParseRequestURI(q.Get("redirect"))
+	if err != nil {
+		return ""
+	}
+	if originUrl.Path != "/authorize" {
+		return ""
+	}
+	return originUrl.Query().Get("login_name")
+}
+
 func (h *HttpServer) LoginGet(rw http.ResponseWriter, req *http.Request, _ httprouter.Params, auth UserAuth) {
 	if !auth.IsGuest() {
 		h.SafeRedirect(rw, req)
 		return
 	}
 
+	loginName := getUserLoginName(req)
+
 	rw.Header().Set("Content-Type", "text/html")
 	rw.WriteHeader(http.StatusOK)
 	pages.RenderPageTemplate(rw, "login", map[string]any{
 		"ServiceName": h.serviceName,
 		"Redirect":    req.URL.Query().Get("redirect"),
 		"Mismatch":    req.URL.Query().Get("mismatch"),
+		"LoginName":   loginName,
 	})
 }
 
diff --git a/server/server.go b/server/server.go
index 1489f6d..0286800 100644
--- a/server/server.go
+++ b/server/server.go
@@ -135,7 +135,7 @@ func NewHttpServer(listen, domain, otpIssuer, serviceName string, mailer mail.Ma
 		if !scope2.ScopesExist(a) {
 			return "", errInvalidScope
 		}
-		return "openid", nil
+		return a, nil
 	})
 
 	r.GET("/.well-known/openid-configuration", func(rw http.ResponseWriter, req *http.Request, params httprouter.Params) {