mirror of
https://github.com/lordmathis/lemma.git
synced 2025-11-06 07:54:22 +00:00
Fix admin user creation
This commit is contained in:
@@ -44,7 +44,10 @@ func main() {
|
|||||||
userService := user.NewUserService(database, fs)
|
userService := user.NewUserService(database, fs)
|
||||||
|
|
||||||
// Admin user
|
// Admin user
|
||||||
userService.SetupAdminUser()
|
_, err = userService.SetupAdminUser()
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
// Set up router
|
// Set up router
|
||||||
r := chi.NewRouter()
|
r := chi.NewRouter()
|
||||||
|
|||||||
@@ -80,14 +80,20 @@ func (db *DB) GetUserByID(id int) (*models.User, error) {
|
|||||||
|
|
||||||
func (db *DB) GetUserByEmail(email string) (*models.User, error) {
|
func (db *DB) GetUserByEmail(email string) (*models.User, error) {
|
||||||
user := &models.User{}
|
user := &models.User{}
|
||||||
|
var lastOpenedFilePath sql.NullString
|
||||||
err := db.QueryRow(`
|
err := db.QueryRow(`
|
||||||
SELECT id, email, display_name, password_hash, role, created_at, last_workspace_id, last_opened_file_path
|
SELECT id, email, display_name, password_hash, role, created_at, last_workspace_id, last_opened_file_path
|
||||||
FROM users WHERE email = ?`, email).
|
FROM users WHERE email = ?`, email).
|
||||||
Scan(&user.ID, &user.Email, &user.DisplayName, &user.PasswordHash, &user.Role, &user.CreatedAt,
|
Scan(&user.ID, &user.Email, &user.DisplayName, &user.PasswordHash, &user.Role, &user.CreatedAt,
|
||||||
&user.LastWorkspaceID, &user.LastOpenedFilePath)
|
&user.LastWorkspaceID, &lastOpenedFilePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
if lastOpenedFilePath.Valid {
|
||||||
|
user.LastOpenedFilePath = lastOpenedFilePath.String
|
||||||
|
} else {
|
||||||
|
user.LastOpenedFilePath = ""
|
||||||
|
}
|
||||||
return user, nil
|
return user, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ func (s *UserService) SetupAdminUser() (*models.User, error) {
|
|||||||
|
|
||||||
// Check if admin user exists
|
// Check if admin user exists
|
||||||
adminUser, err := s.DB.GetUserByEmail(adminEmail)
|
adminUser, err := s.DB.GetUserByEmail(adminEmail)
|
||||||
if err == nil {
|
if adminUser != nil {
|
||||||
return adminUser, nil // Admin user already exists
|
return adminUser, nil // Admin user already exists
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user