I totally forgot about git 😭

Author: goosenotduck

go.mod

@@ -3,52 +3,59 @@ module makedotcsh
 go 1.26.4
 
 require (
+	github.com/computersciencehouse/csh-auth/v2 v2.0.1
 	github.com/gin-contrib/cors v1.7.7
 	github.com/gin-contrib/gzip v1.2.6
 	github.com/gin-contrib/logger v1.2.7
 	github.com/gin-gonic/gin v1.12.0
 	github.com/golang-migrate/migrate/v4 v4.19.1
+	github.com/joho/godotenv v1.5.1
 	github.com/mattn/go-sqlite3 v1.14.45
 )
 
 require (
-	github.com/bytedance/gopkg v0.1.3 // indirect
-	github.com/bytedance/sonic v1.15.0 // indirect
-	github.com/bytedance/sonic/loader v0.5.0 // indirect
-	github.com/cloudwego/base64x v0.1.6 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.12 // indirect
-	github.com/gin-contrib/sse v1.1.0 // indirect
+	github.com/bytedance/gopkg v0.1.4 // indirect
+	github.com/bytedance/sonic v1.15.1 // indirect
+	github.com/bytedance/sonic/loader v0.5.1 // indirect
+	github.com/cloudwego/base64x v0.1.7 // indirect
+	github.com/coreos/go-oidc/v3 v3.18.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.13 // indirect
+	github.com/gin-contrib/sse v1.1.1 // indirect
+	github.com/go-jose/go-jose/v4 v4.1.4 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.30.1 // indirect
-	github.com/goccy/go-json v0.10.5 // indirect
+	github.com/go-playground/validator/v10 v10.30.2 // indirect
+	github.com/goccy/go-json v0.10.6 // indirect
 	github.com/goccy/go-yaml v1.19.2 // indirect
+	github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-isatty v0.0.22 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
+	github.com/pelletier/go-toml/v2 v2.3.1 // indirect
 	github.com/quic-go/qpack v0.6.0 // indirect
 	github.com/quic-go/quic-go v0.59.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
 	github.com/rs/zerolog v1.34.0 // indirect
+	github.com/sirupsen/logrus v1.9.4 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.3.1 // indirect
-	go.mongodb.org/mongo-driver/v2 v2.5.0 // indirect
-	golang.org/x/arch v0.23.0 // indirect
-	golang.org/x/crypto v0.48.0 // indirect
-	golang.org/x/mod v0.33.0 // indirect
-	golang.org/x/net v0.51.0 // indirect
+	go.mongodb.org/mongo-driver/v2 v2.6.0 // indirect
+	golang.org/x/arch v0.27.0 // indirect
+	golang.org/x/crypto v0.51.0 // indirect
+	golang.org/x/mod v0.35.0 // indirect
+	golang.org/x/net v0.54.0 // indirect
+	golang.org/x/oauth2 v0.36.0 // indirect
 	golang.org/x/sync v0.20.0 // indirect
-	golang.org/x/sys v0.41.0 // indirect
-	golang.org/x/text v0.35.0 // indirect
-	golang.org/x/tools v0.42.0 // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
+	golang.org/x/sys v0.44.0 // indirect
+	golang.org/x/text v0.37.0 // indirect
+	golang.org/x/tools v0.44.0 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
 	lukechampine.com/uint128 v1.2.0 // indirect
 	modernc.org/cc/v3 v3.36.3 // indirect
 	modernc.org/ccgo/v3 v3.16.9 // indirect

go.sum

@@ -5,11 +5,14 @@ import (
 	"log"
 	"makedotcsh/database"
 	"makedotcsh/routes"
+	"os"
 
+	cshauth "github.com/computersciencehouse/csh-auth/v2"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-contrib/gzip"
 	"github.com/gin-contrib/logger"
 	"github.com/gin-gonic/gin"
+	"github.com/joho/godotenv"
 )
 
 func errorHandler(c *gin.Context) {
@@ -23,26 +26,60 @@ func errorHandler(c *gin.Context) {
 	}
 }
 
-func notFoundHandler(context *gin.Context) {
-	context.JSON(404, gin.H{
-		"status":  "error",
-		"message": fmt.Sprintf("path %s was not found", context.Request.URL.Path),
-	})
+func serveIndex(c *gin.Context) {
+	c.File("./web/dist/index.html")
 }
 
 func main() {
+	godotenv.Load()
 	router := gin.New()
 
+	host := os.Getenv("MAKE_HOST")
+
+	fmt.Println(os.Getenv("MAKE_OIDC_ID"))
+
 	// init db
 	database.Init()
 
+	// init auth
+	auth, err := cshauth.Init(
+		os.Getenv("MAKE_OIDC_ID"),
+		os.Getenv("MAKE_OIDC_SECRET"),
+		host,
+		host+"/auth/login",
+		host+"/auth/callback",
+		[]string{"profile", "email", "groups"},
+	)
+
+	if err != nil {
+		log.Panicf("Error initializing CSH auth %v", err)
+	}
+
 	router.Use(gzip.Gzip(gzip.DefaultCompression))
 	router.Use(cors.Default())
 	router.Use(logger.SetLogger())
 	router.Use(errorHandler)
-	router.NoRoute(notFoundHandler)
 
-	routes.SetRoutes(router)
+	// auth
+	router.GET("/auth/login", auth.HandleLogin)       // This endpoint should match the path for loginURL
+	router.GET("/auth/callback", auth.HandleCallback) // This endpoint should match the path for callbackURL
+	router.GET("/auth/logout", auth.HandleLogout)
+
+	// api
+	routes.SetRoutes(router, auth)
+
+	// frontend
+	frontend := router.Group("/")
+	frontend.Use(auth.CookieMiddleware())
+
+	if os.Getenv("DEV") == "true" {
+		router.NoRoute(createViteProxy())
+	} else {
+		frontend.Static("/assets", "./web/dist/assets")
+		frontend.GET("/", serveIndex)
+		frontend.GET("/:path", serveIndex)
+		frontend.GET("/:path/*rest", serveIndex)
+	}
 
 	log.Println("running")
 	router.Run()

main.go

@@ -0,0 +1,39 @@
+package me
+
+import (
+	"errors"
+
+	csh_auth "github.com/computersciencehouse/csh-auth/v2"
+	"github.com/gin-gonic/gin"
+)
+
+func test(c *gin.Context) {
+	authAny, exists := c.Get("cshauth")
+	if !exists {
+		err := errors.New("cshauth does not exist in context")
+		c.Error(err)
+		return
+	}
+
+	auth, ok := authAny.(*csh_auth.Claims)
+	if !ok {
+		err := errors.New("authentication data in gin context does not match structure")
+		c.Error(err)
+		return
+	}
+
+	user := csh_auth.UserInfo{
+		Uuid:     auth.Uuid,
+		Email:    auth.Email,
+		Username: auth.Username,
+		FullName: auth.FullName,
+		Groups:   auth.Groups,
+	}
+
+	c.JSON(200, user)
+}
+
+func Routes(route *gin.RouterGroup) {
+	me := route.Group("/me")
+	me.GET("/", test)
+}

routes/api/me/me.go

@@ -2,11 +2,15 @@ package routes
 
 import (
 	"makedotcsh/routes/api/areas"
+	"makedotcsh/routes/api/me"
 
+	csh_auth "github.com/computersciencehouse/csh-auth/v2"
 	"github.com/gin-gonic/gin"
 )
 
-func SetRoutes(router *gin.Engine) {
+func SetRoutes(router *gin.Engine, auth csh_auth.Auth) {
 	api := router.Group("/api")
+	api.Use(auth.CookieMiddleware())
 	areas.Routes(api)
+	me.Routes(api)
 }

routes/routes.go

@@ -0,0 +1 @@
+exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1

tmp/build-errors.log

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"net/http/httputil"
+	"net/url"
+
+	"github.com/gin-gonic/gin"
+)
+
+func createViteProxy() gin.HandlerFunc {
+	viteURL, _ := url.Parse("http://localhost:5173")
+	proxy := httputil.NewSingleHostReverseProxy(viteURL)
+
+	return func(c *gin.Context) {
+		proxy.ServeHTTP(c.Writer, c.Request)
+	}
+}

tmp/main

@@ -0,0 +1,8 @@
+[*.{js,jsx,mjs,cjs,ts,tsx,mts,cts,vue,css,scss,sass,less,styl}]
+charset = utf-8
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+max_line_length = 100

util.go

@@ -0,0 +1 @@
+* text=auto eol=lf