mumukit-login 7.2.0 → 7.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 854e6578d8f00a338d8a83eb3be76e3bdc8640e89e64a77aad1952af176f2678
-  data.tar.gz: 80f4f529115acada7bb63ab400262ec65bb5a704f1d4d926d80002f261beda83
+  metadata.gz: fd902bc892d6881295171b8ddd9502f0ec70da727ade976edb0d399556196f54
+  data.tar.gz: 0e82d8fb0dce8e82ed39ddc2793722446a3f2e10c39f6e021bb55a3cd5004470
 SHA512:
-  metadata.gz: e6e14eda5004dc72b190246d65f578ef13af64acfa4a84800c4e2f90358d5345dfb786378361f3d542d98a6cb9fb2764f001793cb1ba21e0ce00aea5b78e4594
-  data.tar.gz: eaa995969c522a907507239a7436dfdd6adadbc81ed8fef07d9200b8ca76c2c45736eccc0137c94666cb32234fe437d33a8949b63d80cdd02f350c2bb20f3314
+  metadata.gz: b281525c1d8d326de527da48a88440dd3427c43440b8a8306a22cb9701d741a464e610520143999a87193d928bdf41ba826b384e07e8223da590fc35f6618f57
+  data.tar.gz: dd697f2ec90429d7d589d8d5585bdfbd7d2ac46789ec387c961fc381b231fea667c7036fb63eadd8b6e1bbf70f3603dbf0ed860b6c265f12fae3a35b8ca5c3f5

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

@@ -111,3 +111,5 @@ class Mumukit::Login::Mucookie
     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,25 @@
 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: image_url(omniauth.info.image)
+    }.compact
+  end
+
+  def self.image_url(url)
+    url if url.try { size <= 255 }
   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.2.0'
+    VERSION = '7.4.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-login
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.4.3
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-11 00:00:00.000000000 Z
+date: 2020-10-30 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