Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix default attributes #462

Merged
merged 4 commits into from
Dec 12, 2024
Merged

fix default attributes #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e208dc
Fix proxy attributes
xjunior Dec 12, 2024
458d652
Fix notifications setup
xjunior Dec 12, 2024
00ca8cf
Bump version
xjunior Dec 12, 2024
454120f
Tests
xjunior Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion audiences/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
audiences (1.5.0)
audiences (1.5.1)
rails (>= 6.0)

GEM
Expand Down
2 changes: 1 addition & 1 deletion audiences/app/controllers/audiences/scim_proxy_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 4 additions & 0 deletions audiences/docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
5 changes: 4 additions & 1 deletion audiences/gemfiles/rails_6_1.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ..
specs:
audiences (1.5.0)
audiences (1.5.1)
rails (>= 6.0)

GEM
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -276,6 +278,7 @@ GEM
zeitwerk (2.6.16)

PLATFORMS
aarch64-linux
arm64-darwin-22
arm64-darwin-23
arm64-darwin-24
Expand Down
5 changes: 4 additions & 1 deletion audiences/gemfiles/rails_7_0.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ..
specs:
audiences (1.5.0)
audiences (1.5.1)
rails (>= 6.0)

GEM
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -275,6 +277,7 @@ GEM
zeitwerk (2.6.16)

PLATFORMS
aarch64-linux
arm64-darwin-22
arm64-darwin-23
arm64-darwin-24
Expand Down
5 changes: 4 additions & 1 deletion audiences/gemfiles/rails_7_1.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ..
specs:
audiences (1.5.0)
audiences (1.5.1)
rails (>= 6.0)

GEM
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -294,6 +296,7 @@ GEM
zeitwerk (2.6.16)

PLATFORMS
aarch64-linux
arm64-darwin-23
arm64-darwin-24
x86_64-linux
Expand Down
2 changes: 1 addition & 1 deletion audiences/lib/audiences/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module Audiences
VERSION = "1.5.0"
VERSION = "1.5.1"
end
2 changes: 1 addition & 1 deletion audiences/spec/controllers/scim_proxy_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" })
)

Expand Down
2 changes: 1 addition & 1 deletion audiences/spec/dummy/app/views/example_owners/_example_owner.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div id="<%= dom_id example_owner %>">
<p>
<strong>Name:</strong>
<%= example_owner.name %> (<%= example_owner.members.count %> memberships)
<%= example_owner.name %> (<%= example_owner.memberships.count %> memberships)
</p>

</div>
2 changes: 1 addition & 1 deletion audiences/spec/dummy/config/initializers/audiences.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
headers: { "Authorization" => ENV.fetch("SCIM_AUTHORIZATION", "Bearer 123456789") },
}

config.subscriptions do
config.notifications do
subscribe ExampleOwner, job: UpdateMembershipsJob
end
end
Loading