moved generateRandomString to local config class
This commit is contained in:
@@ -8,6 +8,8 @@
|
|||||||
package config
|
package config
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"crypto/rand"
|
||||||
|
"encoding/base64"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
@@ -15,7 +17,6 @@ import (
|
|||||||
|
|
||||||
"github.com/kelseyhightower/envconfig"
|
"github.com/kelseyhightower/envconfig"
|
||||||
|
|
||||||
"GoMembership/internal/utils"
|
|
||||||
"GoMembership/pkg/logger"
|
"GoMembership/pkg/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -99,12 +100,12 @@ func LoadConfig() {
|
|||||||
readFile(&CFG)
|
readFile(&CFG)
|
||||||
readEnv(&CFG)
|
readEnv(&CFG)
|
||||||
logger.Info.Printf("Config file environment: %v", CFGPath)
|
logger.Info.Printf("Config file environment: %v", CFGPath)
|
||||||
csrfSecret, err := utils.GenerateRandomString(32)
|
csrfSecret, err := generateRandomString(32)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error.Fatalf("could not generate CSRF secret: %v", err)
|
logger.Error.Fatalf("could not generate CSRF secret: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
jwtSecret, err := utils.GenerateRandomString(32)
|
jwtSecret, err := generateRandomString(32)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error.Fatalf("could not generate JWT secret: %v", err)
|
logger.Error.Fatalf("could not generate JWT secret: %v", err)
|
||||||
}
|
}
|
||||||
@@ -160,3 +161,12 @@ func readEnv(cfg *Config) {
|
|||||||
logger.Error.Fatalf("could not decode env variables: %#v", err)
|
logger.Error.Fatalf("could not decode env variables: %#v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func generateRandomString(length int) (string, error) {
|
||||||
|
bytes := make([]byte, length)
|
||||||
|
_, err := rand.Read(bytes)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return base64.URLEncoding.EncodeToString(bytes), nil
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user