fix: move graphql under /graphql only

trustification · Jun 18, 2024 · f07f5fa · f07f5fa
1 parent ebc55bd
commit f07f5fa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/modules/graphql/src/endpoints.rs b/modules/graphql/src/endpoints.rs
@@ -21,16 +21,12 @@ pub fn configure(svc: &mut web::ServiceConfig, db: Database, graph: Arc<Graph>)
         .finish();
 
     svc.service(
-        web::resource("/graphql")
+        web::resource("/")
             .guard(guard::Post())
             .to(GraphQL::new(schema.clone())),
     );
 }
 
 pub fn configure_graphiql(svc: &mut web::ServiceConfig) {
-    svc.service(
-        web::resource("/graphql")
-            .guard(guard::Get())
-            .to(index_graphiql),
-    );
+    svc.service(web::resource("/").guard(guard::Get()).to(index_graphiql));
 }
diff --git a/server/src/lib.rs b/server/src/lib.rs
@@ -267,20 +267,18 @@ impl InitData {
                             openapi::openapi(),
                             swagger_oidc.clone(),
                         ));
-                    svc.service(web::scope("/").wrap(new_auth(self.authenticator.clone())))
-                        .configure(|svc| {
-                            trustify_module_graphql::endpoints::configure(
-                                svc,
-                                db.clone(),
-                                graph.clone(),
-                            );
-                        });
                     svc.service(
-                        web::scope("/").wrap(new_auth(self.authenticator.clone())), // .wrap(Cors::permissive()),
-                    )
-                    .configure(|svc| {
-                        trustify_module_graphql::endpoints::configure_graphiql(svc);
-                    });
+                        web::scope("/graphql")
+                            .wrap(new_auth(self.authenticator.clone()))
+                            .configure(|svc| {
+                                trustify_module_graphql::endpoints::configure(
+                                    svc,
+                                    db.clone(),
+                                    graph.clone(),
+                                );
+                                trustify_module_graphql::endpoints::configure_graphiql(svc);
+                            }),
+                    );
                     svc.app_data(web::Data::from(self.graph.clone()))
                         .service(
                             web::scope("/api")