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)