Fix for login

This commit is contained in:
Aurélie Delhaie
2022-05-15 21:26:35 +02:00
parent 22ea6b0e8d
commit 246fe2fe6c
6 changed files with 57 additions and 25 deletions

View File

@@ -25,13 +25,20 @@ func init() {
locks = make(map[int]GameUploadToken)
dbConfig := config.Database()
var err error
db, err = gorm.Open(mysql.Open(
fmt.Sprintf("%s:%s@tcp(%s:%d)/transagenda?charset=utf8mb4&parseTime=True&loc=Local",
connectionString := ""
if dbConfig.Password != nil {
connectionString = fmt.Sprintf("%s:%s@tcp(%s:%d)/osc?charset=utf8mb4&parseTime=True&loc=Local",
dbConfig.Username,
dbConfig.Password,
*dbConfig.Password,
dbConfig.Host,
dbConfig.Port),
), &gorm.Config{
dbConfig.Port)
} else {
connectionString = fmt.Sprintf("%s@tcp(%s:%d)/osc?charset=utf8mb4&parseTime=True&loc=Local",
dbConfig.Username,
dbConfig.Host,
dbConfig.Port)
}
db, err = gorm.Open(mysql.Open(connectionString), &gorm.Config{
Logger: logger.New(
log.New(os.Stdout, "", log.LstdFlags), // io writer
logger.Config{

View File

@@ -9,14 +9,14 @@ type User struct {
}
type Game struct {
ID int `json:"id"`
Name string `json:"name"`
Revision int `json:"rev"`
PathStorage string `json:"-"`
Hash string `json:"hash"`
LastUpdate time.Time `json:"last_update"`
UserId int `json:"-"`
Available bool `json:"available"`
ID int `json:"id"`
Name string `json:"name"`
Revision int `json:"rev"`
PathStorage string `json:"-"`
Hash *string `json:"hash"`
LastUpdate *time.Time `json:"last_update"`
UserId int `json:"-"`
Available bool `json:"available"`
}
type GameUploadToken struct {