Fill in remaining missing pieces
- Database schema changes, removing obsolete custom domain-related code - Missing user structs - Setup verbiage changes - Missing routes - Missing error messages
This commit is contained in:
43
users.go
43
users.go
@@ -9,6 +9,35 @@ import (
|
||||
)
|
||||
|
||||
type (
|
||||
userCredentials struct {
|
||||
Alias string `json:"alias" schema:"alias"`
|
||||
Pass string `json:"pass" schema:"pass"`
|
||||
Email string `json:"email" schema:"email"`
|
||||
Web bool `json:"web" schema:"-"`
|
||||
To string `json:"-" schema:"to"`
|
||||
|
||||
EmailLogin bool `json:"via_email" schema:"via_email"`
|
||||
}
|
||||
|
||||
userRegistration struct {
|
||||
userCredentials
|
||||
Honeypot string `json:"fullname" schema:"fullname"`
|
||||
Normalize bool `json:"normalize" schema:"normalize"`
|
||||
Signup bool `json:"signup" schema:"signup"`
|
||||
}
|
||||
|
||||
// AuthUser contains information for a newly authenticated user (either
|
||||
// from signing up or logging in).
|
||||
AuthUser struct {
|
||||
AccessToken string `json:"access_token,omitempty"`
|
||||
Password string `json:"password,omitempty"`
|
||||
User *User `json:"user"`
|
||||
|
||||
// Verbose user data
|
||||
Posts *[]PublicPost `json:"posts,omitempty"`
|
||||
Collections *[]Collection `json:"collections,omitempty"`
|
||||
}
|
||||
|
||||
// User is a consistent user object in the database and all contexts (auth
|
||||
// and non-auth) in the API.
|
||||
User struct {
|
||||
@@ -21,6 +50,20 @@ type (
|
||||
|
||||
clearEmail string `json:"email"`
|
||||
}
|
||||
|
||||
userMeStats struct {
|
||||
TotalCollections, TotalArticles, CollectionPosts uint64
|
||||
}
|
||||
|
||||
ExportUser struct {
|
||||
*User
|
||||
Collections *[]CollectionObj `json:"collections"`
|
||||
AnonymousPosts []PublicPost `json:"posts"`
|
||||
}
|
||||
|
||||
PublicUser struct {
|
||||
Username string `json:"username"`
|
||||
}
|
||||
)
|
||||
|
||||
// EmailClear decrypts and returns the user's email, caching it in the user
|
||||
|
Reference in New Issue
Block a user