tom/arbeitszeitmessung
3
0
Fork 0
Code Issues 17 Pull Requests Actions Packages Releases 9 Wiki Activity

added user Session Handler --> closed #20

Browse Source
This commit is contained in:
Tom Tröger
2025-08-12 15:47:36 +02:00
parent 64bc58a3a5
commit a87bef8c89
13 changed files with 127 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Backend/endpoints/team.go
View File

@@ -17,13 +17,10 @@ func TeamHandler(w http.ResponseWriter, r *http.Request) {
switch r.Method {
case http.MethodPost:
submitReport(w, r)
break
case http.MethodGet:
showWeeks(w, r)
break
default:
http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
break
}
}
@@ -47,10 +44,8 @@ func submitReport(w http.ResponseWriter, r *http.Request) {
switch r.FormValue("method") {
case "send":
err = workWeek.Send()
break
case "accept":
err = workWeek.Accept()
break
default:
break
}

10
Backend/endpoints/team_presence.go
View File

@@ -8,24 +8,21 @@ import (
"net/http"
)
func TeamPresenceHandler(w http.ResponseWriter, r *http.Request){
func TeamPresenceHandler(w http.ResponseWriter, r *http.Request) {
helper.RequiresLogin(Session, w, r)
helper.SetCors(w)
switch r.Method {
case http.MethodGet:
teamPresence(w, r)
break
case http.MethodOptions:
// just support options header for non GET Requests from SWAGGER
w.WriteHeader(http.StatusOK)
break
default:
http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
break
}
}
func teamPresence(w http.ResponseWriter, r *http.Request){
func teamPresence(w http.ResponseWriter, r *http.Request) {
user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
if err != nil {
log.Println("Error getting user!", err)
@@ -37,8 +34,7 @@ func teamPresence(w http.ResponseWriter, r *http.Request){
teamPresence[present] = append(teamPresence[present], user)
}
if(err != nil){
if err != nil {
log.Println("Error getting team", err)
}
templates.TeamPresencePage(teamPresence).Render(r.Context(), w)

4
Backend/endpoints/time-create.go
View File

@@ -16,17 +16,13 @@ func TimeCreateHandler(w http.ResponseWriter, r *http.Request) {
switch r.Method {
case http.MethodPut:
createBooking(w, r)
break
case http.MethodGet:
createBooking(w, r)
break
case http.MethodOptions:
// just support options header for non GET Requests from SWAGGER
w.WriteHeader(http.StatusOK)
break
default:
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
break
}
}

7
Backend/endpoints/time.go
View File

@@ -20,17 +20,13 @@ func TimeHandler(w http.ResponseWriter, r *http.Request) {
switch r.Method {
case http.MethodGet:
getBookings(w, r)
break
case http.MethodPost:
updateBooking(w, r)
break
case http.MethodOptions:
// just support options header for non GET Requests from SWAGGER
w.WriteHeader(http.StatusOK)
break
default:
http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
break
}
}
@@ -120,7 +116,6 @@ func updateBooking(w http.ResponseWriter, r *http.Request) {
if err != nil {
log.Println("Error inserting booking", err)
}
break
case "change":
absenceType, err := strconv.Atoi(r.FormValue("absence"))
if err != nil {
@@ -151,9 +146,7 @@ func updateBooking(w http.ResponseWriter, r *http.Request) {
booking.UpdateTime(parsedTime)
}
}
break
}
getBookings(w, r)
}

24
Backend/endpoints/user-login.go → Backend/endpoints/user-session.go
View File

@@ -21,20 +21,6 @@ func CreateSessionManager(lifetime time.Duration) *scs.SessionManager {
return Session
}
func LoginHandler(w http.ResponseWriter, r *http.Request) {
switch r.Method {
case http.MethodGet:
showLoginPage(w, r, false)
break
case http.MethodPost:
loginUser(w, r)
break
default:
http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
break
}
}
func showLoginPage(w http.ResponseWriter, r *http.Request, failed bool) {
r = r.WithContext(context.WithValue(r.Context(), "session", Session))
if helper.GetEnv("GO_ENV", "production") == "debug" {
@@ -83,5 +69,13 @@ func loginUser(w http.ResponseWriter, r *http.Request) {
return
}
showLoginPage(w, r, false)
return
}
func logoutUser(w http.ResponseWriter, r *http.Request) {
log.Println("Loggin out user!")
err := Session.Destroy(r.Context())
if err != nil {
log.Println("Error destroying session!", err)
}
http.Redirect(w, r, "/user/login", http.StatusSeeOther)
}

34
Backend/endpoints/user-settings.go
View File

@@ -1,36 +1,12 @@
package endpoints
import (
"arbeitszeitmessung/helper"
"arbeitszeitmessung/models"
"arbeitszeitmessung/templates"
"log"
"net/http"
)
func UserSettingsHandler(w http.ResponseWriter, r *http.Request) {
helper.RequiresLogin(Session, w, r)
switch r.Method {
case http.MethodGet:
showUserPage(w, r, 0)
break
case http.MethodPost:
switch r.FormValue("action") {
case "change-pass":
changePassword(w, r)
break
case "logout-user":
logoutUser(w, r)
break
}
break
default:
http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
break
}
}
// change user password and store salted hash in db
func changePassword(w http.ResponseWriter, r *http.Request) {
err := r.ParseForm()
@@ -61,16 +37,6 @@ func changePassword(w http.ResponseWriter, r *http.Request) {
showUserPage(w, r, http.StatusUnauthorized)
}
func logoutUser(w http.ResponseWriter, r *http.Request) {
err := Session.Destroy(r.Context())
if err != nil {
log.Println("Error destroying session!", err)
}
http.Redirect(w, r, "/user/login", http.StatusSeeOther)
}
func showUserPage(w http.ResponseWriter, r *http.Request, status int) {
templates.UserPage(status).Render(r.Context(), w)
return
}

45
Backend/endpoints/user.go Normal file
View File

@@ -0,0 +1,45 @@
package endpoints
import (
"arbeitszeitmessung/helper"
"net/http"
)
func UserHandler(w http.ResponseWriter, r *http.Request) {
switch r.PathValue("action") {
case "login":
LoginHandler(w, r)
case "settings":
UserSettingsHandler(w, r)
case "logout":
logoutUser(w, r)
}
}
func LoginHandler(w http.ResponseWriter, r *http.Request) {
switch r.Method {
case http.MethodGet:
showLoginPage(w, r, false)
case http.MethodPost:
loginUser(w, r)
default:
http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
}
}
func UserSettingsHandler(w http.ResponseWriter, r *http.Request) {
helper.RequiresLogin(Session, w, r)
switch r.Method {
case http.MethodGet:
showUserPage(w, r, 0)
case http.MethodPost:
switch r.FormValue("action") {
case "change-pass":
changePassword(w, r)
case "logout-user":
logoutUser(w, r)
}
default:
http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
}
}