🚚 Auth kit and parser of nexus userinfo token

pkg/internal/database/migrator.go

@@ -1,7 +1,7 @@
 package database
 
 import (
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"gorm.io/gorm"
 )
 

pkg/internal/grpc/auth.go

@@ -2,10 +2,10 @@ package grpc
 
 import (
 	"context"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"github.com/samber/lo"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"

pkg/internal/grpc/notifier.go

@@ -3,13 +3,13 @@ package grpc
 import (
 	"context"
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex"
 	"github.com/rs/zerolog/log"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"github.com/samber/lo"
 
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"git.solsynth.dev/hydrogen/passport/pkg/proto"
 )

pkg/internal/grpc/realms.go

@@ -3,10 +3,10 @@ package grpc
 import (
 	"context"
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"git.solsynth.dev/hydrogen/passport/pkg/proto"
 	"github.com/samber/lo"

pkg/internal/http/admin/badges_api.go

@@ -2,10 +2,10 @@ package admin
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 )

pkg/internal/http/admin/factors_api.go

@@ -1,9 +1,9 @@
 package admin
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"github.com/gofiber/fiber/v2"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/samber/lo"

pkg/internal/http/admin/notify_api.go

@@ -1,9 +1,9 @@
 package admin
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"github.com/gofiber/fiber/v2"

pkg/internal/http/admin/permissions_api.go

@@ -2,11 +2,11 @@ package admin
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 )

pkg/internal/http/admin/users_api.go

@@ -2,9 +2,9 @@ package admin
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"github.com/gofiber/fiber/v2"

pkg/internal/http/api/accounts_api.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"strconv"
 	"strings"
@@ -10,7 +11,6 @@ import (
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 	jsoniter "github.com/json-iterator/go"

pkg/internal/http/api/avatar_api.go

@@ -2,9 +2,9 @@ package api
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"github.com/gofiber/fiber/v2"

pkg/internal/http/api/bot_token_api.go

@@ -2,9 +2,9 @@ package api
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"github.com/gofiber/fiber/v2"

pkg/internal/http/api/bots_api.go

@@ -2,9 +2,9 @@ package api
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"github.com/gofiber/fiber/v2"

pkg/internal/http/api/notifications_api.go

@@ -2,9 +2,9 @@ package api
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"github.com/gofiber/fiber/v2"

pkg/internal/http/api/notify_api.go

@@ -2,10 +2,10 @@ package api
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 )

pkg/internal/http/api/oauth_api.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"strings"
 	"time"
@@ -9,7 +10,6 @@ import (
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 	"github.com/samber/lo"

pkg/internal/http/api/preferences_api.go

@@ -1,8 +1,8 @@
 package api
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"github.com/gofiber/fiber/v2"

pkg/internal/http/api/realm_members_api.go

@@ -1,9 +1,9 @@
 package api
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"github.com/gofiber/fiber/v2"

pkg/internal/http/api/realms_api.go

@@ -1,9 +1,9 @@
 package api
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"github.com/gofiber/fiber/v2"

pkg/internal/http/api/relationships_api.go

@@ -1,9 +1,9 @@
 package api
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"github.com/gofiber/fiber/v2"

pkg/internal/http/api/security_api.go

@@ -1,9 +1,9 @@
 package api
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"github.com/gofiber/fiber/v2"
 )

pkg/internal/http/api/sign_api.go

@@ -1,9 +1,9 @@
 package api
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"github.com/gofiber/fiber/v2"

pkg/internal/http/api/statuses_api.go

@@ -2,13 +2,13 @@ package api
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"strconv"
 	"time"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/http/exts"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 	"github.com/samber/lo"

pkg/internal/http/api/userinfo_api.go

@@ -2,12 +2,12 @@ package api
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"github.com/spf13/viper"
 	"gorm.io/gorm"
 	"strings"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/services"
 	"github.com/gofiber/fiber/v2"
 )

pkg/internal/http/server.go

@@ -1,6 +1,7 @@
 package http
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"strings"
 
@@ -56,12 +57,7 @@ func NewServer() *App {
 	}))
 
 	app.Use(sec.ContextMiddleware(IReader))
