feat(frontend): working Discord login + signup

backend/db/db.go

@@ -7,12 +7,9 @@ import (
 	"net/url"
 	"os"
 
-	"codeberg.org/u1f320/pronouns.cc/backend/log"
 	"emperror.dev/errors"
 	"github.com/Masterminds/squirrel"
 	"github.com/jackc/pgconn"
-	"github.com/jackc/pgx/v4"
-	"github.com/jackc/pgx/v4/log/zapadapter"
 	"github.com/jackc/pgx/v4/pgxpool"
 	"github.com/mediocregopher/radix/v4"
 	"github.com/minio/minio-go/v7"
@@ -38,15 +35,7 @@ type DB struct {
 }
 
 func New() (*DB, error) {
-	pgxCfg, err := pgxpool.ParseConfig(os.Getenv("DATABASE_URL"))
-	if err != nil {
-		return nil, errors.Wrap(err, "parsing config")
-	}
-	pgxCfg.ConnConfig.LogLevel = pgx.LogLevelDebug
-	pgxCfg.ConnConfig.Logger = zapadapter.NewLogger(log.Logger)
-
-	pool, err := pgxpool.ConnectConfig(context.Background(), pgxCfg)
-	//	pool, err := pgxpool.Connect(context.Background(), os.Getenv("DATABASE_URL"))
+	pool, err := pgxpool.Connect(context.Background(), os.Getenv("DATABASE_URL"))
 	if err != nil {
 		return nil, errors.Wrap(err, "creating postgres client")
 	}

backend/db/field.go

@@ -52,7 +52,7 @@ func (f Field) Validate() string {
 
 // UserFields returns the fields associated with the given user ID.
 func (db *DB) UserFields(ctx context.Context, id xid.ID) (fs []Field, err error) {
-	sql, args, err := sq.Select("*").From("user_fields").Where("user_id = ?", id).OrderBy("id").ToSql()
+	sql, args, err := sq.Select("id", "name", "entries").From("user_fields").Where("user_id = ?", id).OrderBy("id").ToSql()
 	if err != nil {
 		return fs, errors.Wrap(err, "building sql")
 	}
@@ -88,7 +88,7 @@ func (db *DB) SetUserFields(ctx context.Context, tx pgx.Tx, userID xid.ID, field
 
 // MemberFields returns the fields associated with the given member ID.
 func (db *DB) MemberFields(ctx context.Context, id xid.ID) (fs []Field, err error) {
-	sql, args, err := sq.Select("*").From("member_fields").Where("member_id = ?", id).OrderBy("id").ToSql()
+	sql, args, err := sq.Select("id", "name", "entries").From("member_fields").Where("member_id = ?", id).OrderBy("id").ToSql()
 	if err != nil {
 		return fs, errors.Wrap(err, "building sql")
 	}

backend/routes/auth/discord.go

@@ -61,7 +61,7 @@ func (s *Server) discordCallback(w http.ResponseWriter, r *http.Request) error {
 	}
 
 	cfg := discordOAuthConfig
-	cfg.RedirectURL = decoded.CallbackDomain + "/login/discord"
+	cfg.RedirectURL = decoded.CallbackDomain + "/auth/login/discord"
 	token, err := cfg.Exchange(r.Context(), decoded.Code)
 	if err != nil {
 		log.Errorf("exchanging oauth code: %v", err)

backend/routes/auth/routes.go

@@ -105,10 +105,10 @@ func (s *Server) oauthURLs(w http.ResponseWriter, r *http.Request) error {
 
 	// copy Discord config and set redirect url
 	discordCfg := discordOAuthConfig
-	discordCfg.RedirectURL = req.CallbackDomain + "/login/discord"
+	discordCfg.RedirectURL = req.CallbackDomain + "/auth/login/discord"
 
 	render.JSON(w, r, oauthURLsResponse{
-		Discord: discordCfg.AuthCodeURL(state),
+		Discord: discordCfg.AuthCodeURL(state) + "&prompt=none",
 	})
 	return nil
 }

backend/routes/user/get_user.go

@@ -35,7 +35,9 @@ type PartialMember struct {
 	ID          xid.ID            `json:"id"`
 	Name        string            `json:"name"`
 	DisplayName *string           `json:"display_name"`
+	Bio         *string           `json:"bio"`
 	AvatarURLs  []string          `json:"avatar_urls"`
+	Links       []string          `json:"links"`
 	Names       []db.FieldEntry   `json:"names"`
 	Pronouns    []db.PronounEntry `json:"pronouns"`
 }
@@ -59,7 +61,9 @@ func dbUserToResponse(u db.User, fields []db.Field, members []db.Member) GetUser
 			ID:          members[i].ID,
 			Name:        members[i].Name,
 			DisplayName: members[i].DisplayName,
+			Bio:         members[i].Bio,
 			AvatarURLs:  db.NotNull(members[i].AvatarURLs),
+			Links:       db.NotNull(members[i].Links),
 			Names:       db.NotNull(members[i].Names),
 			Pronouns:    db.NotNull(members[i].Pronouns),
 		}

backend/routes/user/patch_user.go

@@ -23,7 +23,6 @@ type PatchUserRequest struct {
 }
 
 // patchUser parses a PatchUserRequest and updates the user with the given ID.
-// TODO: could this be refactored to be less repetitive? names, pronouns, and fields are all validated in the same way
 func (s *Server) patchUser(w http.ResponseWriter, r *http.Request) error {
 	ctx := r.Context()