refactor: auth endpoint name

Author: ItsNotGoodName

web/controllers/auth.go

@@ -16,7 +16,7 @@ func Login(c *fiber.Ctx, cc core.Context) error {
 	return c.Render("login", LoginData{})
 }
 
-func AuthLogin(c *fiber.Ctx, cc core.Context, store *session.Store) error {
+func LoginPost(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 	// Request
 	username := c.FormValue("username")
 	password := c.FormValue("password")
@@ -44,7 +44,7 @@ func AuthLogin(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 	return helpers.Redirect(c, "/")
 }
 
-func AuthLogout(c *fiber.Ctx, cc core.Context, store *session.Store) error {
+func Logout(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 	sess, err := store.Get(c)
 	if err != nil {
 		return helpers.Error(c, err)
@@ -58,11 +58,23 @@ func AuthLogout(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 	return helpers.Redirect(c, "/login")
 }
 
+func UserRequire(c *fiber.Ctx, cc core.Context, store *session.Store) error {
+	if procs.AuthHTTPAnonymous(cc) {
+		return helpers.NotFound(c)
+	}
+
+	return authRequire(c, cc, store)
+}
+
 func AuthRequire(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 	if procs.AuthHTTPAnonymous(cc) {
 		return c.Next()
 	}
 
+	return authRequire(c, cc, store)
+}
+
+func authRequire(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 	sess, err := store.Get(c)
 	if err != nil {
 		panic(err)
@@ -76,7 +88,7 @@ func AuthRequire(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 	return c.Next()
 }
 
-func AuthSkip(c *fiber.Ctx, cc core.Context, store *session.Store) error {
+func AuthRestrict(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 	if procs.AuthHTTPAnonymous(cc) {
 		return helpers.Redirect(c, "/")
 	}

web/http/routes.go

@@ -9,12 +9,13 @@ import (
 )
 
 func route(app core.App, store *session.Store, http fiber.Router) {
-	authSkip := inject.AppStore(app, store, controllers.AuthSkip)
+	userRequire := inject.AppStore(app, store, controllers.UserRequire)
 	authRequire := inject.AppStore(app, store, controllers.AuthRequire)
+	authSkip := inject.AppStore(app, store, controllers.AuthRestrict)
 
 	http.Get("/login", authSkip, inject.App(app, controllers.Login))
-	http.Post("/auth", authSkip, inject.AppStore(app, store, controllers.AuthLogin))
-	http.Delete("/auth", authRequire, inject.AppStore(app, store, controllers.AuthLogout))
+	http.Post("/login", authSkip, inject.AppStore(app, store, controllers.LoginPost))
+	http.Post("/logout", userRequire, inject.AppStore(app, store, controllers.Logout))
 
 	http.Get("/", authRequire, inject.App(app, controllers.Index))
 	http.Route("/index", func(http fiber.Router) {

web/views/login.html

@@ -8,7 +8,7 @@ <h1>SMTPBridge</h1>
   <article class="max-w-md mx-auto">
     <h2>Login</h2>
     {{block "form" .}}
-    <form method="post" action="/auth" hx-post="/auth" hx-swap="outerHTML">
+    <form method="post" action="/login" hx-post="/login" hx-swap="outerHTML">
       <label for="username">
         Username
         <input type="text" id="username" name="username" placeholder="Username" />
@@ -19,7 +19,7 @@ <h2>Login</h2>
         <input type="password" id="password" name="password" placeholder="Password" />
       </label>
 
-      <button data-loading-path="/auth" data-loading-disable data-loading-aria-busy>
+      <button data-loading-path="/login" data-loading-disable data-loading-aria-busy>
         Log in
       </button>
       {{with .Flash}}

web/views/partials/header.html

@@ -44,7 +44,7 @@
               </a>
             </li>
             <li>
-              <a href="#" class="contrast" hx-delete="/auth">
+              <a href="#" class="contrast" hx-post="/logout">
                 <div class="flex flex-items-center flex-row-reverse gap-2">
                   <div class="i-ri-logout-box-r-fill"></div>Log out
                 </div>
@@ -84,7 +84,7 @@
         </a>
       </li>
       <li>
-        <a href="#" class="contrast" hx-delete="/auth">
+        <a href="#" class="contrast" hx-post="/logout">
           <div class="flex flex-items-center gap-2">
             <div class="i-ri-logout-box-r-fill"></div>Log out
           </div>