diff --git a/Justfile b/Justfile index 432fbd1..0d99e3a 100644 --- a/Justfile +++ b/Justfile @@ -11,7 +11,7 @@ start-release: build-container-release remove-podman-containers # Removes and stops any containers related to the project [private] remove-podman-containers: - podman container rm -fi ttime + podman container rm -f ttime # Saves the release container to a tarball, pigz is just gzip but multithreaded save-release: build-container-release @@ -23,14 +23,14 @@ load-release file: # Tests every part of the project testall: - cd frontend && npm test - cd frontend && npm run lint cd backend && make test cd backend && make lint + cd frontend && npm test + cd frontend && npm run lint # Cleans up everything related to the project clean: remove-podman-containers - podman image rm -fi ttime-server + podman image rm -f ttime-server rm -rf frontend/dist rm -rf frontend/node_modules rm -f ttime-server.tar.gz @@ -41,6 +41,3 @@ clean: remove-podman-containers [confirm] podman-clean: podman system reset --force - -install-linter: - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.56.2 diff --git a/backend/Makefile b/backend/Makefile index dcc79b4..23eefa0 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -69,7 +69,3 @@ lint: # Default target default: build - -install-just: - @echo "Installing just" - @curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to /usr/local/bin diff --git a/backend/go.mod b/backend/go.mod index 94d5519..ab9be66 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -10,8 +10,8 @@ require ( require ( github.com/MicahParks/keyfunc/v2 v2.1.0 // indirect - github.com/gofiber/contrib/jwt v1.0.8 - github.com/golang-jwt/jwt/v5 v5.2.1 + github.com/gofiber/contrib/jwt v1.0.8 // indirect + github.com/golang-jwt/jwt/v5 v5.2.1 // indirect ) // These are all for fiber diff --git a/backend/internal/handlers/global_state.go b/backend/internal/handlers/global_state.go index ffe2072..5dc8895 100644 --- a/backend/internal/handlers/global_state.go +++ b/backend/internal/handlers/global_state.go @@ -115,7 +115,6 @@ func (gs *GState) Login(c *fiber.Ctx) error { // LoginRenew is a simple handler that renews the token func (gs *GState) LoginRenew(c *fiber.Ctx) error { - // For testing: curl localhost:3000/restricted -H "Authorization: Bearer " user := c.Locals("user").(*jwt.Token) claims := user.Claims.(jwt.MapClaims) claims["exp"] = time.Now().Add(time.Hour * 72).Unix()