Skip to content

feat: add request ip to user context#80

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

Merged
matthv merged 7 commits into from
Oct 28, 2024
Merged

feat: add request ip to user context #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9746c02
refactor: test collections route
matthv Oct 17, 2024
d3748ec
refactor: remove pascal_case on operators
matthv Oct 17, 2024
e60dbdb
refactor: move validation condition_tree from list to query_string_pa…
matthv Oct 24, 2024
c60b764
chore: lint
matthv Oct 24, 2024
32b0288
feat: add request ip to caller
matthv Oct 24, 2024
af1c7c0
chore: update tests
matthv Oct 24, 2024
c3236f4
fix: test
matthv Oct 28, 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
3 changes: 0 additions & 3 deletions packages/forest_admin_agent/lib/forest_admin_agent/routes/resources/list.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ module Routes
module Resources
class List < AbstractAuthenticatedRoute
include ForestAdminDatasourceToolkit::Components::Query::ConditionTree
include ForestAdminDatasourceToolkit::Validations

def setup_routes
add_route('forest_list', 'get', '/:collection_name', ->(args) { handle_request(args) })
Expand All@@ -31,8 +30,6 @@ def handle_request(args = {})
segment: ForestAdminAgent::Utils::QueryStringParser.parse_segment(@collection, args)
)

ConditionTreeValidator.validate(filter.condition_tree, @collection) if filter.condition_tree

projection = ForestAdminAgent::Utils::QueryStringParser.parse_projection_with_pks(@collection, args)
records = @collection.list(@caller, filter, projection)

Expand Down
1 change: 1 addition & 0 deletions packages/forest_admin_agent/lib/forest_admin_agent/utils/query_string_parser.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ def self.parse_caller(args)
)[0]
token_data.delete('exp')
token_data[:timezone] = timezone
token_data[:request] = { ip: args[:headers]['action_dispatch.remote_ip'].to_s }

Caller.new(**token_data.transform_keys(&:to_sym))
end
Expand Down
3 changes: 2 additions & 1 deletion packages/forest_admin_datasource_customizer/spec/shared/caller.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,8 @@
tags: [],
timezone: 'Europe/Paris',
permission_level: 'admin',
role: 'dev'
role: 'dev',
request: { ip: '127.0.0.1' }
)
end
end
4 changes: 3 additions & 1 deletion .../forest_admin_datasource_toolkit/lib/forest_admin_datasource_toolkit/components/caller.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,8 @@ def initialize(
tags:,
timezone:,
permission_level:,
role: nil
role: nil,
request: {}
)
@id = id
@email = email
Expand All@@ -25,6 +26,7 @@ def initialize(
@timezone = timezone
@permission_level = permission_level
@role = role
@request = request
end
end
end
Expand Down
3 changes: 2 additions & 1 deletion ...spec/lib/forest_admin_datasource_toolkit/components/contracts/collection_contract_spec.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,8 @@ module Contracts
tags: {},
timezone: 'Europe/Paris',
role: 1,
permission_level: 'admin'
permission_level: 'admin',
request: { ip: '127.0.0.1' }
)
end

Expand Down
3 changes: 2 additions & 1 deletion packages/forest_admin_datasource_toolkit/spec/shared/caller.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,8 @@
tags: [],
timezone: 'Europe/Paris',
permission_level: 'admin',
role: 'dev'
role: 'dev',
request: { ip: '127.0.0.1' }
)
end
end