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

8
.idea/misc.xml generated
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SwUserDefinedSpecifications">
<option name="specTypeByUrl">
<map />
</option>
</component>
</project>

View File

@@ -22,7 +22,7 @@ type DatabaseConfiguration struct {
Host string `yaml:"host"`
Port int `yaml:"port"`
Username string `yaml:"username"`
Password string `yaml:"password"`
Password *string `yaml:"password"`
}
type FeaturesConfiguration struct {

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

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

View File

@@ -14,6 +14,10 @@ type Credential struct {
Password string `json:"password"`
}
type TokenValidation struct {
Valid bool `json:"valid"`
}
func Login(w http.ResponseWriter, r *http.Request) {
body, err := io.ReadAll(r.Body)
if err != nil {
@@ -62,3 +66,31 @@ func Register(w http.ResponseWriter, r *http.Request) {
}
ok(payload, w, r)
}
func CheckToken(w http.ResponseWriter, r *http.Request) {
body, err := io.ReadAll(r.Body)
if err != nil {
internalServerError(w, r)
log.Println(err)
return
}
credential := new(authentication.AccessToken)
err = json.Unmarshal(body, credential)
if err != nil {
internalServerError(w, r)
log.Println(err)
return
}
_, err = authentication.ParseToken(credential.Token)
if err != nil {
payload := TokenValidation{
Valid: false,
}
ok(payload, w, r)
return
}
payload := TokenValidation{
Valid: true,
}
ok(payload, w, r)
}

View File

@@ -23,6 +23,7 @@ func Serve() {
router.Route("/api", func(rApi chi.Router) {
rApi.Route("/v1", func(r chi.Router) {
r.Post("/login", Login)
r.Post("/check/token", CheckToken)
if config.Features().AllowRegister {
r.Post("/register", Register)
}