-	app.Use(func(c *fiber.Ctx) error {
-		if user, ok := c.Locals("nex_user").(*sec.UserInfo); ok {
-			c.Locals("user", user)
-		}
-		return c.Next()
-	})
+	app.Use(authkit.ParseAccountMiddleware)
 
 	admin.MapAdminAPIs(app, "/api/admin")
 	api.MapAPIs(app, "/api")

pkg/internal/models/account_groups.go

@@ -1,19 +0,0 @@
-package models
-
-import "gorm.io/datatypes"
-
-type AccountGroup struct {
-	BaseModel
-
-	Name      string            `json:"name"`
-	PermNodes datatypes.JSONMap `json:"perm_nodes"`
-}
-
-type AccountGroupMember struct {
-	BaseModel
-
-	Account   Account      `json:"account"`
-	Group     AccountGroup `json:"group"`
-	AccountID uint         `json:"account_id"`
-	GroupID   uint         `json:"group_id"`
-}

pkg/internal/models/accounts.go

@@ -1,76 +0,0 @@
-package models
-
-import (
-	"fmt"
-	"gorm.io/datatypes"
-	"time"
-
-	"github.com/samber/lo"
-	"github.com/spf13/viper"
-)
-
-type Account struct {
-	BaseModel
-
-	Name        string            `json:"name" gorm:"uniqueIndex"`
-	Nick        string            `json:"nick"`
-	Description string            `json:"description"`
-	Avatar      *string           `json:"avatar"`
-	Banner      *string           `json:"banner"`
-	ConfirmedAt *time.Time        `json:"confirmed_at"`
-	SuspendedAt *time.Time        `json:"suspended_at"`
-	PermNodes   datatypes.JSONMap `json:"perm_nodes"`
-
-	AutomatedBy *Account `json:"automated_by" gorm:"foreignKey:AutomatedID"`
-	AutomatedID *uint    `json:"automated_id"`
-
-	AffiliatedTo *Realm `json:"affiliated_to" gorm:"foreignKey:AffiliatedID"`
-	AffiliatedID *uint  `json:"affiliated_id"`
-
-	Profile  AccountProfile   `json:"profile,omitempty"`
-	Contacts []AccountContact `json:"contacts,omitempty"`
-	Badges   []Badge          `json:"badges,omitempty"`
-
-	Tickets []AuthTicket `json:"tickets,omitempty"`
-	Factors []AuthFactor `json:"factors,omitempty"`
-
-	Relations []AccountRelationship `json:"relations,omitempty" gorm:"foreignKey:AccountID"`
-}
-
-func (v Account) GetAvatar() *string {
-	if v.Avatar != nil {
-		return lo.ToPtr(fmt.Sprintf("%s/%s", viper.GetString("content_endpoint"), *v.Avatar))
-	}
-	return nil
-}
-
-func (v Account) GetBanner() *string {
-	if v.Banner != nil {
-		return lo.ToPtr(fmt.Sprintf("%s/%s", viper.GetString("content_endpoint"), *v.Banner))
-	}
-	return nil
-}
-
-func (v Account) GetPrimaryEmail() AccountContact {
-	val, _ := lo.Find(v.Contacts, func(item AccountContact) bool {
-		return item.Type == EmailAccountContact && item.IsPrimary
-	})
-	return val
-}
-
-type AccountContactType = int8
-
-const (
-	EmailAccountContact = AccountContactType(iota)
-)
-
-type AccountContact struct {
-	BaseModel
-
-	Type       int8       `json:"type"`
-	Content    string     `json:"content" gorm:"uniqueIndex"`
-	IsPublic   bool       `json:"is_public"`
-	IsPrimary  bool       `json:"is_primary"`
-	VerifiedAt *time.Time `json:"verified_at"`
-	AccountID  uint       `json:"account_id"`
-}

pkg/internal/models/audit.go

@@ -1,13 +0,0 @@
-package models
-
-import "gorm.io/datatypes"
-
-type AuditRecord struct {
-	BaseModel
-
-	Action    string            `json:"action"`
-	Metadata  datatypes.JSONMap `json:"metadata"`
-	UserAgent string            `json:"user_agent"`
-	IpAddress string            `json:"ip_address"`
-	AccountID uint              `json:"account_id"`
-}

pkg/internal/models/auth.go

