mirrors/homebox
1
0
Fork 1
mirror of https://github.com/hay-kot/homebox.git synced 2025-07-19 00:50:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup user implementation

Browse source
This commit is contained in:
Hayden 2022-08-30 16:40:39 -08:00
parent 9501eb398a
commit a9f53a4671
6 changed files with 39 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

24
backend/app/api/v1/v1_ctrl_auth.go
View file

@ -10,11 +10,6 @@ import (
"github.com/hay-kot/content/backend/pkgs/server"
)
var (
HeaderFormData = "application/x-www-form-urlencoded"
HeaderJSON = "application/json"
)
// HandleAuthLogin godoc
// @Summary User Login
// @Tags Authentication
@ -29,7 +24,7 @@ func (ctrl *V1Controller) HandleAuthLogin() http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
loginForm := &types.LoginForm{}
if r.Header.Get("Content-Type") == HeaderFormData {
if r.Header.Get("Content-Type") == server.ContentFormUrlEncoded {
err := r.ParseForm()
if err != nil {
server.Respond(w, http.StatusBadRequest, server.Wrap(err))
@ -39,7 +34,7 @@ func (ctrl *V1Controller) HandleAuthLogin() http.HandlerFunc {
loginForm.Username = r.PostFormValue("username")
loginForm.Password = r.PostFormValue("password")
} else if r.Header.Get("Content-Type") == HeaderJSON {
} else if r.Header.Get("Content-Type") == server.ContentJSON {
err := server.Decode(r, loginForm)
if err != nil {
@ -66,17 +61,10 @@ func (ctrl *V1Controller) HandleAuthLogin() http.HandlerFunc {
return
}
err = server.Respond(w, http.StatusOK, types.TokenResponse{
server.Respond(w, http.StatusOK, types.TokenResponse{
BearerToken: "Bearer " + newToken.Raw,
ExpiresAt: newToken.ExpiresAt,
})
if err != nil {
ctrl.log.Error(err, logger.Props{
"user": loginForm.Username,
})
return
}
}
}
@ -130,10 +118,6 @@ func (ctrl *V1Controller) HandleAuthRefresh() http.HandlerFunc {
return
}
err = server.Respond(w, http.StatusOK, newToken)
if err != nil {
return
}
server.Respond(w, http.StatusOK, newToken)
}
}