ericzorn93 · ericzorn93 · Jan 6, 2025 · Jan 5, 2025 · Jan 6, 2025 · Jan 6, 2025
diff --git a/apps/services/accounts-api/cmd/server/main.go b/apps/services/accounts-api/cmd/server/main.go
@@ -19,8 +19,8 @@ import (
 
 	connectrpcadapter "apps/services/accounts-api/internal/adapters/connectrpc"
 	"apps/services/accounts-api/internal/adapters/database/repositories"
-	"libs/backend/auth"
 	"libs/backend/boot"
+	"libs/backend/httpauth"
 	"libs/backend/proto-gen/go/accounts/accountsapi/v1/accountsapiv1connect"
 )
 
@@ -49,7 +49,7 @@ func run() error {
 	}
 
 	// Custom interceptors
-	authInterceptor := auth.NewAuthInterceptor(logger)
+	authInterceptor := httpauth.NewAuthInterceptor(logger)
 
 	options := []connect.HandlerOption{
 		connect.WithInterceptors(

diff --git a/apps/services/accounts-graphql/cmd/server/main.go b/apps/services/accounts-graphql/cmd/server/main.go
@@ -6,8 +6,9 @@ import (
 	"apps/services/accounts-graphql/internal/graph/resolvers"
 	"context"
 	"errors"
-	"libs/backend/auth"
+	"libs/backend/boot"
 	"libs/backend/cache"
+	auth "libs/backend/httpauth"
 	"log"
 	"log/slog"
 	"os"
@@ -21,8 +22,6 @@ import (
 	"github.com/vektah/gqlparser/v2/ast"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
-
-	"libs/backend/boot"
 )
 
 // serviceName is the name of the microservice

diff --git a/apps/services/accounts-graphql/internal/graph/resolvers/accounts.resolvers.go b/apps/services/accounts-graphql/internal/graph/resolvers/accounts.resolvers.go
diff --git a/apps/services/accounts-graphql/internal/graph/resolvers/schema.resolvers.go b/apps/services/accounts-graphql/internal/graph/resolvers/schema.resolvers.go
diff --git a/apps/services/apollo-router/.env.example b/apps/services/apollo-router/.env.example
@@ -0,0 +1,2 @@
+APOLLO_KEY=""
+APOLLO_REF=""
diff --git a/apps/services/apollo-router/supergraph-prod.yaml b/apps/services/apollo-router/supergraph-prod.yaml
@@ -5,3 +5,9 @@ subgraphs:
     routing_url: http://accounts-graphql-prod.internal:8080/graphql  # <- can be omitted if the same as introspection URL
     schema:
       subgraph_url: http://localhost:3003/graphql
+include_subgraph_errors:
+  all: true
+telemetry:
+  instrumentation:
+    spans:
+      mode: spec_compliant
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -102,6 +102,8 @@ services:
     container_name: apollo-router
     ports:
       - '4000:4000'
+    env_file:
+      - ./apps/services/apollo-router/.env.local
     volumes:
       - ./graphql/supergraph-dev.yaml:/supergraph.yaml
       - ./graphql/supergraph-dev.graphql:/supergraph.graphql

diff --git a/go.work b/go.work
@@ -5,7 +5,7 @@ use (
 	./apps/services/accounts-graphql
 	./apps/services/accounts-worker
 	./apps/services/inbound-webhooks-api
-	./libs/backend/auth
+	./libs/backend/httpauth
 	./libs/backend/boot
 	./libs/backend/cache
 	./libs/backend/domain/user

diff --git a/graphql/supergraph-dev.yaml b/graphql/supergraph-dev.yaml
@@ -5,3 +5,9 @@ subgraphs:
     routing_url: http://accounts-graphql:3000/graphql  # <- can be omitted if the same as introspection URL
     schema:
       subgraph_url: http://localhost:3003/graphql
+include_subgraph_errors:
+  all: true
+telemetry:
+  instrumentation:
+    spans:
+      mode: spec_compliant
diff --git a/libs/backend/auth/go.mod b/libs/backend/auth/go.mod
diff --git a/libs/backend/auth/auth.go → libs/backend/httpauth/auth.go b/libs/backend/auth/auth.go → libs/backend/httpauth/auth.go
@@ -1,4 +1,4 @@
-package auth
+package httpauth
 
 import "context"
 

diff --git a/libs/backend/auth/constants.go → libs/backend/httpauth/constants.go b/libs/backend/auth/constants.go → libs/backend/httpauth/constants.go
@@ -1,4 +1,4 @@
-package auth
+package httpauth
 
 const (
 	// Used for headers to be sent and recieved via HTTP and ConnectRPC

diff --git a/libs/backend/auth/context.go → libs/backend/httpauth/context.go b/libs/backend/auth/context.go → libs/backend/httpauth/context.go
@@ -1,4 +1,4 @@
-package auth
+package httpauth
 
 import (
 	"context"

diff --git a/libs/backend/auth/errors.go → libs/backend/httpauth/errors.go b/libs/backend/auth/errors.go → libs/backend/httpauth/errors.go
@@ -1,4 +1,4 @@
-package auth
+package httpauth
 
 import "errors"
 

diff --git a/libs/backend/httpauth/go.mod b/libs/backend/httpauth/go.mod
@@ -0,0 +1,15 @@
+module libs/backend/httpauth
+
+go 1.23
+
+require (
+	connectrpc.com/connect v1.17.0
+	github.com/auth0/go-jwt-middleware/v2 v2.2.2
+)
+
+require (
+	golang.org/x/crypto v0.17.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
+	gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
+)
diff --git a/libs/backend/auth/go.sum → libs/backend/httpauth/go.sum b/libs/backend/auth/go.sum → libs/backend/httpauth/go.sum
@@ -1,3 +1,5 @@
+connectrpc.com/connect v1.17.0 h1:W0ZqMhtVzn9Zhn2yATuUokDLO5N+gIuBWMOnsQrfmZk=
+connectrpc.com/connect v1.17.0/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8=
 github.com/auth0/go-jwt-middleware/v2 v2.2.2 h1:vrvkFZf72r3Qbt45KLjBG3/6Xq2r3NTixWKu2e8de9I=
 github.com/auth0/go-jwt-middleware/v2 v2.2.2/go.mod h1:4vwxpVtu/Kl4c4HskT+gFLjq0dra8F1joxzamrje6J0=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -10,8 +12,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
 golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/go-jose/go-jose.v2 v2.6.3 h1:nt80fvSDlhKWQgSWyHyy5CfmlQr+asih51R8PTWNKKs=
 gopkg.in/go-jose/go-jose.v2 v2.6.3/go.mod h1:zzZDPkNNw/c9IE7Z9jr11mBZQhKQTMzoEEIoEdZlFBI=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

diff --git a/libs/backend/auth/interceptors.go → libs/backend/httpauth/interceptors.go b/libs/backend/auth/interceptors.go → libs/backend/httpauth/interceptors.go
@@ -1,4 +1,4 @@
-package auth
+package httpauth
 
 import (
 	"context"

diff --git a/libs/backend/auth/jwt.go → libs/backend/httpauth/jwt.go b/libs/backend/auth/jwt.go → libs/backend/httpauth/jwt.go
@@ -1,4 +1,4 @@
-package auth
+package httpauth
 
 import (
 	"context"

diff --git a/libs/backend/auth/middleware.go → libs/backend/httpauth/middleware.go b/libs/backend/auth/middleware.go → libs/backend/httpauth/middleware.go
@@ -1,4 +1,4 @@
-package auth
+package httpauth
 
 import (
 	"context"

diff --git a/libs/backend/auth/project.json → libs/backend/httpauth/project.json b/libs/backend/auth/project.json → libs/backend/httpauth/project.json
@@ -1,8 +1,8 @@
 {
-  "name": "auth",
+  "name": "httpauth",
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "library",
-  "sourceRoot": "libs/backend/auth",
+  "sourceRoot": "libs/backend/httpauth",
   "tags": ["services", "api", "authentication"],
   "targets": {
     "test": {

diff --git a/tools/backend-service/src/generators/service-gen/graphql-files/cmd/server/main.go.template b/tools/backend-service/src/generators/service-gen/graphql-files/cmd/server/main.go.template
@@ -22,6 +22,7 @@ import (
 
 	"libs/backend/boot"
 	"libs/backend/cache"
+	"libs/backend/httpauth"
 )
 
 // serviceName is the name of the microservice
@@ -108,7 +109,7 @@ func run() error {
 					})
 
 					params.Mux.Handle("/", playground.Handler("GraphQL playground", "/graphql"))
-					params.Mux.Handle("/graphql", srv)
+					params.Mux.Handle("/graphql", httpauth.AuthMiddleware(srv))
 
 					return nil
 				},