basic redirect test

.traefik.yml

@@ -6,5 +6,5 @@ import: github.com/fosrl/badger
 summary: Middleware auth bouncer for Fossorial
 
 testData:
-  apiAddress: http://pangolin:3001
+  apiBaseUrl: http://localhost:3001/api/v1
-  validToken: abc123
+  appBaseUrl: http://localhost:3000

main.go

@@ -2,13 +2,16 @@ package badger
 
 import (
 	"context"
+	"fmt"
 	"net/http"
-	"time"
+	"net/url"
 )
 
+const SessionCookieName = "session"
+
 type Config struct {
-	APIAddress string `json:"apiAddress"`
+	AppBaseUrl string `json:"appBaseUrl"`
-	ValidToken string `json:"validToken"`
+	APIBaseUrl string `json:"apiBaseUrl"`
 }
 
 func CreateConfig() *Config {
@@ -18,52 +21,44 @@ func CreateConfig() *Config {
 type Badger struct {
 	next       http.Handler
 	name       string
-	apiAdress  string
+	appBaseUrl string
-	validToken string
+	apiBaseUrl string
 }
 
 func New(ctx context.Context, next http.Handler, config *Config, name string) (http.Handler, error) {
 	return &Badger{
 		next:       next,
 		name:       name,
-		apiAdress:  config.APIAddress,
+		appBaseUrl: config.AppBaseUrl,
-		validToken: config.ValidToken,
+		apiBaseUrl: config.APIBaseUrl,
 	}, nil
 }
 
-// THIS IS AN EAXMPLE FOR TESTING
-
-var usedTokens = make(map[string]bool)
-
-const cookieName = "access_token"
-const cookieDuration = 1 * time.Minute
-
 func (p *Badger) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
-	if _, err := req.Cookie(cookieName); err == nil {
+	// Check if the session cookie exists
-		p.next.ServeHTTP(rw, req)
+	cookie, err := req.Cookie(SessionCookieName)
+	if err != nil {
+		// No session cookie, redirect to login
+		originalRequestURL := url.QueryEscape(req.URL.String())
+		http.Redirect(rw, req, fmt.Sprintf("%s/auth/login?redirect=%s", p.appBaseUrl, originalRequestURL), http.StatusFound)
 		return
 	}
 
-	queryToken := req.URL.Query().Get("token")
+	// Verify the user with the session ID
-	if queryToken == "" {
+	sessionID := cookie.Value
-		http.Error(rw, "Missing token", http.StatusUnauthorized)
+	verifyURL := fmt.Sprintf("%s/badger/verify-user?sessionId=%s", p.apiBaseUrl, sessionID)
+
+	resp, err := http.Get(verifyURL)
+	if err != nil || resp.StatusCode != http.StatusOK {
+		// If unauthorized (401), redirect to the homepage
+		if resp != nil && resp.StatusCode == http.StatusUnauthorized {
+			http.Redirect(rw, req, p.appBaseUrl, http.StatusFound)
+		} else {
+			// Handle other errors, possibly log them (you can adjust the error handling here)
+			http.Error(rw, "Internal Server Error", http.StatusInternalServerError)
+		}
 		return
 	}
 
-	if queryToken != p.validToken || usedTokens[queryToken] {
-		http.Error(rw, "Invalid or already used token", http.StatusUnauthorized)
-		return
-	}
-
-	usedTokens[queryToken] = true
-
-	expiration := time.Now().Add(cookieDuration)
-	http.SetCookie(rw, &http.Cookie{
-		Name:    cookieName,
-		Value:   "temporary-access",
-		Expires: expiration,
-		Path:    "/",
-	})
-
 	p.next.ServeHTTP(rw, req)
 }