v2 optimise performance + security

.dockerignore

@@ -7,6 +7,12 @@ ROADMAP.md
 build
 .env
 data.db
-app/node_modules
-app/build
+web/app/node_modules
+web/app/build
+web/app/.vite
+web/dashboard/node_modules
+web/dashboard/build
+web/dashboard/.vite
 certs/
+*.log
+.DS_Store

.gitignore

@@ -1,10 +1,10 @@
 server/server
 server/.env
 data
-app/node_modules
-app/build
-dashboard/node_modules
-dashboard/build
+web/app/node_modules
+web/app/build
+web/dashboard/node_modules
+web/dashboard/build
 build
 .env
 data.db
@@ -20,3 +20,4 @@ certs/
 *-wal
 .idea
 *.iml
+node_modules/*

Dockerfile

@@ -1,35 +1,54 @@
-FROM golang:1.21.3-alpine3.18 as go-builder
+FROM golang:1.25.5-alpine3.23 as go-builder
 WORKDIR /authorizer
-COPY server server
-COPY Makefile .
+
+# Copy go mod files for dependency resolution
+COPY go.mod go.sum ./
+
+# Download dependencies
+RUN go mod download
+
+# Copy source code
+COPY main.go ./
+COPY cmd/ ./cmd/
+COPY internal/ ./internal/
+COPY gqlgen.yml ./
 
 ARG VERSION="latest"
 ENV VERSION="$VERSION"
 
 RUN echo "$VERSION"
-RUN apk add build-base &&\
-    make clean && make && \
+# Build the server binary
+RUN apk add build-base && \
+    go build -ldflags "-w -X main.VERSION=$(VERSION)" -o build/server . && \
     chmod 777 build/server
 
-FROM node:20-alpine3.18 as node-builder
+FROM node:25-alpine3.22 as node-builder
 WORKDIR /authorizer
-COPY app app
-COPY dashboard dashboard
-COPY Makefile .
-RUN apk add build-base &&\
-    make build-app && \
-    make build-dashboard
+# Copy package files first for better layer caching
+COPY web/app/package*.json web/app/
+COPY web/dashboard/package*.json web/dashboard/
+# Install dependencies
+RUN cd web/app && npm ci && \
+    cd ../dashboard && npm ci
+# Copy source files
+COPY web/app web/app
+COPY web/dashboard web/dashboard
+# Build applications
+RUN cd web/app && npm run build && \
+    cd ../dashboard && npm run build
 
-FROM alpine:3.18
+FROM alpine:3.23
 RUN adduser -D -h /authorizer -u 1000 -k /dev/null authorizer
 WORKDIR /authorizer
-RUN mkdir app dashboard
-COPY --from=node-builder --chown=nobody:nobody /authorizer/app/build app/build
-COPY --from=node-builder --chown=nobody:nobody /authorizer/app/favicon_io app/favicon_io
-COPY --from=node-builder --chown=nobody:nobody /authorizer/dashboard/build dashboard/build
-COPY --from=node-builder --chown=nobody:nobody /authorizer/dashboard/favicon_io dashboard/favicon_io
+RUN mkdir -p web/app web/dashboard
+COPY --from=node-builder --chown=nobody:nobody /authorizer/web/app/build web/app/build
+COPY --from=node-builder --chown=nobody:nobody /authorizer/web/app/favicon_io web/app/favicon_io
+COPY --from=node-builder --chown=nobody:nobody /authorizer/web/dashboard/build web/dashboard/build
+COPY --from=node-builder --chown=nobody:nobody /authorizer/web/dashboard/favicon_io web/dashboard/favicon_io
 COPY --from=go-builder --chown=nobody:nobody /authorizer/build build
-COPY templates templates
-EXPOSE 8080
+COPY web/templates web/templates
+EXPOSE 8080 8081
 USER authorizer
-CMD [ "./build/server" ]
+# Use ENTRYPOINT to allow passing CLI arguments
+ENTRYPOINT [ "./build/server" ]
+CMD []

Makefile

@@ -10,13 +10,41 @@ build:
 		-output="../build/{{.OS}}/{{.Arch}}/server" \
 		./...
 build-app:
-	cd app && npm i && npm run build
+	cd web/app && npm ci && npm run build
 build-dashboard:
-	cd dashboard && npm i && npm run build
+	cd web/dashboard && npm ci && npm run build
 clean:
 	rm -rf build
+dev:
+	go run main.go --database-type=sqlite --database-url=test.db --jwt-type=HS256 --jwt-secret=test --admin-secret=admin --client-id=123456 --client-secret=secret
+# test:
+# 	rm -rf server/test/test.db server/test/test.db-shm server/test/test.db-wal && rm -rf test.db test.db-shm test.db-wal && cd server && go clean --testcache && TEST_DBS="sqlite" go test -p 1 -v ./test
 test:
-	rm -rf server/test/test.db server/test/test.db-shm server/test/test.db-wal && rm -rf test.db test.db-shm test.db-wal && cd server && go clean --testcache && TEST_DBS="sqlite" go test -p 1 -v ./test
+	docker rm -vf authorizer_postgres
+	docker rm -vf authorizer_scylla_db
+	docker rm -vf authorizer_mongodb_db
+	docker rm -vf authorizer_arangodb
+	docker rm -vf authorizer_dynamodb
+	docker rm -vf authorizer_couchbase
+	docker rm -vf authorizer_redis
+	docker run -d --name authorizer_redis -p 6380:6379 redis
+	docker run --name authorizer_postgres -p 5432:5432 -e POSTGRES_PASSWORD=postgres -e POSTGRES_DB=postgres -d postgres
+	docker run -d --name authorizer_scylla_db -p 9042:9042 scylladb/scylla
+	docker run -d --name authorizer_mongodb_db -p 27017:27017 mongo:4.4.15
+	docker run -d --name authorizer_arangodb -p 8529:8529 -e ARANGO_NO_AUTH=1 arangodb/arangodb:3.10.3
+	docker run -d --name authorizer_dynamodb  -p 8000:8000 amazon/dynamodb-local:latest
+	docker run -d --name authorizer_couchbase  -p 8091-8097:8091-8097 -p 11210:11210 -p 11207:11207 -p 18091-18095:18091-18095 -p 18096:18096 -p 18097:18097 couchbase:latest
+	sh scripts/couchbase-test.sh
+
+	go test -v ./...
+
+	docker rm -vf authorizer_postgres
+	docker rm -vf authorizer_scylla_db
+	docker rm -vf authorizer_mongodb_db
+	docker rm -vf authorizer_arangodb
+	docker rm -vf authorizer_dynamodb
+	docker rm -vf authorizer_couchbase
+	docker rm -vf authorizer_redis
 test-mongodb:
 	docker run -d --name authorizer_mongodb_db -p 27017:27017 mongo:4.4.15
 	cd server && go clean --testcache && TEST_DBS="mongodb" go test -p 1 -v ./test
@@ -53,7 +81,7 @@ test-all-db:
 	docker rm -vf dynamodb-local-test
 	docker rm -vf couchbase-local-test
 generate-graphql:
-	cd server && go run github.com/99designs/gqlgen generate && go mod tidy
+	go run github.com/99designs/gqlgen --verbose generate && go mod tidy
 generate-db-template:
 	cp -rf server/db/providers/provider_template server/db/providers/${dbname}
 	find server/db/providers/${dbname} -type f -exec sed -i -e 's/provider_template/${dbname}/g' {} \;