@@ -1,80 +0,0 @@
-package models
-
-import (
-	"fmt"
-	"time"
-
-	"gorm.io/datatypes"
-)
-
-type AuthConfig struct {
-	MaximumAuthSteps int `json:"maximum_auth_steps" validate:"required,min=1,max=99"`
-}
-
-type AuthFactorType = int8
-
-const (
-	PasswordAuthFactor = AuthFactorType(iota)
-	EmailPasswordFactor
-)
-
-type AuthFactor struct {
-	BaseModel
-
-	Type   int8    `json:"type"`
-	Secret string  `json:"-"`
-	Config JSONMap `json:"config"`
-
-	Account   Account `json:"account"`
-	AccountID uint    `json:"account_id"`
-}
-
-type AuthTicket struct {
-	BaseModel
-
-	Location     string                      `json:"location"`
-	IpAddress    string                      `json:"ip_address"`
-	UserAgent    string                      `json:"user_agent"`
-	StepRemain   int                         `json:"step_remain"`
-	Claims       datatypes.JSONSlice[string] `json:"claims"`
-	Audiences    datatypes.JSONSlice[string] `json:"audiences"`
-	FactorTrail  datatypes.JSONSlice[int]    `json:"factor_trail"`
-	GrantToken   *string                     `json:"grant_token"`
-	AccessToken  *string                     `json:"access_token"`
-	RefreshToken *string                     `json:"refresh_token"`
-	ExpiredAt    *time.Time                  `json:"expired_at"`
-	AvailableAt  *time.Time                  `json:"available_at"`
-	LastGrantAt  *time.Time                  `json:"last_grant_at"`
-	Nonce        *string                     `json:"nonce"`
-	ClientID     *uint                       `json:"client_id"`
-
-	Account   Account `json:"account"`
-	AccountID uint    `json:"account_id"`
-}
-
-func (v AuthTicket) IsAvailable() error {
-	if v.StepRemain > 0 {
-		return fmt.Errorf("ticket isn't authenticated yet")
-	}
-	if v.AvailableAt != nil && time.Now().Unix() < v.AvailableAt.Unix() {
-		return fmt.Errorf("ticket isn't available yet")
-	}
-	if v.ExpiredAt != nil && time.Now().Unix() > v.ExpiredAt.Unix() {
-		return fmt.Errorf("ticket expired")
-	}
-
-	return nil
-}
-
-func (v AuthTicket) IsCanBeAvailble() error {
-	if v.StepRemain > 0 {
-		return fmt.Errorf("ticket isn't authenticated yet")
-	}
-
-	return nil
-}
-
-type AuthContext struct {
-	Ticket  AuthTicket `json:"ticket"`
-	Account Account    `json:"account"`
-}

pkg/internal/models/badges.go

@@ -1,11 +0,0 @@
-package models
-
-import "gorm.io/datatypes"
-
-type Badge struct {
-	BaseModel
-
-	Type      string            `json:"type"`
-	Metadata  datatypes.JSONMap `json:"metadata"`
-	AccountID uint              `json:"account_id"`
-}

pkg/internal/models/base.go

@@ -1,17 +0,0 @@
-package models
-
-import (
-	"time"
-
-	"gorm.io/datatypes"
-	"gorm.io/gorm"
-)
-
-type JSONMap = datatypes.JSONType[map[string]any]
-
-type BaseModel struct {
-	ID        uint           `json:"id" gorm:"primaryKey"`
-	CreatedAt time.Time      `json:"created_at"`
-	UpdatedAt time.Time      `json:"updated_at"`
-	DeletedAt gorm.DeletedAt `json:"deleted_at" gorm:"index"`
-}

pkg/internal/models/bot.go

@@ -1,13 +0,0 @@
-package models
-
-type ApiKey struct {
-	BaseModel
-
-	Name        string     `json:"name"`
-	Description string     `json:"description"`
-	Lifecycle   *int64     `json:"lifecycle"`
-	Ticket      AuthTicket `json:"ticket" gorm:"TicketID"`
-	TicketID    uint       `json:"ticket_id"`
-	Account     Account    `json:"account"`
-	AccountID   uint       `json:"account_id"`
-}

pkg/internal/models/clients.go

