diff --git a/audiences/Gemfile.lock b/audiences/Gemfile.lock index 79f92766..940c4412 100644 --- a/audiences/Gemfile.lock +++ b/audiences/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - audiences (1.5.0) + audiences (1.5.1) rails (>= 6.0) GEM diff --git a/audiences/app/controllers/audiences/scim_proxy_controller.rb b/audiences/app/controllers/audiences/scim_proxy_controller.rb index fea98af5..8d1aa4fe 100644 --- a/audiences/app/controllers/audiences/scim_proxy_controller.rb +++ b/audiences/app/controllers/audiences/scim_proxy_controller.rb @@ -7,7 +7,7 @@ def get .query( filter: "displayName co \"#{params[:filter]}\"", startIndex: params[:startIndex], count: params[:count], - attributes: %w[id externalId displayName photos] + attributes: "id,externalId,displayName,photos" ) render json: resources, except: %w[schemas meta] diff --git a/audiences/docs/CHANGELOG.md b/audiences/docs/CHANGELOG.md index 2621bb28..86223c09 100644 --- a/audiences/docs/CHANGELOG.md +++ b/audiences/docs/CHANGELOG.md @@ -1,5 +1,9 @@ # Unreleased +# Version 1.5.1 (2024-12-12) + +- Fix SCIM proxy attributes format [#462](https://github.com/powerhome/audiences/pull/462) + # Version 1.5.0 (2024-12-12) - SCIM proxy will only return data used by the UI [#451](https://github.com/powerhome/audiences/pull/451) diff --git a/audiences/gemfiles/rails_6_1.gemfile.lock b/audiences/gemfiles/rails_6_1.gemfile.lock index cec42a58..319d7983 100644 --- a/audiences/gemfiles/rails_6_1.gemfile.lock +++ b/audiences/gemfiles/rails_6_1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - audiences (1.5.0) + audiences (1.5.1) rails (>= 6.0) GEM @@ -131,6 +131,8 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) + nokogiri (1.16.6-aarch64-linux) + racc (~> 1.4) nokogiri (1.16.6-arm64-darwin) racc (~> 1.4) nokogiri (1.16.6-x86_64-linux) @@ -276,6 +278,7 @@ GEM zeitwerk (2.6.16) PLATFORMS + aarch64-linux arm64-darwin-22 arm64-darwin-23 arm64-darwin-24 diff --git a/audiences/gemfiles/rails_7_0.gemfile.lock b/audiences/gemfiles/rails_7_0.gemfile.lock index db9d1e9d..fba9892a 100644 --- a/audiences/gemfiles/rails_7_0.gemfile.lock +++ b/audiences/gemfiles/rails_7_0.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - audiences (1.5.0) + audiences (1.5.1) rails (>= 6.0) GEM @@ -137,6 +137,8 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) + nokogiri (1.16.6-aarch64-linux) + racc (~> 1.4) nokogiri (1.16.6-arm64-darwin) racc (~> 1.4) nokogiri (1.16.6-x86_64-linux) @@ -275,6 +277,7 @@ GEM zeitwerk (2.6.16) PLATFORMS + aarch64-linux arm64-darwin-22 arm64-darwin-23 arm64-darwin-24 diff --git a/audiences/gemfiles/rails_7_1.gemfile.lock b/audiences/gemfiles/rails_7_1.gemfile.lock index 9d4140ca..222f0214 100644 --- a/audiences/gemfiles/rails_7_1.gemfile.lock +++ b/audiences/gemfiles/rails_7_1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - audiences (1.5.0) + audiences (1.5.1) rails (>= 6.0) GEM @@ -149,6 +149,8 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) + nokogiri (1.16.6-aarch64-linux) + racc (~> 1.4) nokogiri (1.16.6-arm64-darwin) racc (~> 1.4) nokogiri (1.16.6-x86_64-linux) @@ -294,6 +296,7 @@ GEM zeitwerk (2.6.16) PLATFORMS + aarch64-linux arm64-darwin-23 arm64-darwin-24 x86_64-linux diff --git a/audiences/lib/audiences/version.rb b/audiences/lib/audiences/version.rb index 8fdca287..a56214d5 100644 --- a/audiences/lib/audiences/version.rb +++ b/audiences/lib/audiences/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Audiences - VERSION = "1.5.0" + VERSION = "1.5.1" end diff --git a/audiences/spec/controllers/scim_proxy_controller_spec.rb b/audiences/spec/controllers/scim_proxy_controller_spec.rb index 3ec2ee97..f61e2bd8 100644 --- a/audiences/spec/controllers/scim_proxy_controller_spec.rb +++ b/audiences/spec/controllers/scim_proxy_controller_spec.rb @@ -55,7 +55,7 @@ it "only fetches less sensitive attributes" do expect(resource_query).to( receive(:query) - .with(hash_including(attributes: %w[id externalId displayName photos])) + .with(hash_including(attributes: "id,externalId,displayName,photos")) .and_return({ "response" => "body" }) ) diff --git a/audiences/spec/dummy/app/views/example_owners/_example_owner.html.erb b/audiences/spec/dummy/app/views/example_owners/_example_owner.html.erb index 29434076..6395e4c9 100644 --- a/audiences/spec/dummy/app/views/example_owners/_example_owner.html.erb +++ b/audiences/spec/dummy/app/views/example_owners/_example_owner.html.erb @@ -1,7 +1,7 @@

Name: - <%= example_owner.name %> (<%= example_owner.members.count %> memberships) + <%= example_owner.name %> (<%= example_owner.memberships.count %> memberships)

diff --git a/audiences/spec/dummy/config/initializers/audiences.rb b/audiences/spec/dummy/config/initializers/audiences.rb index cd23fc0e..065f0714 100644 --- a/audiences/spec/dummy/config/initializers/audiences.rb +++ b/audiences/spec/dummy/config/initializers/audiences.rb @@ -10,7 +10,7 @@ headers: { "Authorization" => ENV.fetch("SCIM_AUTHORIZATION", "Bearer 123456789") }, } - config.subscriptions do + config.notifications do subscribe ExampleOwner, job: UpdateMembershipsJob end end