x/web-app-template
Archived
Template
2
0
Fork 0
Code Issues 13 Pull Requests 4 Actions Packages Activity

fix: restructure env handling for better testing capabillities #181
All checks were successful
Build Docker Image / Explore-Gitea-Actions (push) Successful in 47s
Details
Build and Push Docker Image / Explore-Gitea-Actions (push) Successful in 55s
Details

Browse Source
This commit was merged in pull request #195.
This commit is contained in:
Tim Wundenberg
2024-09-29 23:51:23 +02:00
parent 25e82be339
commit a70138f2f7
15 changed files with 191 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
service/auth.go
View File

@@ -77,14 +77,14 @@ func (service ServiceAuthImpl) SignIn(email string, password string) (*User, err
return NewUser(user), nil
}
func HandleSignInPage(db *sql.DB) http.HandlerFunc {
func HandleSignInPage(db *sql.DB, serverSettings *types.ServerSettings) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
user := utils.GetUserFromSession(db, r)
if user == nil {
userComp := UserInfoComp(nil)
signIn := auth.SignInOrUpComp(true)
err := template.Layout(signIn, userComp).Render(r.Context(), w)
err := template.Layout(signIn, userComp, serverSettings.Environment).Render(r.Context(), w)
if err != nil {
utils.LogError("Failed to render sign in page", err)
@@ -99,14 +99,14 @@ func HandleSignInPage(db *sql.DB) http.HandlerFunc {
}
}
func HandleSignUpPage(db *sql.DB) http.HandlerFunc {
func HandleSignUpPage(db *sql.DB, serverSettings *types.ServerSettings) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
user := utils.GetUserFromSession(db, r)
if user == nil {
userComp := UserInfoComp(nil)
signUpComp := auth.SignInOrUpComp(false)
err := template.Layout(signUpComp, userComp).Render(r.Context(), w)
err := template.Layout(signUpComp, userComp, serverSettings.Environment).Render(r.Context(), w)
if err != nil {
utils.LogError("Failed to render sign up page", err)
@@ -121,7 +121,7 @@ func HandleSignUpPage(db *sql.DB) http.HandlerFunc {
}
}
func HandleSignUpVerifyPage(db *sql.DB) http.HandlerFunc {
func HandleSignUpVerifyPage(db *sql.DB, serverSettings *types.ServerSettings) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
user := utils.GetUserFromSession(db, r)
if user == nil {
@@ -131,7 +131,7 @@ func HandleSignUpVerifyPage(db *sql.DB) http.HandlerFunc {
} else {
userComp := UserInfoComp(user)
signIn := auth.VerifyComp()
err := template.Layout(signIn, userComp).Render(r.Context(), w)
err := template.Layout(signIn, userComp, serverSettings.Environment).Render(r.Context(), w)
if err != nil {
utils.LogError("Failed to render verify page", err)
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
@@ -140,7 +140,7 @@ func HandleSignUpVerifyPage(db *sql.DB) http.HandlerFunc {
}
}
func HandleDeleteAccountPage(db *sql.DB) http.HandlerFunc {
func HandleDeleteAccountPage(db *sql.DB, serverSettings *types.ServerSettings) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
// An unverified email should be able to delete their account
user := utils.GetUserFromSession(db, r)
@@ -149,7 +149,7 @@ func HandleDeleteAccountPage(db *sql.DB) http.HandlerFunc {
} else {
userComp := UserInfoComp(user)
comp := auth.DeleteAccountComp()
err := template.Layout(comp, userComp).Render(r.Context(), w)
err := template.Layout(comp, userComp, serverSettings.Environment).Render(r.Context(), w)
if err != nil {
utils.LogError("Failed to render delete account page", err)
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
@@ -200,7 +200,7 @@ func HandleSignUpVerifyResponsePage(db *sql.DB) http.HandlerFunc {
}
}
func HandleChangePasswordPage(db *sql.DB) http.HandlerFunc {
func HandleChangePasswordPage(db *sql.DB, serverSettings *types.ServerSettings) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
isPasswordReset := r.URL.Query().Has("token")
@@ -211,7 +211,7 @@ func HandleChangePasswordPage(db *sql.DB) http.HandlerFunc {
} else {
userComp := UserInfoComp(user)
comp := auth.ChangePasswordComp(isPasswordReset)
err := template.Layout(comp, userComp).Render(r.Context(), w)
err := template.Layout(comp, userComp, serverSettings.Environment).Render(r.Context(), w)
if err != nil {
utils.LogError("Failed to render change password page", err)
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
@@ -220,7 +220,7 @@ func HandleChangePasswordPage(db *sql.DB) http.HandlerFunc {
}
}
func HandleResetPasswordPage(db *sql.DB) http.HandlerFunc {
func HandleResetPasswordPage(db *sql.DB, serverSettings *types.ServerSettings) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
user := utils.GetUserFromSession(db, r)
@@ -229,7 +229,7 @@ func HandleResetPasswordPage(db *sql.DB) http.HandlerFunc {
} else {
userComp := UserInfoComp(nil)
comp := auth.ResetPasswordComp()
err := template.Layout(comp, userComp).Render(r.Context(), w)
err := template.Layout(comp, userComp, serverSettings.Environment).Render(r.Context(), w)
if err != nil {
utils.LogError("Failed to render change password page", err)
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
@@ -247,7 +247,7 @@ func UserInfoComp(user *types.User) templ.Component {
}
}
func HandleSignUpComp(db *sql.DB) http.HandlerFunc {
func HandleSignUpComp(db *sql.DB, serverSettings *types.ServerSettings) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var email = r.FormValue("email")
var password = r.FormValue("password")
@@ -304,7 +304,7 @@ func HandleSignUpComp(db *sql.DB) http.HandlerFunc {
}
// Send verification email as a goroutine
go sendVerificationEmail(db, userId.String(), email)
go sendVerificationEmail(db, userId.String(), email, serverSettings)
utils.DoRedirect(w, r, "/auth/verify")
}
@@ -339,7 +339,8 @@ func HandleSignOutComp(db *sql.DB) http.HandlerFunc {
}
}
func HandleDeleteAccountComp(db *sql.DB) http.HandlerFunc {
func HandleDeleteAccountComp(db *sql.DB, serverSettings *types.ServerSettings) http.HandlerFunc {
mailService := NewMailService(serverSettings)
return func(w http.ResponseWriter, r *http.Request) {
user := utils.GetUserFromSession(db, r)
if user == nil {
@@ -399,13 +400,13 @@ func HandleDeleteAccountComp(db *sql.DB) http.HandlerFunc {
return
}
go utils.SendMail(user.Email, "Account deleted", "Your account has been deleted")
go mailService.SendMail(user.Email, "Account deleted", "Your account has been deleted")
utils.DoRedirect(w, r, "/")
}
}
func HandleVerifyResendComp(db *sql.DB) http.HandlerFunc {
func HandleVerifyResendComp(db *sql.DB, serverSettings *types.ServerSettings) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
user := utils.GetUserFromSession(db, r)
if user == nil || user.EmailVerified {
@@ -413,7 +414,7 @@ func HandleVerifyResendComp(db *sql.DB) http.HandlerFunc {
return
}
go sendVerificationEmail(db, user.Id.String(), user.Email)
go sendVerificationEmail(db, user.Id.String(), user.Email, serverSettings)
w.Write([]byte("<p class=\"mt-8\">Verification email sent</p>"))
}
@@ -535,7 +536,8 @@ func HandleActualResetPasswordComp(db *sql.DB) http.HandlerFunc {
utils.TriggerToast(w, r, "success", "Password changed")
}
}
func HandleResetPasswordComp(db *sql.DB) http.HandlerFunc {
func HandleResetPasswordComp(db *sql.DB, serverSettings *types.ServerSettings) http.HandlerFunc {
mailService := NewMailService(serverSettings)
return func(w http.ResponseWriter, r *http.Request) {
email := r.FormValue("email")
@@ -571,19 +573,20 @@ func HandleResetPasswordComp(db *sql.DB) http.HandlerFunc {
if i != 0 {
var mail strings.Builder
err = tempMail.ResetPassword(token).Render(context.Background(), &mail)
err = tempMail.ResetPassword(serverSettings.BaseUrl, token).Render(context.Background(), &mail)
if err != nil {
utils.LogError("Could not render reset password email", err)
utils.TriggerToast(w, r, "error", "Internal Server Error")
return
}
utils.SendMail(email, "Reset Password", mail.String())
mailService.SendMail(email, "Reset Password", mail.String())
}
utils.TriggerToast(w, r, "info", "If the email exists, an email has been sent")
}
}
func sendVerificationEmail(db *sql.DB, userId string, email string) {
func sendVerificationEmail(db *sql.DB, userId string, email string, serverSettings *types.ServerSettings) {
var token string
err := db.QueryRow("SELECT token FROM user_token WHERE user_uuid = ? AND type = 'email_verify'", userId).Scan(&token)
@@ -607,12 +610,13 @@ func sendVerificationEmail(db *sql.DB, userId string, email string) {
}
var w strings.Builder
err = tempMail.Register(token).Render(context.Background(), &w)
err = tempMail.Register(serverSettings.BaseUrl, token).Render(context.Background(), &w)
if err != nil {
utils.LogError("Could not render welcome email", err)
return
}
utils.SendMail(email, "Welcome to ME-FIT", w.String())
mailService := NewMailService(serverSettings)
mailService.SendMail(email, "Welcome to ME-FIT", w.String())
}
func TryCreateSessionAndSetCookie(r *http.Request, w http.ResponseWriter, db *sql.DB, user_uuid uuid.UUID) error {

7
service/index_and_404.go
View File

@@ -3,13 +3,14 @@ package service
import (
"database/sql"
"me-fit/template"
"me-fit/types"
"me-fit/utils"
"net/http"
"github.com/a-h/templ"
)
func HandleIndexAnd404(db *sql.DB) http.HandlerFunc {
func HandleIndexAnd404(db *sql.DB, serverSettings *types.ServerSettings) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
user := utils.GetUserFromSession(db, r)
@@ -17,10 +18,10 @@ func HandleIndexAnd404(db *sql.DB) http.HandlerFunc {
userComp := UserInfoComp(user)
if r.URL.Path != "/" {
comp = template.Layout(template.NotFound(), userComp)
comp = template.Layout(template.NotFound(), userComp, serverSettings.Environment)
w.WriteHeader(http.StatusNotFound)
} else {
comp = template.Layout(template.Index(), userComp)
comp = template.Layout(template.Index(), userComp, serverSettings.Environment)
}
err := comp.Render(r.Context(), w)

29
service/mail.go Normal file
View File

@@ -0,0 +1,29 @@
package service
import (
"fmt"
"me-fit/types"
"net/smtp"
)
type MailService struct {
serverSettings *types.ServerSettings
}
func NewMailService(serverSettings *types.ServerSettings) MailService {
return MailService{serverSettings: serverSettings}
}
func (m MailService) SendMail(to string, subject string, message string) error {
if m.serverSettings.Smtp == nil {
return nil
}
s := m.serverSettings.Smtp
auth := smtp.PlainAuth("", s.User, s.Pass, s.Host)
msg := fmt.Sprintf("From: %v <%v>\nTo: %v\nSubject: %v\nMIME-version: 1.0;\nContent-Type: text/html; charset=\"UTF-8\";\n\n%v", s.FromName, s.FromMail, to, subject, message)
return smtp.SendMail(s.Host+":"+s.Port, auth, s.FromMail, []string{to}, []byte(msg))
}

5
service/workout.go
View File

@@ -4,6 +4,7 @@ import (
"log/slog"
"me-fit/template"
"me-fit/template/workout"
"me-fit/types"
"me-fit/utils"
"database/sql"
@@ -12,7 +13,7 @@ import (
"time"
)
func HandleWorkoutPage(db *sql.DB) http.HandlerFunc {
func HandleWorkoutPage(db *sql.DB, serverSettings *types.ServerSettings) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
user := utils.GetUser(r)
if user == nil {
@@ -23,7 +24,7 @@ func HandleWorkoutPage(db *sql.DB) http.HandlerFunc {
currentDate := time.Now().Format("2006-01-02")
inner := workout.WorkoutComp(currentDate)
userComp := UserInfoComp(user)
err := template.Layout(inner, userComp).Render(r.Context(), w)
err := template.Layout(inner, userComp, serverSettings.Environment).Render(r.Context(), w)
if err != nil {
utils.LogError("Failed to render workout page", err)
http.Error(w, "Internal Server Error", http.StatusInternalServerError)