♻️ Use the new dealer BaseUser and remove ExternalID

pkg/internal/models/accounts.go

@@ -1,19 +1,9 @@
 package models
 
-// Account profiles basically fetched from Hydrogen.Passport
-// But cache at here for better usage
-// At the same time this model can make relations between local models
-type Account struct {
-	BaseModel
+import "git.solsynth.dev/hydrogen/dealer/pkg/hyper"
 
-	Name         string `json:"name"`
-	Nick         string `json:"nick"`
-	Avatar       string `json:"avatar"`
-	Banner       string `json:"banner"`
-	Description  string `json:"description"`
-	EmailAddress string `json:"email_address"`
-	PowerLevel   int    `json:"power_level"`
-	ExternalID   uint   `json:"external_id"`
+type Account struct {
+	hyper.BaseUser
 
 	Attachments []Attachment     `json:"attachments"`
 	Pools       []AttachmentPool `json:"pools"`

pkg/internal/server/exts/auth.go

@@ -1,19 +0,0 @@
-package exts
-
-import (
-	"git.solsynth.dev/hydrogen/dealer/pkg/proto"
-	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/services"
-	"github.com/gofiber/fiber/v2"
-)
-
-func LinkAccountMiddleware(c *fiber.Ctx) error {
-	if val, ok := c.Locals("p_user").(*proto.UserInfo); ok {
-		if account, err := services.LinkAccount(val); err != nil {
-			return fiber.NewError(fiber.StatusInternalServerError, err.Error())
-		} else {
-			c.Locals("user", account)
-		}
-	}
-
-	return c.Next()
-}

pkg/internal/server/server.go

@@ -3,9 +3,11 @@ package server
 import (
 	"strings"
 
+	"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
+	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/gap"
+	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/server/api"
-	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/server/exts"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/cors"
@@ -54,7 +56,15 @@ func NewServer() {
 	}))
 
 	app.Use(gap.H.AuthMiddleware)
-	app.Use(exts.LinkAccountMiddleware)
+	app.Use(hyper.LinkAccountMiddleware(
+		database.C,
+		&models.Account{},
+		func(u hyper.BaseUser) models.Account {
+			return models.Account{
+				BaseUser: u,
+			}
+		},
+	))
 
 	api.MapAPIs(app, "/api")
 }

pkg/internal/services/auth.go

@@ -1,51 +0,0 @@
-package services
-
-import (
-	"errors"
-	"fmt"
-	"git.solsynth.dev/hydrogen/dealer/pkg/proto"
-	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/models"
-	"gorm.io/gorm"
-	"reflect"
-)
-
-func LinkAccount(userinfo *proto.UserInfo) (models.Account, error) {
-	var account models.Account
-	if userinfo == nil {
-		return account, fmt.Errorf("remote userinfo was not found")
-	}
-	if err := database.C.Where(&models.Account{
-		ExternalID: uint(userinfo.Id),
-	}).First(&account).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			account = models.Account{
-				Name:         userinfo.Name,
-				Nick:         userinfo.Nick,
-				Avatar:       userinfo.Avatar,
-				Banner:       userinfo.Banner,
-				Description:  userinfo.GetDescription(),
-				EmailAddress: userinfo.Email,
-				PowerLevel:   0,
-				ExternalID:   uint(userinfo.Id),
-			}
-			return account, database.C.Save(&account).Error
-		}
-		return account, err
-	}
-
-	prev := account
-	account.Name = userinfo.Name
-	account.Nick = userinfo.Nick
-	account.Avatar = userinfo.Avatar
-	account.Banner = userinfo.Banner
-	account.Description = userinfo.GetDescription()
-	account.EmailAddress = userinfo.Email
-
-	var err error
-	if !reflect.DeepEqual(prev, account) {
-		err = database.C.Save(&account).Error
-	}
-
-	return account, err
-}