@hvedinich/utils 0.0.72 → 0.0.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hvedinich/utils",
-  "version": "0.0.72",
+  "version": "0.0.74",
   "description": "utils module",
   "main": "index.js",
   "scripts": {

package/src/server/index.js

@@ -51,19 +51,29 @@ const defaultContext = async ({ req }) => {
 class Server {
   constructor({ config, healthCheck, context, originDomains }) {
     this.config = config;
-    this.originDomains = originDomains;
     this.app = express();
+    this.activateApolloCors = !originDomains?.length;
     this.router = null;
     this.app.get('/_status', healthCheck || defaultCHealthCheck);
-    if (this.originDomains?.length) {
+    if (originDomains?.length) {
       this.app.use((req, res, next) => {
-        const authHeader = req.headers['access-control-request-headers'];
-        const wantsCredentials = authHeader ? authHeader.includes('x-with-credentials') : false;
-        const corsOptions = {
-          origin: wantsCredentials ? this.originDomains : '*',
-          credentials: wantsCredentials,
+        let corsOptions = {
+          origin: true,
+          credentials: true,
         };
 
+        if (req.url === '/graphql') {
+          const authHeader = req.headers['access-control-request-headers'];
+          const wantsCredentials = authHeader
+            ? authHeader.includes('x-with-credentials') || authHeader.includes('authorization')
+            : false;
+
+          corsOptions = {
+            origin: wantsCredentials ? originDomains : '*',
+            credentials: wantsCredentials,
+          };
+        }
+
         cors(corsOptions)(req, res, next);
       });
     }
@@ -116,7 +126,7 @@ class Server {
     const server = new ApolloServer(serverOptions);
 
     const bodyParserConfig = this.jsonLimit ? { limit: this.jsonLimit } : true;
-    server.applyMiddleware({ app: this.app, path: '/graphql', bodyParserConfig, cors: !this.originDomains?.length });
+    server.applyMiddleware({ app: this.app, path: '/graphql', bodyParserConfig, cors: this.activateApolloCors });
 
     if (this.config.playground) {
       this.app.get('/playground', expressPlayground({ endpoint: '/graphql', subscriptionEndpoint: '/subscriptions' }));