mirror of
				https://github.com/steveiliop56/tinyauth.git
				synced 2025-11-04 08:05:42 +00:00 
			
		
		
		
	Compare commits
	
		
			2 Commits
		
	
	
		
			v4.0.0-rc.
			...
			76f2014444
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					76f2014444 | ||
| 
						 | 
					5b7bda3378 | 
							
								
								
									
										2
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							@@ -23,7 +23,7 @@ jobs:
 | 
			
		||||
      - name: Install frontend dependencies
 | 
			
		||||
        run: |
 | 
			
		||||
          cd frontend
 | 
			
		||||
          bun install
 | 
			
		||||
          bun install --frozen-lockfile
 | 
			
		||||
 | 
			
		||||
      - name: Set version
 | 
			
		||||
        run: |
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								.github/workflows/nightly.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/nightly.yml
									
									
									
									
										vendored
									
									
								
							@@ -66,7 +66,7 @@ jobs:
 | 
			
		||||
      - name: Install frontend dependencies
 | 
			
		||||
        run: |
 | 
			
		||||
          cd frontend
 | 
			
		||||
          bun install
 | 
			
		||||
          bun install --frozen-lockfile
 | 
			
		||||
 | 
			
		||||
      - name: Install backend dependencies
 | 
			
		||||
        run: |
 | 
			
		||||
@@ -112,7 +112,7 @@ jobs:
 | 
			
		||||
      - name: Install frontend dependencies
 | 
			
		||||
        run: |
 | 
			
		||||
          cd frontend
 | 
			
		||||
          bun install
 | 
			
		||||
          bun install --frozen-lockfile
 | 
			
		||||
 | 
			
		||||
      - name: Install backend dependencies
 | 
			
		||||
        run: |
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							@@ -44,7 +44,7 @@ jobs:
 | 
			
		||||
      - name: Install frontend dependencies
 | 
			
		||||
        run: |
 | 
			
		||||
          cd frontend
 | 
			
		||||
          bun install
 | 
			
		||||
          bun install --frozen-lockfile
 | 
			
		||||
 | 
			
		||||
      - name: Install backend dependencies
 | 
			
		||||
        run: |
 | 
			
		||||
@@ -87,7 +87,7 @@ jobs:
 | 
			
		||||
      - name: Install frontend dependencies
 | 
			
		||||
        run: |
 | 
			
		||||
          cd frontend
 | 
			
		||||
          bun install
 | 
			
		||||
          bun install --frozen-lockfile
 | 
			
		||||
 | 
			
		||||
      - name: Install backend dependencies
 | 
			
		||||
        run: |
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@ WORKDIR /frontend
 | 
			
		||||
COPY ./frontend/package.json ./
 | 
			
		||||
COPY ./frontend/bun.lock ./
 | 
			
		||||
 | 
			
		||||
RUN bun install
 | 
			
		||||
RUN bun install --frozen-lockfile
 | 
			
		||||
 | 
			
		||||
COPY ./frontend/public ./public
 | 
			
		||||
COPY ./frontend/src ./src
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@ WORKDIR /frontend
 | 
			
		||||
COPY ./frontend/package.json ./
 | 
			
		||||
COPY ./frontend/bun.lock ./
 | 
			
		||||
 | 
			
		||||
RUN bun install
 | 
			
		||||
RUN bun install --frozen-lockfile
 | 
			
		||||
 | 
			
		||||
COPY ./frontend/public ./public
 | 
			
		||||
COPY ./frontend/src ./src
 | 
			
		||||
 
 | 
			
		||||
@@ -1,10 +1,12 @@
 | 
			
		||||
package middleware
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"io/fs"
 | 
			
		||||
	"net/http"
 | 
			
		||||
	"os"
 | 
			
		||||
	"strings"
 | 
			
		||||
	"time"
 | 
			
		||||
	"tinyauth/internal/assets"
 | 
			
		||||
 | 
			
		||||
	"github.com/gin-gonic/gin"
 | 
			
		||||
@@ -27,14 +29,16 @@ func (m *UIMiddleware) Init() error {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	m.uiFs = ui
 | 
			
		||||
	m.uiFileServer = http.FileServer(http.FS(ui))
 | 
			
		||||
	m.uiFileServer = http.FileServerFS(ui)
 | 
			
		||||
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (m *UIMiddleware) Middleware() gin.HandlerFunc {
 | 
			
		||||
	return func(c *gin.Context) {
 | 
			
		||||
		switch strings.Split(c.Request.URL.Path, "/")[1] {
 | 
			
		||||
		path := strings.TrimPrefix(c.Request.URL.Path, "/")
 | 
			
		||||
 | 
			
		||||
		switch strings.SplitN(path, "/", 2)[0] {
 | 
			
		||||
		case "api":
 | 
			
		||||
			c.Next()
 | 
			
		||||
			return
 | 
			
		||||
@@ -42,12 +46,19 @@ func (m *UIMiddleware) Middleware() gin.HandlerFunc {
 | 
			
		||||
			c.Next()
 | 
			
		||||
			return
 | 
			
		||||
		default:
 | 
			
		||||
			_, err := fs.Stat(m.uiFs, strings.TrimPrefix(c.Request.URL.Path, "/"))
 | 
			
		||||
			_, err := fs.Stat(m.uiFs, path)
 | 
			
		||||
 | 
			
		||||
			// Enough for one authentication flow
 | 
			
		||||
			maxAge := 15 * time.Minute
 | 
			
		||||
 | 
			
		||||
			if os.IsNotExist(err) {
 | 
			
		||||
				c.Request.URL.Path = "/"
 | 
			
		||||
			} else if strings.HasPrefix(path, "assets/") {
 | 
			
		||||
				// assets are named with a hash and can be cached for a long time
 | 
			
		||||
				maxAge = 30 * 24 * time.Hour
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			c.Writer.Header().Set("Cache-Control", fmt.Sprintf("public, max-age=%d", int(maxAge.Seconds())))
 | 
			
		||||
			m.uiFileServer.ServeHTTP(c.Writer, c.Request)
 | 
			
		||||
			c.Abort()
 | 
			
		||||
			return
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user