@@ -1,16 +0,0 @@
-package models
-
-import "gorm.io/datatypes"
-
-type ThirdClient struct {
-	BaseModel
-
-	Alias       string                      `json:"alias" gorm:"uniqueIndex"`
-	Name        string                      `json:"name"`
-	Description string                      `json:"description"`
-	Secret      string                      `json:"secret"`
-	Urls        datatypes.JSONSlice[string] `json:"urls"`
-	Callbacks   datatypes.JSONSlice[string] `json:"callbacks"`
-	IsDraft     bool                        `json:"is_draft"`
-	AccountID   *uint                       `json:"account_id"`
-}

pkg/internal/models/events.go

@@ -1,14 +0,0 @@
-package models
-
-type ActionEvent struct {
-	BaseModel
-
-	Type      string `json:"type"`
-	Target    string `json:"target"`
-	Location  string `json:"location"`
-	IpAddress string `json:"ip_address"`
-	UserAgent string `json:"user_agent"`
-
-	Account   Account `json:"account"`
-	AccountID uint    `json:"account_id"`
-}

pkg/internal/models/notifications.go

@@ -1,42 +0,0 @@
-package models
-
-import (
-	"gorm.io/datatypes"
-	"time"
-)
-
-type Notification struct {
-	BaseModel
-
-	Topic    string            `json:"topic"`
-	Title    string            `json:"title"`
-	Subtitle string            `json:"subtitle"`
-	Body     string            `json:"body"`
-	Metadata datatypes.JSONMap `json:"metadata"`
-	Priority int               `json:"priority"`
-	SenderID *uint             `json:"sender_id"`
-
-	Account   Account `json:"account"`
-	AccountID uint    `json:"account_id"`
-
-	ReadAt *time.Time `json:"read_at"`
-
-	IsRealtime bool `json:"is_realtime" gorm:"-"`
-}
-
-const (
-	NotifySubscriberFirebase = "firebase"
-	NotifySubscriberAPNs     = "apple"
-)
-
-type NotificationSubscriber struct {
-	BaseModel
-
-	UserAgent   string `json:"user_agent"`
-	Provider    string `json:"provider"`
-	DeviceID    string `json:"device_id" gorm:"uniqueIndex"`
-	DeviceToken string `json:"device_token"`
-
-	Account   Account `json:"account"`
-	AccountID uint    `json:"account_id"`
-}

pkg/internal/models/preferences.go

@@ -1,19 +0,0 @@
-package models
-
-import "gorm.io/datatypes"
-
-type PreferenceAuth struct {
-	BaseModel
-
-	Config    datatypes.JSONType[AuthConfig] `json:"config"`
-	AccountID uint                           `json:"account_id"`
-	Account   Account                        `json:"account"`
-}
-
-type PreferenceNotification struct {
-	BaseModel
-
-	Config    datatypes.JSONMap `json:"config"`
-	AccountID uint              `json:"account_id"`
-	Account   Account           `json:"account"`
-}

pkg/internal/models/profiles.go

@@ -1,16 +0,0 @@
-package models
-
-import (
-	"time"
-)
-
-type AccountProfile struct {
-	BaseModel
-
-	FirstName  string     `json:"first_name"`
-	LastName   string     `json:"last_name"`
-	Experience uint64     `json:"experience"`
-	LastSeenAt *time.Time `json:"last_seen_at"`
-	Birthday   *time.Time `json:"birthday"`
-	AccountID  uint       `json:"account_id"`
-}

pkg/internal/models/realms.go

@@ -1,28 +0,0 @@
-package models
-
-import "gorm.io/datatypes"
-
-type Realm struct {
-	BaseModel
-
-	Alias        string            `json:"alias" gorm:"uniqueIndex"`
-	Name         string            `json:"name"`
-	Description  string            `json:"description"`
-	Members      []RealmMember     `json:"members"`
-	Avatar       *string           `json:"avatar"`
-	Banner       *string           `json:"banner"`
-	AccessPolicy datatypes.JSONMap `json:"access_policy"`
-	IsPublic     bool              `json:"is_public"`
-	IsCommunity  bool              `json:"is_community"`
-	AccountID    uint              `json:"account_id"`
-}
-
-type RealmMember struct {
-	BaseModel
-
-	RealmID    uint    `json:"realm_id"`
-	AccountID  uint    `json:"account_id"`
-	Realm      Realm   `json:"realm"`
-	Account    Account `json:"account"`
-	PowerLevel int     `json:"power_level"`
-}

