diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj index 4041340df..cc20cc7e5 100644 --- a/backend/src/app/main.clj +++ b/backend/src/app/main.clj @@ -91,9 +91,6 @@ :app.http/session {:store (ig/ref :app.http.session/store)} - :app.http.doc/routes - {:methods (ig/ref :app.rpc/methods)} - :app.http.session/store {:pool (ig/ref :app.db/pool) :tokens (ig/ref :app.tokens/tokens) @@ -201,7 +198,7 @@ :tokens (ig/ref :app.tokens/tokens) :audit-handler (ig/ref :app.loggers.audit/http-handler) :rpc-routes (ig/ref :app.rpc/routes) - :doc-routes (ig/ref :app.http.doc/routes) + :doc-routes (ig/ref :app.rpc.doc/routes) :executor (ig/ref [::default :app.worker/executor])} :app.http.debug/routes @@ -240,6 +237,9 @@ :http-client (ig/ref :app.http/client) :executors (ig/ref :app.worker/executors)} + :app.rpc.doc/routes + {:methods (ig/ref :app.rpc/methods)} + :app.rpc/routes {:methods (ig/ref :app.rpc/methods)} diff --git a/backend/src/app/rpc/commands/auth.clj b/backend/src/app/rpc/commands/auth.clj index 74c56cc80..8192e9f61 100644 --- a/backend/src/app/rpc/commands/auth.clj +++ b/backend/src/app/rpc/commands/auth.clj @@ -12,8 +12,8 @@ [app.config :as cf] [app.db :as db] [app.emails :as eml] - [app.http.doc :as-alias doc] [app.loggers.audit :as audit] + [app.rpc.doc :as-alias doc] [app.rpc.mutations.teams :as teams] [app.rpc.queries.profile :as profile] [app.rpc.rlimit :as rlimit] diff --git a/backend/src/app/rpc/commands/binfile.clj b/backend/src/app/rpc/commands/binfile.clj index d888980d9..36c51b0e6 100644 --- a/backend/src/app/rpc/commands/binfile.clj +++ b/backend/src/app/rpc/commands/binfile.clj @@ -15,8 +15,8 @@ [app.common.uuid :as uuid] [app.config :as cf] [app.db :as db] - [app.http.doc :as doc] [app.media :as media] + [app.rpc.doc :as-alias doc] [app.rpc.queries.files :as files] [app.rpc.queries.projects :as projects] [app.storage :as sto] diff --git a/backend/src/app/rpc/commands/comments.clj b/backend/src/app/rpc/commands/comments.clj index b91d98810..0a3ef1941 100644 --- a/backend/src/app/rpc/commands/comments.clj +++ b/backend/src/app/rpc/commands/comments.clj @@ -7,9 +7,8 @@ (ns app.rpc.commands.comments (:require [app.common.spec :as us] - [app.common.pages.changes :as changes] [app.db :as db] - [app.http.doc :as doc] + [app.rpc.doc :as-alias doc] [app.rpc.queries.files :as files] [app.rpc.queries.teams :as teams] [app.util.services :as sv] diff --git a/backend/src/app/rpc/commands/demo.clj b/backend/src/app/rpc/commands/demo.clj index b24b00430..5ba10ec40 100644 --- a/backend/src/app/rpc/commands/demo.clj +++ b/backend/src/app/rpc/commands/demo.clj @@ -11,9 +11,9 @@ [app.common.uuid :as uuid] [app.config :as cf] [app.db :as db] - [app.http.doc :as doc] [app.loggers.audit :as audit] [app.rpc.commands.auth :as cmd.auth] + [app.rpc.doc :as-alias doc] [app.util.services :as sv] [app.util.time :as dt] [buddy.core.codecs :as bc] diff --git a/backend/src/app/rpc/commands/ldap.clj b/backend/src/app/rpc/commands/ldap.clj index e1fe396e1..5c581db7b 100644 --- a/backend/src/app/rpc/commands/ldap.clj +++ b/backend/src/app/rpc/commands/ldap.clj @@ -10,9 +10,9 @@ [app.common.exceptions :as ex] [app.common.spec :as us] [app.db :as db] - [app.http.doc :as doc] [app.loggers.audit :as-alias audit] [app.rpc.commands.auth :as cmd.auth] + [app.rpc.doc :as-alias doc] [app.rpc.queries.profile :as profile] [app.util.services :as sv] [clojure.spec.alpha :as s])) diff --git a/backend/src/app/http/doc.clj b/backend/src/app/rpc/doc.clj similarity index 99% rename from backend/src/app/http/doc.clj rename to backend/src/app/rpc/doc.clj index 07cd5b82e..6afec5643 100644 --- a/backend/src/app/http/doc.clj +++ b/backend/src/app/rpc/doc.clj @@ -4,7 +4,7 @@ ;; ;; Copyright (c) UXBOX Labs SL -(ns app.http.doc +(ns app.rpc.doc "API autogenerated documentation." (:require [app.common.data :as d] diff --git a/backend/src/app/rpc/mutations/comments.clj b/backend/src/app/rpc/mutations/comments.clj index 84c1a6f64..e8a60c8b7 100644 --- a/backend/src/app/rpc/mutations/comments.clj +++ b/backend/src/app/rpc/mutations/comments.clj @@ -10,7 +10,7 @@ [app.common.geom.point :as gpt] [app.common.spec :as us] [app.db :as db] - [app.http.doc :as doc] + [app.rpc.doc :as-alias doc] [app.rpc.queries.comments :as comments] [app.rpc.queries.files :as files] [app.rpc.retry :as retry] diff --git a/backend/src/app/rpc/mutations/fonts.clj b/backend/src/app/rpc/mutations/fonts.clj index a405c279c..b24544a88 100644 --- a/backend/src/app/rpc/mutations/fonts.clj +++ b/backend/src/app/rpc/mutations/fonts.clj @@ -13,6 +13,7 @@ [app.config :as cf] [app.db :as db] [app.media :as media] + [app.rpc.doc :as-alias doc] [app.rpc.queries.teams :as teams] [app.rpc.rlimit :as rlimit] [app.storage :as sto] @@ -151,6 +152,7 @@ (s/keys :req-un [::profile-id ::team-id ::id])) (sv/defmethod ::delete-font-variant + {::doc/added "1.3"} [{:keys [pool] :as cfg} {:keys [id team-id profile-id] :as params}] (db/with-atomic [conn pool] (teams/check-edition-permissions! conn profile-id team-id) diff --git a/backend/src/app/rpc/queries/comments.clj b/backend/src/app/rpc/queries/comments.clj index 29d5a2c90..aa57d9e8d 100644 --- a/backend/src/app/rpc/queries/comments.clj +++ b/backend/src/app/rpc/queries/comments.clj @@ -8,8 +8,8 @@ (:require [app.common.spec :as us] [app.db :as db] - [app.http.doc :as doc] [app.rpc.commands.comments :as cmd.comments] + [app.rpc.doc :as-alias doc] [app.rpc.queries.files :as files] [app.rpc.queries.teams :as teams] [app.util.services :as sv]