panda_pal 5.14.0.beta7 → 5.14.0.beta8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 762a0d4a45e1c9e5c94e9a67303b9adfd7f437742d3b000b5216cda9f901ae0e
4
- data.tar.gz: fc798c502cfc2218ef88f8286c05c9434e7e8b5a6835a2d643619b11e1ba8c21
3
+ metadata.gz: 96e6b46ee78bbd2cec669b0a996af2731f2993869e17b8a911251ed58ff032e8
4
+ data.tar.gz: d166c1cce9c738d7b273f9a634cd0b0e315d938fb8950156e43870fdc8230d30
5
5
  SHA512:
6
- metadata.gz: 3b2d5f5342348f0e99dfbb8382c00e396e5f1c82f8d22721b5e0f725b65d0c3877c27b17b6a74ef292619840a05ff284de0f37161290a2ce08199cb87a31d997
7
- data.tar.gz: 1883e69179dc592d45b243e944934df02e298315fd7e5806b17a406da4557f9b9c7ffc5de7cb4559d7b687f97e09154fbd95de220a9f482fec37fd1b7def7fed
6
+ metadata.gz: cbe53c4546c8ef0d7552a2fc25e8522ccaf64d290a68802dee2b53525ef25d76e677870e9f9a05232eebcf20acb5e85a9d230afcfb2b03c56a68aec9b40d6202
7
+ data.tar.gz: 39bfddb95032c0070c3776b998536fd83fca8b013d3a0b6b4438889c57f7b26f52ee3394dfed124d9565a38f41a34c8e7e6b2fab329aba4816ed39cbbb809ede
@@ -220,18 +220,19 @@ Apartment.configure do |config|
220
220
  end
221
221
 
222
222
  Rails.application.config.middleware.use Apartment::Elevators::Generic, lambda { |request|
223
- if match = request.path.match(/\/(?:orgs?|organizations?)\/(\d+)/)
224
- PandaPal::Organization.find_by(id: match[1]).try(:tenant_name)
225
- elsif match = request.path.match(/\/(?:orgs?|organizations?|o)\/(\w+)/)
226
- PandaPal::Organization.find_by(name: match[1]).try(:tenant_name)
227
- elsif (panda_token = PandaPal::Helpers::SessionReplacement.extract_panda_token(request)).present?
228
- header, sig = panda_token.split('.')
229
- # This is just switching the tenant. Auth should be performed elsewhere (eg via `forbid_access_if_lacking_session`/`valid_session?`).
230
- decoded_header = JSON.parse(Base64.urlsafe_decode64(header))
231
- PandaPal::Organization.find_by(id: decoded_header['o']).try(:tenant_name)
232
- elsif request.path.start_with?('/rails/active_storage/blobs/')
233
- PandaPal::Organization.find_by(id: request.params['organization_id']).try(:tenant_name)
234
- end
223
+ tenant = if match = request.path.match(/\/(?:orgs?|organizations?)\/(\d+)/)
224
+ PandaPal::Organization.find_by(id: match[1]).try(:tenant_name)
225
+ elsif match = request.path.match(/\/(?:orgs?|organizations?|o)\/(\w+)/)
226
+ PandaPal::Organization.find_by(name: match[1]).try(:tenant_name)
227
+ elsif (panda_token = PandaPal::Helpers::SessionReplacement.extract_panda_token(request)).present?
228
+ header, sig = panda_token.split('.')
229
+ # This is just switching the tenant. Auth should be performed elsewhere (eg via `forbid_access_if_lacking_session`/`valid_session?`).
230
+ decoded_header = JSON.parse(Base64.urlsafe_decode64(header))
231
+ PandaPal::Organization.find_by(id: decoded_header['o']).try(:tenant_name)
232
+ elsif request.path.start_with?('/rails/active_storage/blobs/')
233
+ PandaPal::Organization.find_by(id: request.params['organization_id']).try(:tenant_name)
234
+ end
235
+ tenant || 'public'
235
236
  }
236
237
 
237
238
  module PandaPal::Plugins::ApartmentCache
@@ -1,3 +1,3 @@
1
1
  module PandaPal
2
- VERSION = "5.14.0.beta7"
2
+ VERSION = "5.14.0.beta8"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: panda_pal
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.14.0.beta7
4
+ version: 5.14.0.beta8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Instructure CustomDev