Compare commits

..

No commits in common. "6c6a6dd3296935f02d6c4486b740ca7b5bf45403" and "fe81b57a3457ee9a76678caaafac94d35f366071" have entirely different histories.

6 changed files with 49 additions and 77 deletions

View File

@ -205,7 +205,7 @@ func (api *API) appAuthRegister(c *gin.Context) {
return return
} }
// Generate auth hash // Generate Auth Hash
rawAuthHash, err := utils.GenerateToken(64) rawAuthHash, err := utils.GenerateToken(64)
if err != nil { if err != nil {
log.Error("Failed to generate user token: ", err) log.Error("Failed to generate user token: ", err)
@ -214,41 +214,31 @@ func (api *API) appAuthRegister(c *gin.Context) {
return return
} }
// Get current users // Create User in DB
currentUsers, err := api.db.Queries.GetUsers(api.db.Ctx)
if err != nil {
log.Error("Failed to check all users: ", err)
templateVars["Error"] = "Failed to Create User"
c.HTML(http.StatusBadRequest, "page/login", templateVars)
return
}
// Determine if we should be admin
isAdmin := false
if len(currentUsers) == 0 {
isAdmin = true
}
// Create user in DB
authHash := fmt.Sprintf("%x", rawAuthHash) authHash := fmt.Sprintf("%x", rawAuthHash)
if rows, err := api.db.Queries.CreateUser(api.db.Ctx, database.CreateUserParams{ rows, err := api.db.Queries.CreateUser(api.db.Ctx, database.CreateUserParams{
ID: username, ID: username,
Pass: &hashedPassword, Pass: &hashedPassword,
AuthHash: &authHash, AuthHash: &authHash,
Admin: isAdmin, })
}); err != nil {
// SQL Error
if err != nil {
log.Error("CreateUser DB Error:", err) log.Error("CreateUser DB Error:", err)
templateVars["Error"] = "Registration Disabled or User Already Exists" templateVars["Error"] = "Registration Disabled or User Already Exists"
c.HTML(http.StatusBadRequest, "page/login", templateVars) c.HTML(http.StatusBadRequest, "page/login", templateVars)
return return
} else if rows == 0 { }
// User Already Exists
if rows == 0 {
log.Warn("User Already Exists:", username) log.Warn("User Already Exists:", username)
templateVars["Error"] = "Registration Disabled or User Already Exists" templateVars["Error"] = "Registration Disabled or User Already Exists"
c.HTML(http.StatusBadRequest, "page/login", templateVars) c.HTML(http.StatusBadRequest, "page/login", templateVars)
return return
} }
// Get user // Get User
user, err := api.db.Queries.GetUser(api.db.Ctx, username) user, err := api.db.Queries.GetUser(api.db.Ctx, username)
if err != nil { if err != nil {
log.Error("GetUser DB Error:", err) log.Error("GetUser DB Error:", err)
@ -257,7 +247,7 @@ func (api *API) appAuthRegister(c *gin.Context) {
return return
} }
// Set session // Set Session
auth := authData{ auth := authData{
UserName: user.ID, UserName: user.ID,
IsAdmin: user.Admin, IsAdmin: user.Admin,
@ -299,7 +289,6 @@ func (api *API) koAuthRegister(c *gin.Context) {
return return
} }
// Generate password hash
hashedPassword, err := argon2.CreateHash(rUser.Password, argon2.DefaultParams) hashedPassword, err := argon2.CreateHash(rUser.Password, argon2.DefaultParams)
if err != nil { if err != nil {
log.Error("Argon2 Hash Failure:", err) log.Error("Argon2 Hash Failure:", err)
@ -307,7 +296,7 @@ func (api *API) koAuthRegister(c *gin.Context) {
return return
} }
// Generate auth hash // Generate Auth Hash
rawAuthHash, err := utils.GenerateToken(64) rawAuthHash, err := utils.GenerateToken(64)
if err != nil { if err != nil {
log.Error("Failed to generate user token: ", err) log.Error("Failed to generate user token: ", err)
@ -315,32 +304,20 @@ func (api *API) koAuthRegister(c *gin.Context) {
return return
} }
// Get current users
currentUsers, err := api.db.Queries.GetUsers(api.db.Ctx)
if err != nil {
log.Error("Failed to check all users: ", err)
apiErrorPage(c, http.StatusBadRequest, "Failed to Create User")
return
}
// Determine if we should be admin
isAdmin := false
if len(currentUsers) == 0 {
isAdmin = true
}
// Create user
authHash := fmt.Sprintf("%x", rawAuthHash) authHash := fmt.Sprintf("%x", rawAuthHash)
if rows, err := api.db.Queries.CreateUser(api.db.Ctx, database.CreateUserParams{ rows, err := api.db.Queries.CreateUser(api.db.Ctx, database.CreateUserParams{
ID: rUser.Username, ID: rUser.Username,
Pass: &hashedPassword, Pass: &hashedPassword,
AuthHash: &authHash, AuthHash: &authHash,
Admin: isAdmin, })
}); err != nil { if err != nil {
log.Error("CreateUser DB Error:", err) log.Error("CreateUser DB Error:", err)
apiErrorPage(c, http.StatusBadRequest, "Invalid User Data") apiErrorPage(c, http.StatusBadRequest, "Invalid User Data")
return return
} else if rows == 0 { }
// User Exists
if rows == 0 {
log.Error("User Already Exists:", rUser.Username) log.Error("User Already Exists:", rUser.Username)
apiErrorPage(c, http.StatusBadRequest, "User Already Exists") apiErrorPage(c, http.StatusBadRequest, "User Already Exists")
return return

View File

@ -1,6 +1,6 @@
// Code generated by sqlc. DO NOT EDIT. // Code generated by sqlc. DO NOT EDIT.
// versions: // versions:
// sqlc v1.25.0 // sqlc v1.21.0
package database package database

View File

@ -1,10 +1,12 @@
// Code generated by sqlc. DO NOT EDIT. // Code generated by sqlc. DO NOT EDIT.
// versions: // versions:
// sqlc v1.25.0 // sqlc v1.21.0
package database package database
import () import (
"database/sql"
)
type Activity struct { type Activity struct {
ID int64 `json:"id"` ID int64 `json:"id"`
@ -123,17 +125,17 @@ type ViewDocumentUserStatistic struct {
UserID string `json:"user_id"` UserID string `json:"user_id"`
Percentage float64 `json:"percentage"` Percentage float64 `json:"percentage"`
LastRead interface{} `json:"last_read"` LastRead interface{} `json:"last_read"`
ReadPercentage *float64 `json:"read_percentage"` ReadPercentage sql.NullFloat64 `json:"read_percentage"`
TotalTimeSeconds *float64 `json:"total_time_seconds"` TotalTimeSeconds sql.NullFloat64 `json:"total_time_seconds"`
TotalWordsRead interface{} `json:"total_words_read"` TotalWordsRead interface{} `json:"total_words_read"`
TotalWpm int64 `json:"total_wpm"` TotalWpm int64 `json:"total_wpm"`
YearlyTimeSeconds *float64 `json:"yearly_time_seconds"` YearlyTimeSeconds sql.NullFloat64 `json:"yearly_time_seconds"`
YearlyWordsRead interface{} `json:"yearly_words_read"` YearlyWordsRead interface{} `json:"yearly_words_read"`
YearlyWpm interface{} `json:"yearly_wpm"` YearlyWpm interface{} `json:"yearly_wpm"`
MonthlyTimeSeconds *float64 `json:"monthly_time_seconds"` MonthlyTimeSeconds sql.NullFloat64 `json:"monthly_time_seconds"`
MonthlyWordsRead interface{} `json:"monthly_words_read"` MonthlyWordsRead interface{} `json:"monthly_words_read"`
MonthlyWpm interface{} `json:"monthly_wpm"` MonthlyWpm interface{} `json:"monthly_wpm"`
WeeklyTimeSeconds *float64 `json:"weekly_time_seconds"` WeeklyTimeSeconds sql.NullFloat64 `json:"weekly_time_seconds"`
WeeklyWordsRead interface{} `json:"weekly_words_read"` WeeklyWordsRead interface{} `json:"weekly_words_read"`
WeeklyWpm interface{} `json:"weekly_wpm"` WeeklyWpm interface{} `json:"weekly_wpm"`
} }

View File

@ -26,8 +26,8 @@ VALUES (?, ?, ?, ?, ?, ?, ?, ?)
RETURNING *; RETURNING *;
-- name: CreateUser :execrows -- name: CreateUser :execrows
INSERT INTO users (id, pass, auth_hash, admin) INSERT INTO users (id, pass, auth_hash)
VALUES (?, ?, ?, ?) VALUES (?, ?, ?)
ON CONFLICT DO NOTHING; ON CONFLICT DO NOTHING;
-- name: DeleteDocument :execrows -- name: DeleteDocument :execrows

View File

@ -1,6 +1,6 @@
// Code generated by sqlc. DO NOT EDIT. // Code generated by sqlc. DO NOT EDIT.
// versions: // versions:
// sqlc v1.25.0 // sqlc v1.21.0
// source: query.sql // source: query.sql
package database package database
@ -113,8 +113,8 @@ func (q *Queries) AddMetadata(ctx context.Context, arg AddMetadataParams) (Metad
} }
const createUser = `-- name: CreateUser :execrows const createUser = `-- name: CreateUser :execrows
INSERT INTO users (id, pass, auth_hash, admin) INSERT INTO users (id, pass, auth_hash)
VALUES (?, ?, ?, ?) VALUES (?, ?, ?)
ON CONFLICT DO NOTHING ON CONFLICT DO NOTHING
` `
@ -122,16 +122,10 @@ type CreateUserParams struct {
ID string `json:"id"` ID string `json:"id"`
Pass *string `json:"-"` Pass *string `json:"-"`
AuthHash *string `json:"auth_hash"` AuthHash *string `json:"auth_hash"`
Admin bool `json:"-"`
} }
func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) (int64, error) { func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) (int64, error) {
result, err := q.db.ExecContext(ctx, createUser, result, err := q.db.ExecContext(ctx, createUser, arg.ID, arg.Pass, arg.AuthHash)
arg.ID,
arg.Pass,
arg.AuthHash,
arg.Admin,
)
if err != nil { if err != nil {
return 0, err return 0, err
} }

View File

@ -8,7 +8,6 @@ sql:
package: "database" package: "database"
out: "database" out: "database"
emit_json_tags: true emit_json_tags: true
emit_pointers_for_null_types: true
overrides: overrides:
# Documents # Documents
- column: "documents.md5" - column: "documents.md5"