finished login/registration

internal/handlers/callback.go

@@ -5,7 +5,9 @@ import (
 	"net/http"
 	"time"
 
+	"git.haelnorr.com/h/golib/cookies"
 	"git.haelnorr.com/h/golib/hws"
+	"git.haelnorr.com/h/golib/hwsauth"
 	"github.com/pkg/errors"
 	"github.com/uptrace/bun"
 
@@ -16,7 +18,14 @@ import (
 	"git.haelnorr.com/h/oslstats/pkg/oauth"
 )
 
-func Callback(server *hws.Server, conn *bun.DB, cfg *config.Config, store *store.Store, discordAPI *discord.APIClient) http.Handler {
+func Callback(
+	server *hws.Server,
+	auth *hwsauth.Authenticator[*db.User, bun.Tx],
+	conn *bun.DB,
+	cfg *config.Config,
+	store *store.Store,
+	discordAPI *discord.APIClient,
+) http.Handler {
 	return http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
 			// Track callback redirect attempts
@@ -86,7 +95,7 @@ func Callback(server *hws.Server, conn *bun.DB, cfg *config.Config, store *store
 					return
 				}
 				defer tx.Rollback()
-				redirect, err := login(ctx, tx, cfg, w, r, code, store, discordAPI)
+				redirect, err := login(ctx, auth, tx, cfg, w, r, code, store, discordAPI)
 				if err != nil {
 					throwInternalServiceError(server, w, r, "OAuth login failed", err)
 					return
@@ -152,6 +161,7 @@ func verifyState(
 
 func login(
 	ctx context.Context,
+	auth *hwsauth.Authenticator[*db.User, bun.Tx],
 	tx bun.Tx,
 	cfg *config.Config,
 	w http.ResponseWriter,
@@ -194,7 +204,11 @@ func login(
 		})
 		redirect = "/register"
 	} else {
-		// TODO: log them in
+		err := auth.Login(w, r, user, true)
+		if err != nil {
+			return nil, errors.Wrap(err, "auth.Login")
+		}
+		redirect = cookies.CheckPageFrom(w, r)
 	}
 	return func() {
 		http.Redirect(w, r, redirect, http.StatusSeeOther)

internal/handlers/login.go

@@ -3,6 +3,7 @@ package handlers
 import (
 	"net/http"
 
+	"git.haelnorr.com/h/golib/cookies"
 	"git.haelnorr.com/h/golib/hws"
 	"github.com/pkg/errors"
 
@@ -15,6 +16,7 @@ import (
 func Login(server *hws.Server, cfg *config.Config, st *store.Store, discordAPI *discord.APIClient) http.Handler {
 	return http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
+			cookies.SetPageFrom(w, r, cfg.HWSAuth.TrustedHost)
 			// Track login redirect attempts
 			attempts, exceeded, track := st.TrackRedirect(r, "/login", 5)
 

internal/handlers/register.go

@@ -5,7 +5,9 @@ import (
 	"net/http"
 	"time"
 
+	"git.haelnorr.com/h/golib/cookies"
 	"git.haelnorr.com/h/golib/hws"
+	"git.haelnorr.com/h/golib/hwsauth"
 	"github.com/pkg/errors"
 	"github.com/uptrace/bun"
 
@@ -17,6 +19,7 @@ import (
 
 func Register(
 	server *hws.Server,
+	auth *hwsauth.Authenticator[*db.User, bun.Tx],
 	conn *bun.DB,
 	cfg *config.Config,
 	store *store.Store,
@@ -56,7 +59,6 @@ func Register(
 				return
 			}
 			details, ok := store.GetRegistrationSession(sessionCookie.Value)
-			ok = false
 			if !ok {
 				http.Redirect(w, r, "/login", http.StatusSeeOther)
 				return
@@ -73,20 +75,27 @@ func Register(
 			defer tx.Rollback()
 			method := r.Method
 			if method == "GET" {
-				unique, err := db.IsUsernameUnique(ctx, tx, details.DiscordUser.Username)
-				if err != nil {
-					throwInternalServiceError(server, w, r, "Database query failed", err)
-					return
-				}
 				tx.Commit()
-				page.Register(details.DiscordUser.Username, unique).Render(r.Context(), w)
+				page.Register(details.DiscordUser.Username).Render(r.Context(), w)
 				return
 			}
 			if method == "POST" {
-				// TODO: register the user
-
-				// get the form data
-				//
+				username := r.FormValue("username")
+				user, err := registerUser(ctx, tx, username, details)
+				if err != nil {
+					throwInternalServiceError(server, w, r, "Registration failed", err)
+				}
+				tx.Commit()
+				if user == nil {
+					w.WriteHeader(http.StatusConflict)
+				} else {
+					err = auth.Login(w, r, user, true)
+					if err != nil {
+						throwInternalServiceError(server, w, r, "Login failed", err)
+					}
+					pageFrom := cookies.CheckPageFrom(w, r)
+					w.Header().Set("HX-Redirect", pageFrom)
+				}
 				return
 			}
 		},
@@ -124,3 +133,27 @@ func IsUsernameUnique(
 		},
 	)
 }
+
+func registerUser(
+	ctx context.Context,
+	tx bun.Tx,
+	username string,
+	details *store.RegistrationSession,
+) (*db.User, error) {
+	unique, err := db.IsUsernameUnique(ctx, tx, username)
+	if err != nil {
+		return nil, errors.Wrap(err, "db.IsUsernameUnique")
+	}
+	if !unique {
+		return nil, nil
+	}
+	user, err := db.CreateUser(ctx, tx, username, details.DiscordUser)
+	if err != nil {
+		return nil, errors.Wrap(err, "db.CreateUser")
+	}
+	err = db.UpdateDiscordToken(ctx, tx, user, details.Token)
+	if err != nil {
+		return nil, errors.Wrap(err, "db.UpdateDiscordToken")
+	}
+	return user, nil
+}