pkg/internal/models/relationships.go

@@ -1,23 +0,0 @@
-package models
-
-import "gorm.io/datatypes"
-
-type RelationshipStatus = int8
-
-const (
-	RelationshipPending = RelationshipStatus(iota)
-	RelationshipFriend
-	RelationshipBlocked
-	RelationshipWaiting
-)
-
-type AccountRelationship struct {
-	BaseModel
-
-	AccountID uint               `json:"account_id"`
-	RelatedID uint               `json:"related_id"`
-	Account   Account            `json:"account"`
-	Related   Account            `json:"related"`
-	Status    RelationshipStatus `json:"status"`
-	PermNodes datatypes.JSONMap  `json:"perm_nodes"`
-}

pkg/internal/models/reports.go

@@ -1,19 +0,0 @@
-package models
-
-const (
-	ReportStatusPending   = "pending"
-	ReportStatusReviewing = "reviewing"
-	ReportStatusConfirmed = "confirmed"
-	ReportStatusRejected  = "rejected"
-	ReportStatusProcessed = "processed"
-)
-
-type AbuseReport struct {
-	BaseModel
-
-	Resource  string  `json:"resource"`
-	Reason    string  `json:"reason"`
-	Status    string  `json:"status"`
-	AccountID uint    `json:"account_id"`
-	Account   Account `json:"account"`
-}

pkg/internal/models/sign_record.go

@@ -1,10 +0,0 @@
-package models
-
-type SignRecord struct {
-	BaseModel
-
-	ResultTier       int     `json:"result_tier"`
-	ResultExperience int     `json:"result_experience"`
-	Account          Account `json:"account"`
-	AccountID        uint    `json:"account_id"`
-}

pkg/internal/models/statuses.go

@@ -1,23 +0,0 @@
-package models
-
-import "time"
-
-type StatusAttitude = uint8
-
-const (
-	AttitudeNeutral = StatusAttitude(iota)
-	AttitudePositive
-	AttitudeNegative
-)
-
-type Status struct {
-	BaseModel
-
-	Type        string         `json:"type"`
-	Label       string         `json:"label"`
-	Attitude    StatusAttitude `json:"attitude"`
-	IsNoDisturb bool           `json:"is_no_disturb"`
-	IsInvisible bool           `json:"is_invisible"`
-	ClearAt     *time.Time     `json:"clear_at"`
-	AccountID   uint           `json:"account_id"`
-}

pkg/internal/models/tokens.go

@@ -1,21 +0,0 @@
-package models
-
-import "time"
-
-type MagicTokenType = int8
-
-const (
-	ConfirmMagicToken = MagicTokenType(iota)
-	RegistrationMagicToken
-	ResetPasswordMagicToken
-	DeleteAccountMagicToken
-)
-
-type MagicToken struct {
-	BaseModel
-
-	Code      string     `json:"code"`
-	Type      int8       `json:"type"`
-	AccountID *uint      `json:"account_id"`
-	ExpiredAt *time.Time `json:"expired_at"`
-}

pkg/internal/services/account_groups.go

@@ -1,8 +1,8 @@
 package services
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"github.com/samber/lo"
 )
 

pkg/internal/services/accounts.go

@@ -3,6 +3,7 @@ package services
 import (
 	"context"
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex"
 	"git.solsynth.dev/hypernet/nexus/pkg/proto"
 	"time"
@@ -17,7 +18,6 @@ import (
 	"gorm.io/datatypes"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"github.com/google/uuid"
 	"github.com/samber/lo"
 )

pkg/internal/services/auth.go

@@ -3,6 +3,7 @@ package services
 import (
 	"context"
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"time"
 
@@ -12,7 +13,6 @@ import (
 	jsoniter "github.com/json-iterator/go"
 
 	localCache "git.solsynth.dev/hydrogen/passport/pkg/internal/cache"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"github.com/gofiber/fiber/v2"
 	"github.com/rs/zerolog/log"
 )

pkg/internal/services/badges.go

@@ -1,8 +1,8 @@
 package services
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 )
 
 func GrantBadge(user models.Account, badge models.Badge) error {

pkg/internal/services/bot_token.go

@@ -1,10 +1,10 @@
 package services
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"time"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"github.com/google/uuid"
 	"github.com/samber/lo"
 )

pkg/internal/services/bots.go

@@ -1,8 +1,8 @@
 package services
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 )
 
 func GetBotCount(user uint) (int64, error) {

pkg/internal/services/cleaner.go

@@ -1,8 +1,8 @@
 package services
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"github.com/rs/zerolog/log"
 	"time"
 )

