mumukit-login 6.1.3 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc75ada29a39f0529db440916684fc738bcad0f5df7bb7f6c08b66ff095cc0ec
-  data.tar.gz: d3057603ef94b83965f10b7740aa8b84b618015218f13129ff95ed5b60b00157
+  metadata.gz: 37959b71c7f72904623b2db83e2f2562552687236ad5bab307e6ae3c199e5d92
+  data.tar.gz: 18ea3556374cf43691c12fcb078d40e94dd3d52118ad3429ac41576efa3d7354
 SHA512:
-  metadata.gz: 3d8f380752de6a1764a01a6060b5a2864bfd7fc4e8605015bf4261625fdd82b3cf2e90ae0bd711edbb5d325a4187e6bd3b9c35937bfdeaf49c65eb06906cf10e
-  data.tar.gz: 4c095af1ab8b0ea0d9d7109b4f1cbb6693699c1c27a5e394e74448b86c090a5f82757217a1053ac00cab58ceb0396687b3f1459bc04fc5d8c02e3390e9d04bde
+  metadata.gz: 1f37dc8fa5ff59eaa930ebfcbb4b47f8221bb04b61b90b55bf3a0c9b813540b13ccb152235ebe70f892a2d52a4c7442a490b2e3c2c3d3778f2687592ae4508e4
+  data.tar.gz: 1790e80e4e86c17ead8decc5f0792222b7353bfe9f0feb8177ee669f7b59cb8a100411916debf68934e67fd86b28958723a8585f5cab0311ab0e9556a1396328

data/lib/mumukit/login/helpers/login_controller_helpers.rb

@@ -1,6 +1,7 @@
 module Mumukit::Login::LoginControllerHelpers
 
   def login_current_user!
+    mumukit_controller.write_cookie!(:login_organization, organization_name)
     origin_redirector.save_after_login_location!
     if current_user?
       origin_redirector.redirect_after_login!

data/lib/mumukit/login/provider/base.rb

@@ -48,17 +48,12 @@ class Mumukit::Login::Provider::Base
   def setup_proc
     proc do |env|
       options = env['omniauth.strategy'].options
-
-      effective_settings = default_settings.to_h.merge(current_organization_settings)
+      effective_settings = default_settings.to_h.merge(setup_phase_login_settings(env))
       options.merge!(effective_settings)
       options.merge!(computed_settings(effective_settings.to_struct))
     end
   end
 
-  def current_organization_settings
-    Mumukit::Platform::Organization.current.login_provider_settings || {}
-  end
-
   # Default provider settings that come from the environment
   #
   # Override this method in order to read ENV and in order to provide default settings
@@ -82,6 +77,18 @@ class Mumukit::Login::Provider::Base
 
   private
 
+  def setup_phase_login_settings(env)
+    organization_login_settings_for setup_phase_login_organization_name(env)
+  end
+
+  def setup_phase_login_organization_name(env)
+    Rack::Request.new(env).cookies['login_organization']
+  end
+
+  def organization_login_settings_for(name)
+    Mumukit::Platform::Organization.find_by_name!(name).login_provider_settings || {}
+  end
+
   def create_uri(path, query_values)
     uri = Addressable::URI.heuristic_parse path
     uri.query_values = query_values if query_values.present?

data/lib/mumukit/login/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Login
-    VERSION = '6.1.3'
+    VERSION = '6.1.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-login
 version: !ruby/object:Gem::Version
-  version: 6.1.3
+  version: 6.1.4
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli