Operation -> Operation URI

juxt-site · Oct 17, 2023 · b5b846c · b5b846c
1 parent 1cdd65b
commit b5b846c
Show file tree

Hide file tree

Showing 135 changed files with 182 additions and 182 deletions.
diff --git a/installer-graph/src/juxt/site/install/common_install_util.clj b/installer-graph/src/juxt/site/install/common_install_util.clj
@@ -252,9 +252,9 @@
    :juxt.site/events-base-uri (str (get uri-map "https://auth.example.org") "/_site/events/")
    :juxt.site/methods
    {:get
-    {:juxt.site/operation (str (get-in uri-map ["https://auth.example.org"]) "/_site/operations/get-bundle-by-id")}
+    {:juxt.site/operation-uri (str (get-in uri-map ["https://auth.example.org"]) "/_site/operations/get-bundle-by-id")}
     :delete
-    {:juxt.site/operation (str (get-in uri-map ["https://auth.example.org"]) "/_site/operations/delete-bundle-by-id")}}})
+    {:juxt.site/operation-uri (str (get-in uri-map ["https://auth.example.org"]) "/_site/operations/delete-bundle-by-id")}}})
 
 (def ^:dynamic *working-dir* nil)
 

diff --git a/installers/auth.example.org/_site/operations/install-not-found.edn b/installers/auth.example.org/_site/operations/install-not-found.edn
@@ -36,7 +36,7 @@
           :juxt.site/type "https://meta.juxt.site/types/not-found"
 
           :juxt.site/methods
-          {:get {:juxt.site/operation "https://auth.example.org/_site/operations/get-not-found"}}
+          {:get {:juxt.site/operation-uri "https://auth.example.org/_site/operations/get-not-found"}}
 
           :juxt.site/access-control-allow-origins
           [[".*" {:juxt.site/access-control-allow-origin "*"

diff --git a/installers/auth.example.org/_site/permissions/SiteAdmin/all-bundles.edn b/installers/auth.example.org/_site/permissions/SiteAdmin/all-bundles.edn
@@ -5,5 +5,5 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/_site/operations/all-bundles"
+   :juxt.site/operation-uri "https://auth.example.org/_site/operations/all-bundles"
    :juxt.site/role "https://data.example.org/_site/roles/SiteAdmin"}}}
diff --git a/installers/auth.example.org/_site/permissions/SiteAdmin/create-operation.edn b/installers/auth.example.org/_site/permissions/SiteAdmin/create-operation.edn
@@ -5,5 +5,5 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/_site/operations/create-operation"
+   :juxt.site/operation-uri "https://auth.example.org/_site/operations/create-operation"
    :juxt.site/role "https://data.example.org/_site/roles/SiteAdmin"}}}
diff --git a/installers/auth.example.org/_site/permissions/SiteAdmin/delete-bundle-by-id.edn b/installers/auth.example.org/_site/permissions/SiteAdmin/delete-bundle-by-id.edn
@@ -5,5 +5,5 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/_site/operations/delete-bundle-by-id"
+   :juxt.site/operation-uri "https://auth.example.org/_site/operations/delete-bundle-by-id"
    :juxt.site/role "https://data.example.org/_site/roles/SiteAdmin"}}}
diff --git a/installers/auth.example.org/_site/permissions/SiteAdmin/get-bundle-by-id.edn b/installers/auth.example.org/_site/permissions/SiteAdmin/get-bundle-by-id.edn
@@ -5,5 +5,5 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/_site/operations/get-bundle-by-id"
+   :juxt.site/operation-uri "https://auth.example.org/_site/operations/get-bundle-by-id"
    :juxt.site/role "https://data.example.org/_site/roles/SiteAdmin"}}}
diff --git a/installers/auth.example.org/_site/permissions/SiteAdmin/grant-permission.edn b/installers/auth.example.org/_site/permissions/SiteAdmin/grant-permission.edn
@@ -5,5 +5,5 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/_site/operations/grant-permission"
+   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
    :juxt.site/role "https://data.example.org/_site/roles/SiteAdmin"}}}
