fsylvain/RenewCMS
1
0
Fork 0
mirror of https://github.com/Floriansylvain/RenewCMS.git synced 2026-08-19 11:43:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: setup/register flow impl and login refactor

Browse Source
This commit is contained in:
Florian Sylvain
2023-08-13 00:24:50 +02:00
parent 5c61796313
commit 04ebbfda87
7 changed files with 292 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/page.go
+32 -2
View File
@@ -6,6 +6,7 @@ import (
"io/fs"
"net/http"
"path/filepath"
"strings"
)
//go:embed static
@@ -26,6 +27,32 @@ type PageError struct {
IsError bool `json:"isError"`
}
func NewPageError(message string) *PageError {
return &PageError{
Message: message,
IsError: strings.Compare(message, "") != 0,
}
}
func IsLoggedInMiddleware(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if !IsLoggedIn(r) {
http.Redirect(w, r, LoginRoute, http.StatusSeeOther)
return
}
next.ServeHTTP(w, r)
})
}
func GetLogin(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, LoginRoute, http.StatusPermanentRedirect)
}
func GetLogout(w http.ResponseWriter, r *http.Request) {
RemoveJwtCookie(w)
http.Redirect(w, r, LoginRoute, http.StatusSeeOther)
}
func StaticFileServerWithContentType(fsys http.FileSystem) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
path := r.URL.Path
@@ -52,12 +79,15 @@ func NewPageRouter() http.Handler {
})
r.Get("/", GetLogin)
r.Get(LoginRoute, GetLoginPageHandler(NewLoginPage("", "")))
r.Post(LoginRoute, GetLoginPageHandler(NewLoginPage("", "")))
r.Get(LoginRoute, GetLoginPageHandler(EmptyLoginPage))
r.Post(LoginRoute, GetLoginPageHandler(EmptyLoginPage))
r.Get("/register", GetRegisterPageHandler(EmptyRegisterPage))
r.Post("/register", GetRegisterPageHandler(EmptyRegisterPage))
r.Get("/logout", GetLogout)
r.Group(func(r chi.Router) {
r.Use(IsLoggedInMiddleware)
r.Get("/register-confirm", GetRegisterConfirmPage)
r.Get("/home", GetHomePage)
})
api/pageAuth.go → api/pageLogin.go
+15 -30
View File
@@ -5,7 +5,6 @@ import (
"encoding/json"
"net/http"
"os"
"strings"
)
const LoginRoute = "/login"
@@ -15,14 +14,9 @@ type LoginPage struct {
Username string `json:"username"`
}
func NewLoginPage(error string, username string) *LoginPage {
return &LoginPage{
PageError: &PageError{
IsError: strings.Compare(error, "") != 0,
Message: error,
},
Username: username,
}
var EmptyLoginPage = &LoginPage{
PageError: NewPageError(""),
Username: "",
}
func GetLoginPageHandler(loginPage *LoginPage) http.HandlerFunc {
@@ -35,6 +29,10 @@ func GetLoginPageHandler(loginPage *LoginPage) http.HandlerFunc {
PostLoginPage(w, r)
return
}
if IsUserTableEmpty() {
http.Redirect(w, r, "/register", http.StatusSeeOther)
return
}
bs, err := Container.GetPageUseCase.GetPage("login", &loginPage)
if err != nil {
_, _ = w.Write([]byte(err.Error()))
@@ -52,7 +50,10 @@ func PostLoginPage(w http.ResponseWriter, r *http.Request) {
})
if err != nil {
r.Method = http.MethodGet
GetLoginPageHandler(NewLoginPage("Invalid username or password.", r.FormValue("username")))(w, r)
GetLoginPageHandler(&LoginPage{
PageError: NewPageError("Invalid form data format."),
Username: r.FormValue("username"),
})(w, r)
return
}
@@ -63,7 +64,10 @@ func PostLoginPage(w http.ResponseWriter, r *http.Request) {
if err != nil || response.StatusCode != http.StatusOK {
r.Method = http.MethodGet
GetLoginPageHandler(NewLoginPage("Invalid username or password.", r.FormValue("username")))(w, r)
GetLoginPageHandler(&LoginPage{
PageError: NewPageError("Invalid username or password."),
Username: r.FormValue("username"),
})(w, r)
return
}
@@ -71,22 +75,3 @@ func PostLoginPage(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, "/home", http.StatusSeeOther)
}
func GetLogin(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, LoginRoute, http.StatusPermanentRedirect)
}
func GetLogout(w http.ResponseWriter, r *http.Request) {
RemoveJwtCookie(w)
http.Redirect(w, r, LoginRoute, http.StatusSeeOther)
}
func IsLoggedInMiddleware(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if !IsLoggedIn(r) {
http.Redirect(w, r, LoginRoute, http.StatusSeeOther)
return
}
next.ServeHTTP(w, r)
})
}
api/pageRegister.go
+76
View File
@@ -0,0 +1,76 @@
package api
import (
"bytes"
"encoding/json"
"net/http"
"os"
)
type RegisterPage struct {
PageError *PageError `json:"error"`
Username string `json:"username"`
Email string `json:"email"`
}
var EmptyRegisterPage = &RegisterPage{
PageError: NewPageError(""),
Username: "",
Email: "",
}
func GetRegisterPageHandler(registerPage *RegisterPage) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if IsLoggedIn(r) || !IsUserTableEmpty() {
http.Redirect(w, r, "/home", http.StatusSeeOther)
return
}
if r.Method == http.MethodPost {
PostRegisterPage(w, r)
return
}
bs, err := Container.GetPageUseCase.GetPage("setup1", &registerPage)
if err != nil {
_, _ = w.Write([]byte(err.Error()))
}
_, _ = w.Write(bs)
}
}
func PostRegisterPage(w http.ResponseWriter, r *http.Request) {
_ = r.ParseForm()
credentials, err := json.Marshal(&UserRegister{
Username: r.FormValue("username"),
Password: r.FormValue("password"),
Email: r.FormValue("email"),
})
if err != nil {
r.Method = http.MethodGet
GetRegisterPageHandler(&RegisterPage{
PageError: NewPageError("Invalid register form data format."),
Username: r.FormValue("username"),
Email: r.FormValue("email"),
})(w, r)
return
}
response, err := http.Post(
"http://localhost:"+os.Getenv("PORT")+"/v1/auth/register",
"application/json",
bytes.NewBuffer(credentials))
if err != nil || response.StatusCode != http.StatusOK {
r.Method = http.MethodGet
GetRegisterPageHandler(&RegisterPage{
PageError: NewPageError("Username should be between 3 and 20 characters long, password should be between 8 and 20 characters long, and email should be a valid email address."),
Username: r.FormValue("username"),
Email: r.FormValue("email"),
})(w, r)
return
}
w.Header().Set("Set-Cookie", response.Header.Get("Set-Cookie"))
http.Redirect(w, r, "/register-confirm", http.StatusSeeOther)
}
api/pageRegisterConfirm.go
+10
View File
@@ -0,0 +1,10 @@
package api
import (
"net/http"
)
func GetRegisterConfirmPage(w http.ResponseWriter, _ *http.Request) {
registerConfirmTmpl, _ := Container.GetPageUseCase.GetPage("setup2", nil)
_, _ = w.Write(registerConfirmTmpl)
}