mumukit-login 7.1.1 → 7.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f422707e8eea054a21834b6eabb5dbd3b05a3377fdb9b92b535930c57c481c0a
-  data.tar.gz: ccddd35d16e208dc05480aef339f873b7efc62896c517592735d1a999da1516d
+  metadata.gz: 9936c36470aad69a4573c77067305f4f1cc689657f3e853cad2c67fa9cf655db
+  data.tar.gz: 13566888f54e440dd75d6122262aaf66cd8e4e817d35433db9d1a62565172b94
 SHA512:
-  metadata.gz: b3a1f0475077b97e231aea878ff9ac6458169dcb2655e12c5833534d5147fe3961ae7832d60f7bef30e65c6005914699426efc437d11c85bcd837abdd0eb110c
-  data.tar.gz: dba412a31851abbeea17ff776be7b921d8a0b4c08c9f10f23b4aaf8cc7ade9715d61bdb84aa9b8e581e833d0f74752611daaaaa3fad66a3703de617f71ed605e
+  metadata.gz: 416fd94bf5d2344ea837a8edca52ef9e023b72e4b7b67af45a70c5bd6d4b95a0d456d5f0260c207a0a41a2ee714569998ebdb117da1816c6d6064d09bedcf39d
+  data.tar.gz: 8f7bd5f3152b4624de431567f937facb9a57cdb2c7fd5782c970ad4e8db034e9c11671cb000a8e9361f25542b6a1c7f609664b65eccdedca12eaef7fa00fc657

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

@@ -19,6 +19,7 @@ module Mumukit::Login::LoginControllerHelpers
 
   def logout_current_user!
     destroy_current_user_session!
+    login_provider.destroy_session! mumukit_controller
     origin_redirector.redirect_after_logout!
   end
 

data/lib/mumukit/login/mucookie.rb

@@ -6,11 +6,10 @@ class Mumukit::Login::Mucookie
   end
 
   def write!(key, value, options={})
-    @controller.write_cookie! cookie_name(key),
-                              spec.merge(
-                                value: value.to_s,
-                                httponly: !!options[:httponly],
-                                same_site: self.class.cookie_same_site)
+    do_write! cookie_name(key),
+              spec.merge(
+                value: value.to_s,
+                httponly: !!options[:httponly])
   end
 
   def encrypt_and_write!(key, value, options={})
@@ -22,7 +21,7 @@ class Mumukit::Login::Mucookie
   end
 
   def read(key)
-    @controller.read_cookie cookie_name(key)
+    do_read!(cookie_name(key))
   end
 
   def decrypt_and_read(key)
@@ -34,7 +33,7 @@ class Mumukit::Login::Mucookie
   end
 
   def delete!(key)
-    @controller.delete_cookie! cookie_name(key), Mumukit::Login.config.mucookie_domain
+    do_delete! cookie_name(key), Mumukit::Login.config.mucookie_domain
   end
 
   def spec
@@ -55,6 +54,22 @@ class Mumukit::Login::Mucookie
 
   private
 
+  # Support for legacy browsers
+  # Duplicate write / read / delete cookies without samesite for old browsers that do not allow for SameSite=None attribute
+  def do_write!(cookie_name, spec)
+    @controller.write_cookie! cookie_name, spec.merge(same_site: self.class.cookie_same_site)
+    @controller.write_cookie! "#{cookie_name}_legacy", spec
+  end
+
+  def do_delete!(cookie_name, domain)
+    @controller.delete_cookie! cookie_name, domain
+    @controller.delete_cookie! "#{cookie_name}_legacy", domain
+  end
+
+  def do_read!(cookie_name)
+    @controller.read_cookie(cookie_name) || @controller.read_cookie("#{cookie_name}_legacy")
+  end
+
   def cookie_name(key)
     "mucookie_#{key}"
   end
@@ -95,5 +110,6 @@ class Mumukit::Login::Mucookie
       value.try { |it| encryptor.decrypt_and_verify it }
     end
   end
-
 end
+
+require_relative 'mucookie/store'

data/lib/mumukit/login/mucookie/store.rb

@@ -0,0 +1,14 @@
+require 'action_dispatch'
+
+class Mumukit::Login::Mucookie::Store < ActionDispatch::Session::CookieStore
+  def set_cookie(request, session_id, cookie)
+    cookie.merge! same_site: :none if on_embeddable_organization?(request)
+    super
+  end
+
+  private
+
+  def on_embeddable_organization?(request)
+    Mumukit::Platform::Organization.find_by_name!(request.cookies['mucookie_login_organization']).embeddable? rescue false
+  end
+end

data/lib/mumukit/login/profile.rb

@@ -1,15 +1,21 @@
 module Mumukit::Login::Profile
   def self.from_omniauth(omniauth)
-    struct provider: omniauth.provider,
-           first_name: omniauth.info.first_name,
-           last_name: omniauth.info.last_name,
-           social_id: omniauth.uid,
-           email: omniauth.info.email,
-           uid: generate_uid(omniauth),
-           image_url: omniauth.info.image
+    struct profile_hash(omniauth)
+  end
+
+  def self.profile_hash(omniauth)
+    {
+      provider: omniauth.provider,
+      first_name: omniauth.info.first_name,
+      last_name: omniauth.info.last_name,
+      social_id: omniauth.uid,
+      email: omniauth.info.email,
+      uid: generate_uid(omniauth),
+      image_url: omniauth.info.image
+    }.compact
   end
 
   def self.generate_uid(omniauth)
-    omniauth.info.email || omniauth.uid
+    Mumukit::Login::Provider.parse_login_provider(omniauth.provider).uid_for_profile(omniauth)
   end
 end

data/lib/mumukit/login/provider.rb

@@ -46,7 +46,7 @@ module Mumukit::Login::Provider
   end
 
   def self.parse_login_provider(login_provider)
-    if enabled_providers.include? login_provider
+    if enabled_providers.include?(login_provider.to_s)
       "Mumukit::Login::Provider::#{login_provider.capitalize}".constantize.new
     else
       raise "Unknown login_provider `#{login_provider}`"

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

@@ -45,6 +45,9 @@ class Mumukit::Login::Provider::Base
     nil
   end
 
+  def destroy_session!(_controller)
+  end
+
   def setup_proc
     proc do |env|
       options = env['omniauth.strategy'].options
@@ -75,6 +78,13 @@ class Mumukit::Login::Provider::Base
     {}
   end
 
+  def finalize_user_creation!(_user)
+  end
+
+  def uid_for_profile(omniauth)
+    omniauth.info.email || omniauth.uid
+  end
+
   private
 
   def setup_phase_login_settings(env)

data/lib/mumukit/login/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Login
-    VERSION = '7.1.1'
+    VERSION = '7.4.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-login
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.4.2
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 description: 
 email:
 - franco@mumuki.org
@@ -257,6 +271,7 @@ files:
 - lib/mumukit/login/helpers/login_settings_helpers.rb
 - lib/mumukit/login/helpers/organization_helpers.rb
 - lib/mumukit/login/mucookie.rb
+- lib/mumukit/login/mucookie/store.rb
 - lib/mumukit/login/origin_redirector.rb
 - lib/mumukit/login/profile.rb
 - lib/mumukit/login/provider.rb
@@ -290,8 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Library for login mumuki requests