diff --git a/installers/auth.example.org/_site/permissions/get-not-found.edn b/installers/auth.example.org/_site/permissions/get-not-found.edn
@@ -8,4 +8,4 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/_site/operations/get-not-found"}}}
+   :juxt.site/operation-uri "https://auth.example.org/_site/operations/get-not-found"}}}
diff --git a/installers/auth.example.org/_site/permissions/system/bootstrap.edn b/installers/auth.example.org/_site/permissions/system/bootstrap.edn
@@ -3,7 +3,7 @@
   ;; tag::install-system-permissions![]
   {:xt/id "{{$id}}"
    :juxt.site/type "https://meta.juxt.site/types/permission"
-   :juxt.site/operation #{"https://auth.example.org/_site/operations/create-operation"
+   :juxt.site/operation-uri #{"https://auth.example.org/_site/operations/create-operation"
                           "https://auth.example.org/_site/operations/grant-permission"}
    :juxt.site/subject "https://auth.example.org/_site/subjects/system"
    }

diff --git a/installers/auth.example.org/_site/permissions/system/install-not-found.edn b/installers/auth.example.org/_site/permissions/system/install-not-found.edn
@@ -9,4 +9,4 @@
   :juxt.site/input
   {:xt/id "{{$id}}"
    :juxt.site/subject "https://auth.example.org/_site/subjects/system"
-   :juxt.site/operation "https://auth.example.org/_site/operations/install-not-found"}}}
+   :juxt.site/operation-uri "https://auth.example.org/_site/operations/install-not-found"}}}
diff --git a/installers/auth.example.org/operations/assign-role.edn b/installers/auth.example.org/operations/assign-role.edn
@@ -49,7 +49,7 @@
                :xt/id (format "https://data.example.org/_site/role-assignments/%s-%s" (or username client-id) rolename)
                :juxt.site/type "https://meta.juxt.site/types/role-assignment"
                :juxt.site/methods
-               {:get {:juxt.site/operation "https://auth.example.org/operations/get-role-assignment"}})))}
+               {:get {:juxt.site/operation-uri "https://auth.example.org/operations/get-role-assignment"}})))}
 
    :juxt.site/transact
    {:juxt.site.sci/program
@@ -61,7 +61,7 @@
 
    ;; This operation can be performed via its URI
    :juxt.site/methods
-   {:post {:juxt.site/operation "{{$id}}"
+   {:post {:juxt.site/operation-uri "{{$id}}"
            :juxt.site/acceptable {"accept" "application/json,application/edn"}}}
 
    :juxt.site/protection-spaces #{"https://auth.example.org/protection-spaces/bearer"}

diff --git a/installers/auth.example.org/operations/create-login-resource.edn b/installers/auth.example.org/operations/create-login-resource.edn
@@ -32,8 +32,8 @@
           juxt.site.malli/validate-input
           (assoc
            :juxt.site/methods
-           {:get {:juxt.site/operation "https://auth.example.org/operations/get-unprotected-resource"}
-            :post {:juxt.site/operation "https://auth.example.org/operations/login"}}
+           {:get {:juxt.site/operation-uri "https://auth.example.org/operations/get-unprotected-resource"}
+            :post {:juxt.site/operation-uri "https://auth.example.org/operations/login"}}
 
            :juxt.http/content-type "text/html;charset=utf-8"
           ;; TODO: We could make the HTML content a parameter

diff --git a/installers/auth.example.org/operations/create-logout-resource.edn b/installers/auth.example.org/operations/create-logout-resource.edn
@@ -31,7 +31,7 @@
          juxt.site.malli/validate-input
          (assoc
           :juxt.site/methods
-          {:post {:juxt.site/operation "https://auth.example.org/operations/logout"}}))))}
+          {:post {:juxt.site/operation-uri "https://auth.example.org/operations/logout"}}))))}
 
    :juxt.site/transact
    {:juxt.site.sci/program

diff --git a/installers/auth.example.org/operations/get-api-endpoints.edn b/installers/auth.example.org/operations/get-api-endpoints.edn
@@ -22,10 +22,10 @@
                 '{:find [(pull e [*])]
                   :where [[e :juxt.site/type "https://meta.juxt.site/types/api-endpoint"]]})
                (map first))
