prx_auth-rails 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 593c20d8991992610c9a7e73cf0ffe4062ba0f94d26cdf36861183e5f5fc911d
-  data.tar.gz: 75d29effb6538795f0f1ca09a23081a2f8931e6230aa9b570b3abc12b2c3b9c6
+  metadata.gz: c5fa7d307b06ba38bd7e6470e518ef3b79b15ede1906357ef4da052d4fe6129a
+  data.tar.gz: b270fbc57d267228eefc280d5143bc4d068cdc3b5443d399f237306b0013a172
 SHA512:
-  metadata.gz: 62cadaa6c14ec9950eb4564625bec317ea7181456884176afbd18315cb64b0736b34102302b3c228077b55ac7027857fcfb40e5be352e0adb500cd1a46d9ae71
-  data.tar.gz: 3105d11533f4260c785c57aa16cf34939926de93728c13975d678eae2917bb9c648c77344a5934cffd537578fd318d05914ebf5ce9ad0d0a7ee63b488507c96d
+  metadata.gz: d59f7ae5461c443b57763c65799bda32a99bb9fb044dc1b8d1fdc174f6ed1ee9ddc3859c826a2472a5e73a953c27670802c155fb1be71bb2f4f326ce00ffb3f8
+  data.tar.gz: 03c30f8e133051bc12f3b32e3dd4573d2ed1c397c00cd00c66886d4d792225754788157c74e45809676e468f1ceeb03c3819a267cfd3e6ed804e73dd8ca7434b

data/app/controllers/prx_auth/rails/sessions_controller.rb

@@ -17,15 +17,10 @@ module PrxAuth::Rails
         client_id: config.prx_client_id,
         nonce: fetch_nonce,
         response_type: "id_token token",
-        scope: "#{DEFAULT_SCOPES} #{config.prx_scope}".strip,
+        scope: "#{DEFAULT_SCOPES} #{session_scopes}".strip,
+        account: session_wildcard,
         prompt: "necessary"
-      }
-
-      if session[WILDCARD_SESSION_KEY]
-        id_auth_params[:account] = "*"
-        # TODO: what if they need more than _just_ read-private?
-        id_auth_params[:scope] = "#{DEFAULT_SCOPES} read-private" if session[WILDCARD_SESSION_KEY] == "readonly"
-      end
+      }.compact
 
       url = "//" + config.id_host + "/authorize?" + id_auth_params.to_query
 
@@ -138,5 +133,19 @@ module PrxAuth::Rails
     def id_host
       PrxAuth::Rails.configuration.id_host
     end
+
+    def session_scopes
+      if ["true", "1", ""].include?(session[WILDCARD_SESSION_KEY].to_s)
+        PrxAuth::Rails.configuration.prx_scope
+      elsif session[WILDCARD_SESSION_KEY] == "readonly"
+        "read-private"
+      else
+        session[WILDCARD_SESSION_KEY]
+      end
+    end
+
+    def session_wildcard
+      "*" if session[WILDCARD_SESSION_KEY]
+    end
   end
 end

data/lib/prx_auth/rails/ext/controller/account_info.rb

@@ -37,7 +37,7 @@ module PrxAuth
       end
 
       def fetch_accounts(ids)
-        ids_param = ids.map(&:to_s).join(",")
+        ids_param = ids.join(",")
         path = "/api/v1/accounts?account_ids=#{ids_param}"
         url = "https://#{PrxAuth::Rails.configuration.id_host}#{path}"
 

data/lib/prx_auth/rails/token.rb

@@ -29,6 +29,14 @@ class PrxAuth::Rails::Token
     @token_data.user_id
   end
 
+  def issued_at
+    @token_data.issued_at
+  end
+
+  def expiration_time
+    @token_data.expiration_time
+  end
+
   def authorized_account_ids(scope)
     @token_data.authorized_account_ids(scope)
   end

data/lib/prx_auth/rails/version.rb

@@ -2,6 +2,6 @@
 
 module PrxAuth
   module Rails
-    VERSION = "5.1.1"
+    VERSION = "5.2.0"
   end
 end

data/prx_auth-rails.gemspec

@@ -26,11 +26,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "m", "~> 1.5"
+  spec.add_development_dependency "minitest-mock"
   spec.add_development_dependency "rails", "~> 8.0.1"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "standard"
 
-  spec.add_runtime_dependency "prx_auth", ">= 1.8.0"
+  spec.add_runtime_dependency "prx_auth", ">= 1.8.2"
 end

data/test/prx_auth/rails/sessions_controller_test.rb

@@ -45,8 +45,13 @@ module PrxAuth::Rails
       session[@wildcard_key] = "true"
       get :new
       assert response.code == "302"
-      assert_includes response.location, "scope=openid"
+      assert_includes response.location, "scope=openid+apps+feeder%3A%2A"
       assert_includes response.location, "account=%2A"
+
+      session[@wildcard_key] = "feeder:whatev"
+      get :new
+      assert response.code == "302"
+      assert_includes response.location, "scope=openid+apps+feeder%3Awhatev"
     end
 
     test "create should validate a token and set the session variable" do

data/test/test_helper.rb

@@ -3,6 +3,7 @@ require "coveralls"
 Coveralls.wear!
 
 require "minitest/autorun"
+require "minitest/mock"
 require "minitest/spec"
 require "minitest/pride"
 require "webmock/minitest"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: prx_auth-rails
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0
 platform: ruby
 authors:
 - Chris Rhoden
 bindir: bin
 cert_chain: []
-date: 2025-05-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -107,6 +107,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: minitest-mock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -183,14 +197,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.2
 description: Rails integration for next generation PRX Authorization system.
 email:
 - carhoden@gmail.com
@@ -305,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Rails integration for next generation PRX Authorization system.
 test_files: []