Merge pull request #72 from ochanoco/hotfix/many-bugs

Hotfix/many bugs
ochanoco · Jul 3, 2024 · 5f245b2 · 5f245b2
2 parents 8e4e941 + 440add5
commit 5f245b2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/core/params.go b/core/params.go
@@ -8,7 +8,6 @@ var DB_CONFIG = utils.ReadEnv("TORIMA_DB_CONFIG", "file:./data/db.sqlite3?_fk=1"
 var SECRET = utils.ReadEnv("TORIMA_SECRET", utils.RandomString(32))
 
 var CONFIG_FILE = "./config.yaml"
-var STATIC_FOLDER = "./static"
 
 var CLIENT_ID = utils.ReadEnvOrPanic("TORIMA_CLIENT_ID")
 var CLIENT_SECRET = utils.ReadEnvOrPanic("TORIMA_CLIENT_SECRET")
diff --git a/extension/directors/auth.go b/extension/directors/auth.go
@@ -33,7 +33,7 @@ func AuthDirector(c *core.TorimaDirectorPackageContext) (core.TorimaPackageStatu
 			return core.NoAuthNeeded, nil
 		}
 
-		err = utils.MakeError(err, "failed to authenticate: ")
+		err = utils.MakeError(err, utils.UnauthorizedErrorTag)
 		return core.ForceStop, err
 	}
 

diff --git a/extension/modify_resp.go b/extension/modify_resp.go
@@ -7,6 +7,7 @@ import (
 	"log"
 	"net/http"
 	"strconv"
+	"strings"
 
 	"github.com/PuerkitoBio/goquery"
 	"github.com/ochanoco/torima/core"
@@ -44,7 +45,7 @@ func InjectHTML(html string, c *core.TorimaModifyResponsePackageContext) (core.T
 func InjectServiceWorkerModifyResponse(c *core.TorimaModifyResponsePackageContext) (core.TorimaPackageStatus, error) {
 	contentType := c.Target.Header.Get("Content-Type")
 
-	if contentType != "text/html; charset=utf-8" {
+	if !strings.HasPrefix(contentType, "text/html") {
 		return core.Keep, nil
 	}
 

diff --git a/extension/web.go b/extension/web.go
@@ -2,12 +2,14 @@ package extension
 
 import (
 	"fmt"
+	"net/http"
 
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
 	"github.com/ochanoco/ninsho"
 	gin_ninsho "github.com/ochanoco/ninsho/extension/gin"
 	"github.com/ochanoco/torima/core"
+	"github.com/ochanoco/torima/static"
 )
 
 func StaticWeb(proxy *core.TorimaProxy, r *gin.RouterGroup) {
@@ -17,7 +19,7 @@ func StaticWeb(proxy *core.TorimaProxy, r *gin.RouterGroup) {
 		}
 	}())
 
-	r.Static("/static", core.STATIC_FOLDER)
+	r.StaticFS("/static", http.FS(static.Static))
 }
 
 func ConfigWeb(proxy *core.TorimaProxy, r *gin.RouterGroup) {

diff --git a/static/static.go b/static/static.go
@@ -0,0 +1,6 @@
+package static
+
+import "embed"
+
+//go:embed sw/*.js wrapper/*.js
+var Static embed.FS
diff --git a/utils/errors.go b/utils/errors.go
@@ -16,10 +16,6 @@ var errorStatusMap = map[string]int{
 }
 
 func MakeError(e error, tag string) error {
-	if e == nil {
-		return nil
-	}
-
 	return fmt.Errorf("%s: %v", tag, e)
 }