Add: backend session support and bug fix

This commit is contained in:
2021-12-12 01:13:26 +08:00
parent f3a95973e9
commit e608a6b1df
6 changed files with 123 additions and 26 deletions

View File

@@ -1,6 +1,7 @@
package api
import (
"database/sql"
"encoding/json"
"log"
"msw-open-music/pkg/database"
@@ -16,32 +17,85 @@ type LoginResponse struct {
User *database.User `json:"user"`
}
func (api *API) HandleLogin(w http.ResponseWriter, r *http.Request) {
// Get method will login as anonymous user
if r.Method == "GET" {
log.Println("Login as anonymous user")
user, err := api.Db.LoginAsAnonymous()
if err != nil {
api.HandleError(w, r, err)
return
}
resp := &LoginResponse{
User: user,
}
err = json.NewEncoder(w).Encode(resp)
return
}
var request LoginRequest
err := json.NewDecoder(r.Body).Decode(&request)
func (api *API) LoginAsAnonymous(w http.ResponseWriter, r *http.Request) {
user, err := api.Db.LoginAsAnonymous()
if err != nil {
api.HandleError(w, r, err)
return
}
log.Println("Login as user", request.Username)
session, _ := api.store.Get(r, api.defaultSessionName)
user, err := api.Db.Login(request.Username, request.Password)
// save session
session.Values["userId"] = user.ID
err = session.Save(r, w)
if err != nil {
api.HandleError(w, r, err)
return
}
resp := &LoginResponse{
User: user,
}
err = json.NewEncoder(w).Encode(resp)
if err != nil {
api.HandleError(w, r, err)
return
}
}
func (api *API) HandleLogin(w http.ResponseWriter, r *http.Request) {
var user *database.User
var err error
session, _ := api.store.Get(r, api.defaultSessionName)
log.Println("Session:", session.Values)
// Get method will login current or anonymous user
if r.Method == "GET" {
// if user already logged in
if userId, ok := session.Values["userId"]; ok {
user, err = api.Db.GetUserById(userId.(int64))
if err != nil {
if err != sql.ErrNoRows {
api.HandleError(w, r, err)
return
}
log.Println("User not found")
// login as anonymous user
api.LoginAsAnonymous(w, r)
return
}
log.Println("User already logged in:", user)
} else {
// login as anonymous user
log.Println("Login as anonymous user")
api.LoginAsAnonymous(w, r)
}
} else {
var request LoginRequest
err := json.NewDecoder(r.Body).Decode(&request)
if err != nil {
api.HandleError(w, r, err)
return
}
log.Println("Login as user", request.Username)
user, err = api.Db.Login(request.Username, request.Password)
if err != nil {
api.HandleError(w, r, err)
return
}
}
// save session
session.Values["userId"] = user.ID
err = session.Save(r, w)
if err != nil {
api.HandleError(w, r, err)
return
@@ -73,11 +127,19 @@ func (api *API) HandleRegister(w http.ResponseWriter, r *http.Request) {
log.Println("Register user", request.Username)
err = api.Db.Register(request.Username, request.Password, request.Role)
user, err := api.Db.Register(request.Username, request.Password, request.Role)
if err != nil {
api.HandleError(w, r, err)
return
}
api.HandleOK(w, r)
resp := &LoginResponse{
User: user,
}
err = json.NewEncoder(w).Encode(resp)
if err != nil {
api.HandleError(w, r, err)
return
}
}