add sentry tag, landing page header "create your own link" change

Author: zmzlois

pkg/auth/sessions.go

@@ -65,7 +65,7 @@ func (dc *Client) SetCookie(tokenString string, w http.ResponseWriter) {
 	http.SetCookie(w, &cookie)
 }
 
-func ValidateToken(ctx context.Context, tokenString string) (bool, error) {
+func ValidateToken(tokenString string) (bool, error) {
 
 	token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
 		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
@@ -78,7 +78,7 @@ func ValidateToken(ctx context.Context, tokenString string) (bool, error) {
 	if err != nil || !token.Valid {
 		return false, err
 	}
-	return false, nil
+	return true, nil
 }
 
 func GetToken(r *http.Request) (string, error) {
@@ -97,12 +97,12 @@ func RetrieveTokenValue(field string, r *http.Request) (jwt.MapClaims, interface
 	claims := jwt.MapClaims{}
 	tokenFromCookie, err := r.Cookie(CookieName)
 
-	tokenString := tokenFromCookie.Value
-
 	if err != nil {
 		return claims, "", fmt.Errorf("discordClient.RetrieveTokenValue: %w", err)
 	}
 
+	tokenString := tokenFromCookie.Value
+
 	// Parse the JWT token string
 	// FIXME: https://auth0.com/blog/critical-vulnerabilities-in-json-web-token-libraries/
 	token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
@@ -143,3 +143,23 @@ func WithSession(ctx context.Context, key contextKey, ctxValue string) context.C
 
 	return context.WithValue(ctx, key, ctxValue)
 }
+
+func IsUser(r *http.Request) (bool, error) {
+
+	token, err := GetToken(r)
+
+	if err != nil {
+
+		return false, err
+	}
+
+	result, err := ValidateToken(token)
+
+	if err != nil {
+
+		return false, err
+	}
+
+	return result, nil
+
+}

pkg/handler/index.go

@@ -1,11 +1,23 @@
 package handler
 
 import (
+	"fmt"
 	"net/http"
 
+	"github.com/zmzlois/LinkGoGo/pkg/auth"
 	"github.com/zmzlois/LinkGoGo/web/pages"
+	"go.uber.org/zap"
 )
 
 func Index(w http.ResponseWriter, r *http.Request) {
-	pages.HomePage().Render(r.Context(), w)
+
+	var isUser = false
+
+	isUser, err := auth.IsUser(r)
+
+	if err != nil {
+		fmt.Printf("Index.isUser: %v", zap.Error(err))
+	}
+
+	pages.HomePage(isUser).Render(r.Context(), w)
 }

pkg/handler/unauthorised.go

@@ -0,0 +1,22 @@
+package handler
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/zmzlois/LinkGoGo/pkg/utils"
+	"github.com/zmzlois/LinkGoGo/web/pages"
+)
+
+func UnauthorisedHandler(w http.ResponseWriter, r *http.Request) {
+
+	// how this string should looks like based on environment
+	// 	<meta http-equiv="refresh" content="5; url=http://localhost:3000/login"/>
+	var loginURL string
+
+	URL := utils.Config("URL")
+
+	loginURL = fmt.Sprintf("5; url=%s/login", URL)
+
+	pages.UnauthorisedPage(loginURL).Render(r.Context(), w)
+}

pkg/middleware/auth_middleware.go

@@ -31,7 +31,7 @@ func AuthMiddleware(next http.Handler) http.Handler {
 
 		// Parse and validate JWT token
 		ctx := r.Context()
-		authenticated, err := auth.ValidateToken(ctx, tokenString)
+		authenticated, err := auth.ValidateToken(tokenString)
 		if err != nil {
 
 			fmt.Println("failed to validate session token", zap.Error(err))

pkg/middleware/redirect_middleware.go

@@ -23,7 +23,7 @@ func RedirectMiddleware(next http.Handler) http.Handler {
 		}
 
 		ctx := r.Context()
-		authenticated, err := auth.ValidateToken(ctx, tokenString)
+		authenticated, err := auth.ValidateToken(tokenString)
 
 		if err != nil {
 			fmt.Printf("AuthMiddleware.ValidateToken: %v", zap.Error(err))

pkg/monitor/sentry.go

@@ -10,6 +10,7 @@ import (
 	"github.com/getsentry/sentry-go"
 	sentryhttp "github.com/getsentry/sentry-go/http"
 	"github.com/joho/godotenv"
+	"github.com/zmzlois/LinkGoGo/pkg/utils"
 )
 
 type handler struct{}
@@ -58,6 +59,7 @@ func SentryInit() {
 
 			return event
 		},
+		Environment:        utils.Config("ENVIRONMENT"),
 		Debug:              true,
 		AttachStacktrace:   true,
 		EnableTracing:      true,

pkg/router/router.go

@@ -60,9 +60,7 @@ func SetupRouter(app chi.Router) {
 
 	app.Get("/discord-callback", discordOAuthCallbackHandler)
 
-	app.Get("/unauthorised", func(w http.ResponseWriter, r *http.Request) {
-		pages.UnauthorisedPage().Render(r.Context(), w)
-	})
+	app.Get("/unauthorised", handler.UnauthorisedHandler)
 
 	linkService := service.NewLinkService(db)
 

web/pages/home.templ

@@ -20,11 +20,11 @@ var Links []model.NewLinkInput = []model.NewLinkInput{
 }
 
 // }
-templ HomePage() {
+templ HomePage(isUser bool) {
 	@shared.Page("Home") {
 		@shared.Background() {
 			@shared.Container() {
-				@partials.Header()
+				@partials.Header(isUser)
 			}
 			@shared.Container() {
 				@partials.ProfileHeader(MockData["avatar"], MockData["name"], MockData["bio"])

web/pages/home_templ.go

@@ -1,17 +1,19 @@
 package pages 
 
-import "github.com/zmzlois/LinkGoGo/web/templates/shared"
+import (
+	"github.com/zmzlois/LinkGoGo/web/templates/shared"
+)
 
-templ UnauthorisedPage() {
+templ UnauthorisedPage(loginURL string) {
 	@shared.Page("Unauthorized") {
 		<head>
-			<meta http-equiv="refresh" content="5; url=http://localhost:3000"/>
+			<meta http-equiv="refresh" content="5; url=http://localhost:3000/login"/>
 		</head>
 		@shared.Background() {
 			<div class="flex  flex-col content-center items-center text-center justify-center py-10 gap-8">
 				<h1 class="font-bold text-zinc-900 lg:text-4xl text-2xl">You are not authorised</h1>
 				<p>
-					We are redirecting you to home page.
+					We are redirecting you to login.
 				</p>
 				<svg class="animate-spin -ml-1 mr-3 h-5 w-5 text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
 					<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>