arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Use new simplified uuid.NewString() syntax

Browse Source
This commit is contained in:
Deluan
2021-02-01 01:22:31 -05:00
parent b47ec02f02
commit 861b406575
10 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/app/auth.go
+1 -2
View File
@@ -112,11 +112,10 @@ func CreateAdmin(ds model.DataStore) func(w http.ResponseWriter, r *http.Request
}
func createDefaultUser(ctx context.Context, ds model.DataStore, username, password string) error {
id, _ := uuid.NewRandom()
log.Warn("Creating initial user", "user", username)
now := time.Now()
initialUser := model.User{
ID: id.String(),
ID: uuid.NewString(),
UserName: username,
Name: strings.Title(username),
Email: "",
server/events/sse.go
+1 -2
View File
@@ -154,9 +154,8 @@ func (b *broker) ServeHTTP(w http.ResponseWriter, r *http.Request) {
func (b *broker) subscribe(r *http.Request) client {
user, _ := request.UserFrom(r.Context())
id, _ := uuid.NewRandom()
c := client{
id: id.String(),
id: uuid.NewString(),
username: user.UserName,
address: r.RemoteAddr,
userAgent: r.UserAgent(),
server/initial_setup.go
+7 -12
View File
@@ -26,7 +26,7 @@ func initialSetup(ds model.DataStore) {
}
if conf.Server.DevAutoCreateAdminPassword != "" {
if err = createInitialAdminUser(ds); err != nil {
if err = createInitialAdminUser(ds, conf.Server.DevAutoCreateAdminPassword); err != nil {
return err
}
}
@@ -36,22 +36,18 @@ func initialSetup(ds model.DataStore) {
})
}
func createInitialAdminUser(ds model.DataStore) error {
func createInitialAdminUser(ds model.DataStore, initialPassword string) error {
users := ds.User(context.TODO())
c, err := users.CountAll()
if err != nil {
panic(fmt.Sprintf("Could not access User table: %s", err))
}
if c == 0 {
id, _ := uuid.NewRandom()
random, _ := uuid.NewRandom()
initialPassword := random.String()
if conf.Server.DevAutoCreateAdminPassword != "" {
initialPassword = conf.Server.DevAutoCreateAdminPassword
}
log.Warn("Creating initial admin user. This should only be used for development purposes!!", "user", consts.DevInitialUserName, "password", initialPassword)
id := uuid.NewString()
log.Warn("Creating initial admin user. This should only be used for development purposes!!",
"user", consts.DevInitialUserName, "password", initialPassword, "id", id)
initialUser := model.User{
ID: id.String(),
ID: id,
UserName: consts.DevInitialUserName,
Name: consts.DevInitialName,
Email: "",
@@ -72,9 +68,8 @@ func createJWTSecret(ds model.DataStore) error {
if err == nil {
return nil
}
jwtSecret, _ := uuid.NewRandom()
log.Warn("Creating JWT secret, used for encrypting UI sessions")
err = properties.Put(consts.JWTSecretKey, jwtSecret.String())
err = properties.Put(consts.JWTSecretKey, uuid.NewString())
if err != nil {
log.Error("Could not save JWT secret in DB", err)
}