oauth_im 0.9.1 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c516706747b55e09365f8803351f8a282fa15fc47c7c5dfb0eb8fbd20cea0b5
-  data.tar.gz: dfe17e0f5b654cc518d813ec9c645edcb951b9b8a8111f8360dba5c078639934
+  metadata.gz: 3de11fe5ca4fd11cd2d762e7cde0501b1d2f05310991efe187d20b9f035834e1
+  data.tar.gz: c80dd50d7c7c7f0c1b32f0aab6f9fad43f4a42e0d841d7efd3523786b7710cb9
 SHA512:
-  metadata.gz: 19bbc2692b590850e2b73de9d8c082c200da8b667083715156bbcf80004d43ada5876038c79f2fee12dc0bd2c40b1cae49c5df80074abd75f01fb1d6f1f075e0
-  data.tar.gz: da2dd4a76af69919b00a57e2db4f75ef1ba2b6bf18c4631b71472c3d88eb1729affd4e8d6d7d5facb397cabbde6b395a7093b6b3f59c3cbb739cf130dfd924d2
+  metadata.gz: b9a6298a624e5c4cc51dfda4bd79920d8d729c8cbbdd9f8a7723e95f2e3aac5c69f36fa4d733e18b9b503e65ba9185a37d88362705d8663572f3e5fb60bf02ad
+  data.tar.gz: 05b8f611dc5f111eca6865d2115b26b44abc0ccab2b582b7f9ed9fbf3e3f70b8f5e0a1930fb557c70772f128394fd057ca90983f2b7f8c4acaac4ce8de9508d7

data/README.md

@@ -139,6 +139,15 @@ After many false starts, this repo includes two (seemingly functional) github wo
 
 ## Version History
 
+### 0.9.3
+* added specs for AppContext initializer
+
+### 0.9.2
+* Fix redirect url
+  * No longer does it take user back to page they were on
+  * This caused problems with FusionAuth which wants all redirect URLs whitelisted
+* Update initializer defaults
+
 ### 0.9.1
 * Facilitate specs for privileged users by providing spec_user_data on AppContext
 

data/app/controllers/concerns/oauth_im/authenticable.rb

@@ -12,10 +12,12 @@ module OauthIm
     private
 
     delegate :email, :email_verified?,
-             :user_privileges,
+             :user_is_sponsor?,
              to: :user_client,
              allow_nil: true
 
+    delegate :spec_user, :spec_user_is_sponsor?, to: AppContext
+
     def authenticated?
       AppContext.authenticated_for_specs? ||
         (AppContext.provide_authentication? && logged_in?)
@@ -32,10 +34,10 @@ module OauthIm
 
     def current_user
       @current_user ||=
-        if user_jwt.present?
+        if Rails.env.test?
+          spec_user
+        elsif user_jwt.present?
           email if email_verified?
-        elsif Rails.env.test?
-          AppContext.spec_user
         end
     end
 

data/app/services/oauth_im/request_client.rb

@@ -13,9 +13,7 @@ module OauthIm
     end
 
     def logout_url
-      @logout_url ||= "#{idp_url}/oauth2/logout" \
-                      "?post_logout_redirect_uri=#{return_to_url}" \
-                      "&client_id=#{client_id}"
+      @logout_url ||= "#{idp_url}/oauth2/logout?client_id=#{client_id}"
     end
 
     def user_jwt

data/app/services/oauth_im/user_client.rb

@@ -19,8 +19,8 @@ module OauthIm
       email.present?
     end
 
-    def user_privileges
-      @user_privileges ||= data[:privileges] || []
+    def user_is_sponsor?
+      data[:sponsor].eql?('true')
     end
 
     private

data/config/initializers/app_context.rb

@@ -1,36 +1,57 @@
 # frozen_string_literal: true
 
 module AppContext
-  def self.provide_authentication?
+  module_function
+
+  TEST_ENV_ERROR_MESSAGE = 'Use only in test environment!'
+
+  def override_for_specs?
+    Rails.env.test? && provide_authentication?
+  end
+
+  def provide_authentication?
     true
   end
 
-  def self.spec_user
+  def provide_auth_routes?
+    provide_authentication?
+  end
+
+  def spec_user
     @spec_user if override_for_specs?
   end
 
-  def self.authenticated_for_specs?
-    @authenticated_for_specs if override_for_specs?
+  def spec_user_is_sponsor?
+    @spec_user_is_sponsor && override_for_specs?
   end
 
-  def self.spec_user_data
-    override_for_specs? ? (@spec_user_data.presence || {}) : {}
+  def authenticated_for_specs?
+    @authenticated_for_specs && override_for_specs?
   end
 
-  def self.override_for_specs?
-    Rails.env.test? && provide_authentication?
+  def authenticate_for_specs?
+    raise TEST_ENV_ERROR_MESSAGE unless Rails.env.test?
+
+    provide_authentication?
   end
 
-  def self.authenticate_for_specs(spec_user: nil, spec_user_data: {})
-    return unless provide_authentication?
-    raise 'Use only in test environment!!' unless Rails.env.test?
+  def authenticate_for_specs(spec_user: nil, sponsor: false)
+    return unless authenticate_for_specs?
 
-    @authenticated_for_specs = true
-    @spec_user               = spec_user
-    @spec_user_data          = spec_user_data
+    initialize_spec_user spec_user: spec_user, sponsor: sponsor
     yield
-    @privileged_for_specs    = false
-    @spec_user_data          = {}
+    reset_spec_user
+  end
+
+  def initialize_spec_user(spec_user:, sponsor:)
+    @spec_user               = spec_user
+    @spec_user_is_sponsor    = sponsor
+    @authenticated_for_specs = true
+  end
+
+  def reset_spec_user
     @authenticated_for_specs = false
+    @spec_user               = nil
+    @spec_user_is_sponsor    = false
   end
 end

data/lib/oauth_im/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OauthIm
-  VERSION = '0.9.1'
+  VERSION = '0.9.4'
 end

data/lib/oauth_im.rb

@@ -12,13 +12,10 @@ module OauthIm
   DEFAULT_AUTH_AUTHORIZE_URL  = '/oauth2/authorize'
   DEFAULT_AUTH_CALLBACK_ROUTE = 'callback'
   DEFAULT_AUTH_TOKEN_URL      = '/oauth2/token'
-  DEFAULT_AUTH_IDP_URL        = 'https://illustrativemath-dev.fusionauth.io'
   DEFAULT_AUTH_ISS_DOMAIN     = 'illustrativemathematics.org'
-  DEFAULT_AUTH_API_KEY        = nil
-  DEFAULT_AUTH_CLIENT_ID      = nil
-  DEFAULT_AUTH_CLIENT_SECRET  = nil
-  DEFAULT_AUTH_HMAC           = nil
-  DEFAULT_AUTH_RSA_PUBLIC     = nil
+  DEFAULT_AUTH_IDP_URL_LIVE   = 'https://login.illustrativemathics.org'
+  DEFAULT_AUTH_IDP_URL_TEST   = 'https://illustrativemath-dev.fusionauth.io'
+  DEFAULT_AUTH_IDP_URL        = DEFAULT_AUTH_IDP_URL_TEST
 
   class << self
     attr_reader :configuration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth_im
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.4
 platform: ruby
 authors:
 - Eric Connally
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusionauth_client