From f9d83142183edaf8c9d5d151557288e81270a589 Mon Sep 17 00:00:00 2001 From: Jamie Walkerdine Date: Mon, 30 Oct 2023 16:38:04 +0000 Subject: [PATCH] Fix rebase conflicts --- .../SiteAdmin/get-bundle-modifications.edn | 2 +- .../auth.example.org/oauth/introspect.edn | 4 +--- installers/bundles.edn | 5 ++-- .../data.example.org/_site/access-token.edn | 2 +- installers/data.example.org/_site/bundle.edn | 6 ++--- .../data.example.org/_site/bundle.txt.edn | 8 +++---- .../_site/bundles.jsonlines.edn | 4 ++-- .../data.example.org/_site/logs.json-seq.edn | 11 ++------- .../data.example.org/_site/logs.jsonlines.edn | 11 ++------- .../data.example.org/_site/logs.txt.edn | 11 ++------- .../data.example.org/_site/openapi.json.edn | 7 +----- .../data.example.org/_site/openapis.edn | 13 +++------- .../data.example.org/_site/openapis.edn.edn | 8 +------ .../data.example.org/_site/openapis.json.edn | 8 +------ .../data.example.org/_site/operations.edn.edn | 8 +------ .../_site/operations.json.edn | 10 ++------ .../_site/operations/put-openapi-document.edn | 1 - .../_site/permissions/get-access-token.edn | 1 - .../permissions/get-openapi-document.edn | 1 - .../_site/permissions/get-operations.edn | 1 - .../permissions/put-openapi-document.edn | 4 +--- .../testing/basic-auth-protected-resource.edn | 2 +- .../client-credentials-protected-resource.edn | 2 +- src/juxt/site/site_cli/tasks.clj | 24 +------------------ 24 files changed, 34 insertions(+), 120 deletions(-) diff --git a/installers/auth.example.org/_site/permissions/SiteAdmin/get-bundle-modifications.edn b/installers/auth.example.org/_site/permissions/SiteAdmin/get-bundle-modifications.edn index 3f72729a..b36f75e4 100644 --- a/installers/auth.example.org/_site/permissions/SiteAdmin/get-bundle-modifications.edn +++ b/installers/auth.example.org/_site/permissions/SiteAdmin/get-bundle-modifications.edn @@ -1,5 +1,5 @@ {:deps - [{:juxt.site/base-uri "https://auth.example.org" + [{:juxt.site/base-uri "https://data.example.org" :juxt.site/installer-path "/_site/operations/get-bundle-by-id"}] :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" diff --git a/installers/auth.example.org/oauth/introspect.edn b/installers/auth.example.org/oauth/introspect.edn index ad0afec5..337a6696 100644 --- a/installers/auth.example.org/oauth/introspect.edn +++ b/installers/auth.example.org/oauth/introspect.edn @@ -1,12 +1,10 @@ {:deps - [{:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/oauth/install-token-introspection-endpoint"} -] + [{:juxt.site/base-uri "https://auth.example.org" :juxt.site/installer-path "/operations/oauth/install-token-introspection-endpoint"}] :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" :juxt.site/operation-uri "https://auth.example.org/operations/oauth/install-token-introspection-endpoint" :juxt.site/input {:xt/id "{{$id}}" - ;; The introspect endpoint is inside a special protection space ;; that requires the client to authenticate itself using Basic ;; authentication. See RFC 7662 Section 2.1: diff --git a/installers/bundles.edn b/installers/bundles.edn index a57f562c..857fdf71 100644 --- a/installers/bundles.edn +++ b/installers/bundles.edn @@ -423,7 +423,7 @@ {:juxt.site/base-uri "https://data.example.org" :juxt.site/installer-path "/_site/access-token.txt"} {:juxt.site/base-uri "https://data.example.org" - :juxt.site/installer-path "/permissions/whoami"} + :juxt.site/installer-path "/_site/permissions/whoami"} ]} ;; TODO: Shouldn't SystemAPI be broken up into individual endpoints? @@ -572,7 +572,8 @@ {:juxt.site/base-uri "https://auth.example.org" :juxt.site/installer-path "/permissions/oauth/introspect-token"} {:juxt.site/base-uri "https://auth.example.org" :juxt.site/installer-path "/operations/oauth/install-token-introspection-endpoint"} {:juxt.site/base-uri "https://auth.example.org" :juxt.site/installer-path "/permissions/system/install-token-introspection-endpoint"} - {:juxt.site/base-uri "https://auth.example.org" :juxt.site/installer-path "/oauth/introspect"}]} + {:juxt.site/base-uri "https://auth.example.org" :juxt.site/installer-path "/oauth/introspect"} + ]} "juxt/site/oauth-metadata-endpoints" {:juxt.site/description "OAuth2 RFC 8414 metadata endpoints" diff --git a/installers/data.example.org/_site/access-token.edn b/installers/data.example.org/_site/access-token.edn index e580855a..093b34be 100644 --- a/installers/data.example.org/_site/access-token.edn +++ b/installers/data.example.org/_site/access-token.edn @@ -1,5 +1,5 @@ {:deps - [{:juxt.site/base-uri "https:/data.example.org", :juxt.site/installer-path "/_site/operations/get-access-token"} + [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/get-access-token"} {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/protection-spaces/bearer"} ] :install diff --git a/installers/data.example.org/_site/bundle.edn b/installers/data.example.org/_site/bundle.edn index f9122a04..3e7eb306 100644 --- a/installers/data.example.org/_site/bundle.edn +++ b/installers/data.example.org/_site/bundle.edn @@ -1,7 +1,7 @@ {:deps - [{:juxt.site/base-uri "https://auth.example.org" + [{:juxt.site/base-uri "https://data.example.org" :juxt.site/installer-path "/_site/operations/get-bundle-by-id"} - {:juxt.site/base-uri "https://auth.example.org" + {:juxt.site/base-uri "https://data.example.org" :juxt.site/installer-path "/_site/operations/delete-bundle-by-id"} {:juxt.site/base-uri "https://auth.example.org" :juxt.site/installer-path "/protection-spaces/bearer"}] @@ -15,7 +15,7 @@ :juxt.site/methods {:get - {:juxt.site/operation "https://auth.example.org/_site/operations/get-bundle-by-id" + {:juxt.site/operation "https://data.example.org/_site/operations/get-bundle-by-id" :openapi.v3/metadata {"tags" ["Bundles"] "summary" "Get a bundle" diff --git a/installers/data.example.org/_site/bundle.txt.edn b/installers/data.example.org/_site/bundle.txt.edn index 7039078a..75c92f93 100644 --- a/installers/data.example.org/_site/bundle.txt.edn +++ b/installers/data.example.org/_site/bundle.txt.edn @@ -2,9 +2,9 @@ {:deps [{:juxt.site/base-uri "https://data.example.org" :juxt.site/installer-path "/_site/bundle"} - {:juxt.site/base-uri "https://auth.example.org" + {:juxt.site/base-uri "https://data.example.org" :juxt.site/installer-path "/_site/operations/get-bundle-by-id"} - {:juxt.site/base-uri "https://auth.example.org" + {:juxt.site/base-uri "https://data.example.org" :juxt.site/installer-path "/_site/operations/delete-bundle-by-id"} {:juxt.site/base-uri "https://auth.example.org" :juxt.site/installer-path "/operations/put-resource"}] @@ -14,8 +14,8 @@ :juxt.site/input {:xt/id "{{$id}}" :juxt.site/methods - {:get {:juxt.site/operation "https://auth.example.org/_site/operations/get-bundle-by-id"} - :delete {:juxt.site/operation "https://auth.example.org/_site/operations/delete-bundle-by-id"}} + {:get {:juxt.site/operation "https://data.example.org/_site/operations/get-bundle-by-id"} + :delete {:juxt.site/operation "https://data.example.org/_site/operations/delete-bundle-by-id"}} :juxt.site/variant-of "https://data.example.org/_site/bundle" :juxt.http/content-type "text/plain;charset=utf-8" :juxt.pick/quality-of-source 0.9 ; downgrade in content-negotiation diff --git a/installers/data.example.org/_site/bundles.jsonlines.edn b/installers/data.example.org/_site/bundles.jsonlines.edn index 4127848b..f932aa76 100644 --- a/installers/data.example.org/_site/bundles.jsonlines.edn +++ b/installers/data.example.org/_site/bundles.jsonlines.edn @@ -1,7 +1,7 @@ {:deps [{:juxt.site/base-uri "https://data.example.org" :juxt.site/installer-path "/_site/bundles"} - {:juxt.site/base-uri "https://auth.example.org" + {:juxt.site/base-uri "https://data.example.org" :juxt.site/installer-path "/_site/operations/all-bundles"} {:juxt.site/base-uri "https://auth.example.org" :juxt.site/installer-path "/operations/put-resource"}] @@ -11,7 +11,7 @@ :juxt.site/input {:xt/id "{{$id}}" :juxt.site/methods - {:get {:juxt.site/operation "https://auth.example.org/_site/operations/all-bundles"}} + {:get {:juxt.site/operation "https://data.example.org/_site/operations/all-bundles"}} :juxt.site/variant-of "https://data.example.org/_site/bundles" ;; See https://docs.aws.amazon.com/sagemaker/latest/dg/cdf-inference.html#cm-batch :juxt.http/content-type "application/jsonlines" diff --git a/installers/data.example.org/_site/logs.json-seq.edn b/installers/data.example.org/_site/logs.json-seq.edn index eb3eb77b..d7d336bf 100644 --- a/installers/data.example.org/_site/logs.json-seq.edn +++ b/installers/data.example.org/_site/logs.json-seq.edn @@ -1,14 +1,7 @@ {:deps -<<<<<<< HEAD - ["https://data.example.org/_site/logs" - "https://data.example.org/_site/operations/get-logs" - "https://auth.example.org/operations/put-resource"] -======= [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/logs"} - {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/get-logs"} - {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/put-resource"} -] ->>>>>>> 2f17382f (Update dependencies to use specs instead of strings) + {:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/get-logs"} + {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/put-resource"}] :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" :juxt.site/operation-uri "https://auth.example.org/operations/put-resource" diff --git a/installers/data.example.org/_site/logs.jsonlines.edn b/installers/data.example.org/_site/logs.jsonlines.edn index 7c4e3c74..acd25fdb 100644 --- a/installers/data.example.org/_site/logs.jsonlines.edn +++ b/installers/data.example.org/_site/logs.jsonlines.edn @@ -1,15 +1,8 @@ ;; See https://jsonlines.org/ {:deps -<<<<<<< HEAD - ["https://data.example.org/_site/logs" - "https://data.example.org/_site/operations/get-logs" - "https://auth.example.org/operations/put-resource"] -======= [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/logs"} - {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/get-logs"} - {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/put-resource"} -] ->>>>>>> 2f17382f (Update dependencies to use specs instead of strings) + {:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/get-logs"} + {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/put-resource"}] :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" :juxt.site/operation-uri "https://auth.example.org/operations/put-resource" diff --git a/installers/data.example.org/_site/logs.txt.edn b/installers/data.example.org/_site/logs.txt.edn index 85b2d7ee..dd1d4e03 100644 --- a/installers/data.example.org/_site/logs.txt.edn +++ b/installers/data.example.org/_site/logs.txt.edn @@ -1,15 +1,8 @@ ;; See https://jsonlines.org/ {:deps -<<<<<<< HEAD - ["https://data.example.org/_site/logs" - "https://data.example.org/_site/operations/get-logs" - "https://auth.example.org/operations/put-resource"] -======= [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/logs"} - {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/get-logs"} - {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/put-resource"} -] ->>>>>>> 2f17382f (Update dependencies to use specs instead of strings) + {:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/get-logs"} + {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/put-resource"}] :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" :juxt.site/operation-uri "https://auth.example.org/operations/put-resource" diff --git a/installers/data.example.org/_site/openapi.json.edn b/installers/data.example.org/_site/openapi.json.edn index a283a613..e1b5e635 100644 --- a/installers/data.example.org/_site/openapi.json.edn +++ b/installers/data.example.org/_site/openapi.json.edn @@ -1,10 +1,5 @@ {:deps -<<<<<<< HEAD - ["https://data.example.org/_site/operations/put-openapi-document"] -======= - [{:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/put-openapi-document"} -] ->>>>>>> 2f17382f (Update dependencies to use specs instead of strings) + [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/put-openapi-document"}] :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" :juxt.site/operation-uri "https://data.example.org/_site/operations/put-openapi-document" diff --git a/installers/data.example.org/_site/openapis.edn b/installers/data.example.org/_site/openapis.edn index 3c65f4f4..95c355e5 100644 --- a/installers/data.example.org/_site/openapis.edn +++ b/installers/data.example.org/_site/openapis.edn @@ -1,14 +1,7 @@ {:deps -<<<<<<< HEAD - ["https://data.example.org/_site/operations/get-openapis" - "https://data.example.org/_site/operations/post-openapi" - "https://auth.example.org/protection-spaces/bearer"] -======= - [{:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/get-openapis"} - {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/post-openapi"} - {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/protection-spaces/bearer"} -] ->>>>>>> 2f17382f (Update dependencies to use specs instead of strings) + [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/get-openapis"} + {:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/post-openapi"} + {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/protection-spaces/bearer"}] :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" :juxt.site/operation-uri "https://auth.example.org/operations/put-resource" diff --git a/installers/data.example.org/_site/openapis.edn.edn b/installers/data.example.org/_site/openapis.edn.edn index 612255ee..fbd63f8c 100644 --- a/installers/data.example.org/_site/openapis.edn.edn +++ b/installers/data.example.org/_site/openapis.edn.edn @@ -1,12 +1,6 @@ {:deps -<<<<<<< HEAD - ["https://data.example.org/_site/openapis" - "https://data.example.org/_site/operations/get-openapis"] -======= [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/openapis"} - {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/get-openapis"} -] ->>>>>>> 2f17382f (Update dependencies to use specs instead of strings) + {:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/get-openapis"}] :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" :juxt.site/operation-uri "https://auth.example.org/operations/put-resource" diff --git a/installers/data.example.org/_site/openapis.json.edn b/installers/data.example.org/_site/openapis.json.edn index accb4665..23f5d2d3 100644 --- a/installers/data.example.org/_site/openapis.json.edn +++ b/installers/data.example.org/_site/openapis.json.edn @@ -1,12 +1,6 @@ {:deps -<<<<<<< HEAD - ["https://data.example.org/_site/openapis" - "https://data.example.org/_site/operations/get-openapis"] -======= [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/openapis"} - {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/get-openapis"} -] ->>>>>>> 2f17382f (Update dependencies to use specs instead of strings) + {:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/get-openapis"}] :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" :juxt.site/operation-uri "https://auth.example.org/operations/put-resource" diff --git a/installers/data.example.org/_site/operations.edn.edn b/installers/data.example.org/_site/operations.edn.edn index fc9b9bf0..91068874 100644 --- a/installers/data.example.org/_site/operations.edn.edn +++ b/installers/data.example.org/_site/operations.edn.edn @@ -1,12 +1,6 @@ {:deps -<<<<<<< HEAD - ["https://data.example.org/_site/operations" - "https://data.example.org/_site/operations/get-operations"] -======= [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations"} - {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/get-operations"} -] ->>>>>>> 2f17382f (Update dependencies to use specs instead of strings) + {:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/get-operations"}] :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" :juxt.site/operation-uri "https://auth.example.org/operations/put-resource" diff --git a/installers/data.example.org/_site/operations.json.edn b/installers/data.example.org/_site/operations.json.edn index c646cff1..e5af1d0c 100644 --- a/installers/data.example.org/_site/operations.json.edn +++ b/installers/data.example.org/_site/operations.json.edn @@ -1,12 +1,6 @@ {:deps -<<<<<<< HEAD - ["https://data.example.org/_site/operations" - "https://data.example.org/_site/operations/get-operations"] -======= - [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations"} - {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/get-operations"} -] ->>>>>>> 2f17382f (Update dependencies to use specs instead of strings) +[{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations"} + {:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/get-operations"}] :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" :juxt.site/operation-uri "https://auth.example.org/operations/put-resource" diff --git a/installers/data.example.org/_site/operations/put-openapi-document.edn b/installers/data.example.org/_site/operations/put-openapi-document.edn index 37407f09..8a2bc979 100644 --- a/installers/data.example.org/_site/operations/put-openapi-document.edn +++ b/installers/data.example.org/_site/operations/put-openapi-document.edn @@ -2,7 +2,6 @@ [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/get-openapi-document"} {:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/permissions/get-openapi-document"} {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/scopes/system/write"}] -ample.org/operations/put-openapi-document.edn :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" :juxt.site/operation-uri "https://auth.example.org/_site/operations/create-operation" diff --git a/installers/data.example.org/_site/permissions/get-access-token.edn b/installers/data.example.org/_site/permissions/get-access-token.edn index 0365c253..53a2a5ec 100644 --- a/installers/data.example.org/_site/permissions/get-access-token.edn +++ b/installers/data.example.org/_site/permissions/get-access-token.edn @@ -1,6 +1,5 @@ {:deps [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/whoami"}] -ample.org/permissions/get-access-token.edn :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission" diff --git a/installers/data.example.org/_site/permissions/get-openapi-document.edn b/installers/data.example.org/_site/permissions/get-openapi-document.edn index 456ba846..3b3dd20e 100644 --- a/installers/data.example.org/_site/permissions/get-openapi-document.edn +++ b/installers/data.example.org/_site/permissions/get-openapi-document.edn @@ -1,6 +1,5 @@ {:deps [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/get-openapi-document"}] -ample.org/permissions/get-openapi-document.edn :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission" diff --git a/installers/data.example.org/_site/permissions/get-operations.edn b/installers/data.example.org/_site/permissions/get-operations.edn index e0214aa4..eaec9292 100644 --- a/installers/data.example.org/_site/permissions/get-operations.edn +++ b/installers/data.example.org/_site/permissions/get-operations.edn @@ -1,6 +1,5 @@ {:deps [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/get-operations"}] -ample.org/permissions/get-operations.edn :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission" diff --git a/installers/data.example.org/_site/permissions/put-openapi-document.edn b/installers/data.example.org/_site/permissions/put-openapi-document.edn index 850fc51c..97da5e80 100644 --- a/installers/data.example.org/_site/permissions/put-openapi-document.edn +++ b/installers/data.example.org/_site/permissions/put-openapi-document.edn @@ -1,7 +1,5 @@ {:deps - [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/put-openapi-document"} -] -ample.org/permissions/system/put-openapi-document.edn + [{:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/operations/put-openapi-document"}] :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" :juxt.site/operation-uri "https://auth.example.org/_site/operations/grant-permission" diff --git a/installers/data.example.org/_site/testing/basic-auth-protected-resource.edn b/installers/data.example.org/_site/testing/basic-auth-protected-resource.edn index 4a345cc6..6fca45e7 100644 --- a/installers/data.example.org/_site/testing/basic-auth-protected-resource.edn +++ b/installers/data.example.org/_site/testing/basic-auth-protected-resource.edn @@ -1,7 +1,7 @@ {:deps [{:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/put-resource"} {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/protection-spaces/basic"} - {:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/testing/operations/testing/basic-auth-protected-resource-operation"} + {:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/testing/operations/basic-auth-protected-resource-operation"} ] :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" diff --git a/installers/data.example.org/_site/testing/client-credentials-protected-resource.edn b/installers/data.example.org/_site/testing/client-credentials-protected-resource.edn index 6fd09f51..56cc72f8 100644 --- a/installers/data.example.org/_site/testing/client-credentials-protected-resource.edn +++ b/installers/data.example.org/_site/testing/client-credentials-protected-resource.edn @@ -1,7 +1,7 @@ {:deps [{:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/operations/put-resource"} {:juxt.site/base-uri "https://auth.example.org", :juxt.site/installer-path "/protection-spaces/client-credentials"} - {:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/testing/operations/testing/basic-auth-protected-resource-operation"} + {:juxt.site/base-uri "https://data.example.org", :juxt.site/installer-path "/_site/testing/operations/basic-auth-protected-resource-operation"} ] :install {:juxt.site/subject-uri "https://auth.example.org/_site/subjects/system" diff --git a/src/juxt/site/site_cli/tasks.clj b/src/juxt/site/site_cli/tasks.clj index fa84fcac..8b763c58 100644 --- a/src/juxt/site/site_cli/tasks.clj +++ b/src/juxt/site/site_cli/tasks.clj @@ -485,31 +485,9 @@ ["juxt/site/sessions" {}] ["juxt/site/roles" {}] -<<<<<<< HEAD - ;; RFC 7662 token introspection - ["juxt/site/oauth-introspection-endpoint" {}]]))) -======= ;; RFC 7662 token introspection - ["juxt/site/oauth-introspection-endpoint" {}] - ;; Register the clients - ["juxt/site/system-client" - (let [site-cli-config {"client-id" "site-cli"}] - (if-let [site-cli-secret (:site-cli-secret opts)] - (assoc site-cli-config "client-secret" site-cli-secret) - site-cli-config))] - ["juxt/site/system-client" - (let [insite-config {"client-id" "insite"}] - (if-let [insite-secret (:insite-secret opts)] - (assoc insite-config "client-secret" insite-secret) - insite-config))] - ]) - ) + ["juxt/site/oauth-introspection-endpoint" {}]]))) ;; Delete any stale client-secret files - (doseq [client-id ["site-cli" "insite"] - :let [secret-file (util/client-secret-file opts client-id)]] - ;; TODO: Replace with babashka.fs - (.delete secret-file)) ->>>>>>> 2f17382f (Update dependencies to use specs instead of strings) (when-not no-clients (register-system-clients opts))))))