-          [method {operation :juxt.site/operation}] (:juxt.site/methods endpoint)]
+          [method {operation-uri :juxt.site/operation-uri}] (:juxt.site/methods endpoint)]
       {:uri (:xt/id endpoint)
        :method (clojure.string/upper-case (name method))
-       :operation-uri operation})}
+       :operation-uri operation-uri})}
 
    :juxt.site/scope
    #{"https://auth.example.org/scopes/system/read"}

diff --git a/installers/auth.example.org/operations/get-openapi-document.edn b/installers/auth.example.org/operations/get-openapi-document.edn
@@ -54,7 +54,7 @@
                             allowed-operations))
                     (assoc
                      (name method)
-                     (let [operation (xt/entity (:juxt.site/operation method-details))
+                     (let [operation (xt/entity (:juxt.site/operation-uri method-details))
                            scope (:juxt.site/scope operation)]
                        (merge
                         {"operationId" (:xt/id operation)}

diff --git a/installers/auth.example.org/operations/install-openid-callback-endpoint.edn b/installers/auth.example.org/operations/install-openid-callback-endpoint.edn
@@ -33,7 +33,7 @@
          (assoc
           :juxt.site/methods
           {:get
-           {:juxt.site/operation "https://auth.example.org/operations/openid/exchange-code-for-id-token"}}
+           {:juxt.site/operation-uri "https://auth.example.org/operations/openid/exchange-code-for-id-token"}}
           :juxt.http/content-type "text/html;charset=utf-8"
           :juxt.http/content "<p>This should redirect</p>"))))}
 

diff --git a/installers/auth.example.org/operations/install-openid-login-endpoint.edn b/installers/auth.example.org/operations/install-openid-login-endpoint.edn
@@ -35,7 +35,7 @@
          (assoc
           :juxt.site/methods
           {:get
-           {:juxt.site/operation "https://auth.example.org/operations/login-with-openid"}}
+           {:juxt.site/operation-uri "https://auth.example.org/operations/login-with-openid"}}
           :juxt.http/content-type "text/html;charset=utf-8"
           :juxt.http/content "<p>This should redirect</p>"))))}
 

diff --git a/installers/auth.example.org/operations/oauth/install-authorize-endpoint.edn b/installers/auth.example.org/operations/oauth/install-authorize-endpoint.edn
@@ -25,8 +25,8 @@
          juxt.site.malli/validate-input
          (assoc
           :juxt.site/methods
-          {:get {:juxt.site/operation "https://auth.example.org/operations/oauth/view-owned-authorizations"}
-           :post {:juxt.site/operation "https://auth.example.org/operations/oauth/authorize"}}))))}
+          {:get {:juxt.site/operation-uri "https://auth.example.org/operations/oauth/view-owned-authorizations"}
+           :post {:juxt.site/operation-uri "https://auth.example.org/operations/oauth/authorize"}}))))}
 
    :juxt.site/transact
    {:juxt.site.sci/program

diff --git a/installers/auth.example.org/operations/oauth/install-jwks-document.edn b/installers/auth.example.org/operations/oauth/install-jwks-document.edn
@@ -26,7 +26,7 @@
          juxt.site.malli/validate-input
          (assoc
           :juxt.site/methods
-          {:get {:juxt.site/operation "https://auth.example.org/operations/oauth/get-jwks-document"}}
+          {:get {:juxt.site/operation-uri "https://auth.example.org/operations/oauth/get-jwks-document"}}
           :juxt.http/content-type "application/json"
           :juxt.site/respond
           {:juxt.site.sci/program

diff --git a/installers/auth.example.org/operations/oauth/install-metadata-endpoint.edn b/installers/auth.example.org/operations/oauth/install-metadata-endpoint.edn
@@ -26,7 +26,7 @@
          juxt.site.malli/validate-input
          (assoc
           :juxt.site/methods
-          {:get {:juxt.site/operation "https://auth.example.org/operations/oauth/get-authorization-server-metadata"}}
+          {:get {:juxt.site/operation-uri "https://auth.example.org/operations/oauth/get-authorization-server-metadata"}}
           :juxt.http/content-type "application/json"
           :juxt.site/respond
           {:juxt.site.sci/program

diff --git a/installers/auth.example.org/operations/oauth/install-token-endpoint.edn b/installers/auth.example.org/operations/oauth/install-token-endpoint.edn
@@ -27,7 +27,7 @@
          (assoc
           :juxt.site/methods
           {:post
-           {:juxt.site/operation "https://auth.example.org/operations/oauth/create-access-token"
+           {:juxt.site/operation-uri "https://auth.example.org/operations/oauth/create-access-token"
             :juxt.site/acceptable {"accept" "application/x-www-form-urlencoded"}}}))))}
 
    :juxt.site/transact

diff --git a/installers/auth.example.org/operations/oauth/install-token-introspection-endpoint.edn b/installers/auth.example.org/operations/oauth/install-token-introspection-endpoint.edn
@@ -41,7 +41,7 @@
            #_:get
            #_{:juxt.site/operation "https://auth.example.org/operations/oauth/get-introspect-token-form"}
            :post
-           {:juxt.site/operation "https://auth.example.org/operations/oauth/introspect-token"
+           {:juxt.site/operation-uri "https://auth.example.org/operations/oauth/introspect-token"
             :juxt.site/acceptable {"accept" "application/x-www-form-urlencoded"}}}))))}
 
    :juxt.site/transact