pkg/internal/services/clients.go

@@ -2,9 +2,9 @@ package services
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 )
 
 func GetThirdClient(id string) (models.ThirdClient, error) {

pkg/internal/services/events.go

@@ -1,8 +1,8 @@
 package services
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"github.com/rs/zerolog/log"
 )
 

pkg/internal/services/factors.go

@@ -2,9 +2,9 @@ package services
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/gap"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"git.solsynth.dev/hypernet/pusher/pkg/pushkit"
 	"github.com/google/uuid"
 	"github.com/rs/zerolog/log"

pkg/internal/services/jwt.go

@@ -1,10 +1,10 @@
 package services
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"time"
 
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/spf13/viper"
 )

pkg/internal/services/notifications.go

@@ -3,6 +3,7 @@ package services
 import (
 	"context"
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex"
 	"git.solsynth.dev/hypernet/nexus/pkg/proto"
 	"git.solsynth.dev/hypernet/pusher/pkg/pushkit"
@@ -15,7 +16,6 @@ import (
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/gap"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 )
 
 func AddNotifySubscriber(user models.Account, provider, id, tk, ua string) (models.NotificationSubscriber, error) {

pkg/internal/services/preferences.go

@@ -3,11 +3,11 @@ package services
 import (
 	"context"
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"time"
 
 	localCache "git.solsynth.dev/hydrogen/passport/pkg/internal/cache"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"github.com/eko/gocache/lib/v4/cache"
 	"github.com/eko/gocache/lib/v4/marshaler"
 	"github.com/eko/gocache/lib/v4/store"

pkg/internal/services/realms.go

@@ -2,8 +2,8 @@ package services
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"github.com/samber/lo"
 )
 

pkg/internal/services/relationships.go

@@ -3,9 +3,9 @@ package services
 import (
 	"errors"
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"gorm.io/gorm"
 )
 

pkg/internal/services/reports.go

@@ -2,9 +2,7 @@ package services
 
 import (
 	"fmt"
-
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 )
 
 func ListAbuseReport(account uint) ([]models.AbuseReport, error) {

pkg/internal/services/sign.go

@@ -3,8 +3,8 @@ package services
 import (
 	"errors"
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"gorm.io/gorm"
 	"math"
 	"math/rand"

pkg/internal/services/statuses.go

@@ -3,6 +3,7 @@ package services
 import (
 	"context"
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/nexus/pkg/proto"
 	"time"
 
@@ -10,7 +11,6 @@ import (
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/gap"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"github.com/eko/gocache/lib/v4/cache"
 	"github.com/eko/gocache/lib/v4/marshaler"
 	"github.com/eko/gocache/lib/v4/store"

pkg/internal/services/ticket.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"gorm.io/datatypes"
 	"time"
 
@@ -10,7 +11,6 @@ import (
 	"github.com/google/uuid"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"github.com/samber/lo"
 )
 

pkg/internal/services/ticket_queries.go

@@ -1,8 +1,8 @@
 package services
 
 import (
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 )
 
 func GetTicket(id uint) (models.AuthTicket, error) {

pkg/internal/services/ticket_token.go

@@ -2,12 +2,12 @@ package services
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hypernet/nexus/pkg/nex/sec"
 	"strconv"
 	"time"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"github.com/samber/lo"
 	"github.com/spf13/viper"
 )

pkg/internal/services/tokens.go

@@ -2,13 +2,13 @@ package services
 
 import (
 	"fmt"
+	"git.solsynth.dev/hydrogen/passport/pkg/authkit/models"
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/gap"
 	"git.solsynth.dev/hypernet/pusher/pkg/pushkit"
 	"strings"
 	"time"
 
 	"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
-	"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
 	"github.com/google/uuid"
 	"github.com/spf13/viper"
 )