diff --git a/installers/auth.example.org/operations/petstore/add-pet-prepare.clj b/installers/auth.example.org/operations/petstore/add-pet-prepare.clj
@@ -25,13 +25,13 @@
               :juxt.site/type "https://data.example.org/types/pet"
               :juxt.site/methods
               {:get
-               {:juxt.site/operation
+               {:juxt.site/operation-uri
                 "https://auth.example.org/operations/petstore/get-pet-by-id"}
                :delete
-               {:juxt.site/operation
+               {:juxt.site/operation-uri
                 "https://auth.example.org/operations/petstore/delete-pet-by-id"}
                :post
-               {:juxt.site/operation
+               {:juxt.site/operation-uri
                 "https://auth.example.org/operations/petstore/update-pet-by-id"}}
               :juxt.site/protection-spaces
               #{"https://auth.example.org/protection-spaces/bearer"}

diff --git a/installers/auth.example.org/operations/petstore/order/place.edn b/installers/auth.example.org/operations/petstore/order/place.edn
@@ -35,10 +35,10 @@
              :juxt.site/type "https://data.example.org/types/order"
              :juxt.site/methods
              {:get
-              {:juxt.site/operation
+              {:juxt.site/operation-uri
                "https://auth.example.org/operations/petstore/order/get-by-id"}
               :delete
-              {:juxt.site/operation
+              {:juxt.site/operation-uri
                "https://auth.example.org/operations/petstore/order/delete-by-id"}}
              :juxt.site/protection-spaces
              #{"https://auth.example.org/protection-spaces/bearer"}

diff --git a/installers/auth.example.org/operations/post-openapi.edn b/installers/auth.example.org/operations/post-openapi.edn
@@ -45,7 +45,7 @@
          {:xt/id (str base-uri "/openapi.json")
           :juxt.site/type "https://meta.juxt.site/types/openapi-document"
           :juxt.http/content-type "application/json"
-          :juxt.site/methods {:get {:juxt.site/operation "https://auth.example.org/operations/get-openapi-document"}}
+          :juxt.site/methods {:get {:juxt.site/operation-uri "https://auth.example.org/operations/get-openapi-document"}}
           :openapi.v3/definition openapi
 
           :juxt.site/access-control-allow-origins
@@ -69,7 +69,7 @@
                  (for [[method operation] path-obj
                        :let [request-body (get operation "requestBody")]]
                    [(keyword method)
-                    (cond-> {:juxt.site/operation (get operation "operationId")
+                    (cond-> {:juxt.site/operation-uri (get operation "operationId")
                              :openapi.v3/metadata operation}
                       request-body
                       (assoc :juxt.site/acceptable
@@ -96,7 +96,7 @@
                    (for [[method operation] path-obj
                          :let [request-body (get operation "requestBody")]]
                      [(keyword method)
-                      (cond-> {:juxt.site/operation (get operation "operationId")}
+                      (cond-> {:juxt.site/operation-uri (get operation "operationId")}
                         request-body
                         (assoc :juxt.site/acceptable
                                (clojure.string/join "," (keys (get request-body "content")))))]))

diff --git a/installers/auth.example.org/operations/put-openapi-document.edn b/installers/auth.example.org/operations/put-openapi-document.edn
@@ -39,7 +39,7 @@
              {:juxt.site/type "https://meta.juxt.site/types/openapi-document"
 
               :juxt.site/methods
-              {:get {:juxt.site/operation "https://auth.example.org/operations/get-openapi-document"}}
+              {:get {:juxt.site/operation-uri "https://auth.example.org/operations/get-openapi-document"}}
 
               :juxt.site/access-control-allow-origins
               [[".*" {:juxt.site/access-control-allow-origin "*"

diff --git a/installers/auth.example.org/operations/put-role.edn b/installers/auth.example.org/operations/put-role.edn
@@ -29,7 +29,7 @@
          (assoc
           :juxt.site/type "https://meta.juxt.site/types/role"
           :juxt.site/methods
-          {:get {:juxt.site/operation "https://auth.example.org/operations/get-role"}}))))}
+          {:get {:juxt.site/operation-uri "https://auth.example.org/operations/get-role"}}))))}
 
    :juxt.site/transact
    {:juxt.site.sci/program

diff --git a/installers/auth.example.org/operations/put-user.edn b/installers/auth.example.org/operations/put-user.edn
@@ -56,7 +56,7 @@
                      :juxt.site/username username
                      :juxt.site/type "https://meta.juxt.site/types/user"
                      :juxt.site/methods
-                     {:get {:juxt.site/operation "https://auth.example.org/operations/get-user"}}
+                     {:get {:juxt.site/operation-uri "https://auth.example.org/operations/get-user"}}
                      :juxt.site/protection-spaces #{"https://auth.example.org/protection-spaces/bearer"}
 
                      :juxt.site/access-control-allow-origins
@@ -67,7 +67,7 @@
           base
           {:juxt.site/variant-of user-uri
            :juxt.site/methods
-           {:get {:juxt.site/operation "https://auth.example.org/operations/get-user"}}
+           {:get {:juxt.site/operation-uri "https://auth.example.org/operations/get-user"}}
            :juxt.site/protection-spaces #{"https://auth.example.org/protection-spaces/bearer"}
            :juxt.site/access-control-allow-origins
            [[".*" {:juxt.site/access-control-allow-origin "*"

diff --git a/installers/auth.example.org/operations/register-openid-user-identity.edn b/installers/auth.example.org/operations/register-openid-user-identity.edn
@@ -39,7 +39,7 @@
          (assoc :juxt.site/type #{"https://meta.juxt.site/types/user-identity"
                                   "https://meta.juxt.site/types/openid-user-identity"}
                 :juxt.site/methods
-                {:get {:juxt.site/operation "https://auth.example.org/operations/get-user-identity"}
+                {:get {:juxt.site/operation-uri "https://auth.example.org/operations/get-user-identity"}
                  :options {}}))))}
 
    :juxt.site/transact

diff --git a/installers/auth.example.org/operations/register-password-based-user-identity.edn b/installers/auth.example.org/operations/register-password-based-user-identity.edn
@@ -42,7 +42,7 @@
                 :juxt.site/type #{"https://meta.juxt.site/types/user-identity"
                                   "https://meta.juxt.site/types/basic-user-identity"}
                 :juxt.site/methods
-                {:get {:juxt.site/operation "https://auth.example.org/operations/get-user-identity"}
+                {:get {:juxt.site/operation-uri "https://auth.example.org/operations/get-user-identity"}
                  :options {}}))]
           (-> input
               ;; We want usernames to be case-insensitive, as per OWASP

diff --git a/installers/auth.example.org/permissions/by-role/{{role}}/{{operation}}.edn b/installers/auth.example.org/permissions/by-role/{{role}}/{{operation}}.edn
@@ -3,5 +3,5 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/operations/{{operation}}"
+   :juxt.site/operation-uri "https://auth.example.org/operations/{{operation}}"
    :juxt.site/role "https://data.example.org/_site/roles/{{role}}"}}}
diff --git a/installers/auth.example.org/permissions/get-access-token.edn b/installers/auth.example.org/permissions/get-access-token.edn
@@ -5,4 +5,4 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/operations/get-access-token"}}}
+   :juxt.site/operation-uri "https://auth.example.org/operations/get-access-token"}}}
diff --git a/installers/auth.example.org/permissions/get-openapi-document.edn b/installers/auth.example.org/permissions/get-openapi-document.edn
@@ -5,4 +5,4 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/operations/get-openapi-document"}}}
+   :juxt.site/operation-uri "https://auth.example.org/operations/get-openapi-document"}}}
diff --git a/installers/auth.example.org/permissions/get-operations.edn b/installers/auth.example.org/permissions/get-operations.edn
@@ -5,4 +5,4 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/operations/get-operations"}}}
+   :juxt.site/operation-uri "https://auth.example.org/operations/get-operations"}}}
diff --git a/installers/auth.example.org/permissions/get-unprotected-resource.edn b/installers/auth.example.org/permissions/get-unprotected-resource.edn
@@ -3,4 +3,4 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/operations/get-unprotected-resource"}}}
+   :juxt.site/operation-uri "https://auth.example.org/operations/get-unprotected-resource"}}}
diff --git a/installers/auth.example.org/permissions/login-with-openid.edn b/installers/auth.example.org/permissions/login-with-openid.edn
@@ -5,4 +5,4 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/operations/login-with-openid"}}}
+   :juxt.site/operation-uri "https://auth.example.org/operations/login-with-openid"}}}
diff --git a/installers/auth.example.org/permissions/login.edn b/installers/auth.example.org/permissions/login.edn
@@ -3,4 +3,4 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/operations/login"}}}
+   :juxt.site/operation-uri "https://auth.example.org/operations/login"}}}
diff --git a/installers/auth.example.org/permissions/logout.edn b/installers/auth.example.org/permissions/logout.edn
@@ -3,4 +3,4 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/operations/logout"}}}
+   :juxt.site/operation-uri "https://auth.example.org/operations/logout"}}}
diff --git a/installers/auth.example.org/permissions/oauth/authorize.edn b/installers/auth.example.org/permissions/oauth/authorize.edn
@@ -3,4 +3,4 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation #{"https://auth.example.org/operations/oauth/authorize"}}}}
+   :juxt.site/operation-uri #{"https://auth.example.org/operations/oauth/authorize"}}}}
diff --git a/installers/auth.example.org/permissions/oauth/create-access-token.edn b/installers/auth.example.org/permissions/oauth/create-access-token.edn
@@ -3,4 +3,4 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation #{"https://auth.example.org/operations/oauth/create-access-token"}}}}
+   :juxt.site/operation-uri #{"https://auth.example.org/operations/oauth/create-access-token"}}}}
diff --git a/installers/auth.example.org/permissions/oauth/get-authorization-server-metadata.edn b/installers/auth.example.org/permissions/oauth/get-authorization-server-metadata.edn
@@ -3,4 +3,4 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/operations/oauth/get-authorization-server-metadata"}}}
+   :juxt.site/operation-uri "https://auth.example.org/operations/oauth/get-authorization-server-metadata"}}}
diff --git a/installers/auth.example.org/permissions/oauth/get-introspect-token-form.edn b/installers/auth.example.org/permissions/oauth/get-introspect-token-form.edn
@@ -3,4 +3,4 @@
   :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission"
   :juxt.site/input
   {:xt/id "{{$id}}"
-   :juxt.site/operation "https://auth.example.org/operations/oauth/get-introspect-token-form"}}}
+   :juxt.site/operation-uri "https://auth.example.org/operations/oauth/get-introspect-token-form"}}}