mumukit-login 4.4.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6830bf41ebf3fdf46258a49da9567bf67ceafff303dd9117b3485a8a6ea5faf2
-  data.tar.gz: ad9bd5fb469e863c651015dc562179bba1bd4479efc76e80a90e28c9ad62d59c
+  metadata.gz: 8d27bffe5261f65a85d9f6491afff8dde964f88ef128fa2c16679d7b53304689
+  data.tar.gz: a91ab61c156b87d045cad2cf6bc2d2303381e13acb020f19a9321b938436ee09
 SHA512:
-  metadata.gz: f0c22ad75903e2d1cd7cae074d8284af25b29e4f6ca830d42e08cdc5f5c31663464a1f12eb3f7df8815e52bb54221d6d53711b297c859f701351b8535b541f7b
-  data.tar.gz: 2802494267876c9e61404de855faff8730e091f788063803934c7040cb8adcbcc93cab38c7ec08896ad0bc45a37efec43b49196658370697db673dbd02923065
+  metadata.gz: c5805828098db5b30cf98be8c72036e0a3d357161035976ce2e05a157ff05fc1d03c90416b6d7b4ec2dcee95aa9ed9161280fa14264509cd784bacc6c940b2e4
+  data.tar.gz: e0f65ecdee8524ee615f5b705df973f1328156ef13dc80b163ee423839ee004abef8556295955633ecde2bf2af1304cf5349351eac8de00e2b012a5e4286baf1

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

@@ -9,7 +9,7 @@ module Mumukit::Login::AuthenticationHelpers
   end
 
   def current_user
-    @current_user ||= Mumukit::Login.config.user_class.find_by_uid!(current_user_uid) if current_user?
+    @current_user ||= Mumukit::Platform::User.find_by_uid!(current_user_uid) if current_user?
   end
 
   private
@@ -39,4 +39,4 @@ module Mumukit::Login::AuthenticationHelpers
   def login_provider
     Mumukit::Login.config.provider
   end
-end
+end

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

@@ -11,7 +11,7 @@ module Mumukit::Login::LoginControllerHelpers
 
   def callback_current_user!
     profile = Mumukit::Login::Profile.from_omniauth(mumukit_controller.env['omniauth.auth'])
-    user = Mumukit::Login.config.user_class.for_profile profile
+    user = Mumukit::Platform.user_class.for_profile profile
     save_current_user_session! user
     origin_redirector.redirect_after_login!
   end

data/lib/mumukit/login/helpers.rb

@@ -1,4 +1,3 @@
 require_relative './helpers/authentication_helpers'
 require_relative './helpers/authorization_helpers'
 require_relative './helpers/login_controller_helpers'
-require_relative './helpers/user_permissions_helpers'

data/lib/mumukit/login/settings.rb

@@ -68,3 +68,17 @@ class Mumukit::Login::Settings
     [:user_pass]
   end
 end
+
+class Mumukit::Platform::Organization::Settings < Mumukit::Platform::Model
+  def login_settings
+    @login_settings ||= Mumukit::Login::Settings.new(login_methods)
+  end
+
+  def customized_login_methods?
+    login_methods.size < Mumukit::Login::Settings.login_methods.size
+  end
+
+  def inconsistent_public_login?
+    customized_login_methods? && public?
+  end
+end

data/lib/mumukit/login/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Login
-    VERSION = '4.4.0'
+    VERSION = '5.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-login
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,22 +182,16 @@ dependencies:
   name: mumukit-platform
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.1'
 description: 
 email:
 - franco@mumuki.org
@@ -218,7 +212,6 @@ files:
 - lib/mumukit/login/helpers/authentication_helpers.rb
 - lib/mumukit/login/helpers/authorization_helpers.rb
 - lib/mumukit/login/helpers/login_controller_helpers.rb
-- lib/mumukit/login/helpers/user_permissions_helpers.rb
 - lib/mumukit/login/mucookie.rb
 - lib/mumukit/login/origin_redirector.rb
 - lib/mumukit/login/profile.rb
@@ -252,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Library for login mumuki requests

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

@@ -1,14 +0,0 @@
-module Mumukit::Login::UserPermissionsHelpers
-  delegate :has_role?,
-           :add_permission!,
-           :remove_permission!,
-           :has_permission?,
-           :has_permission_delegation?,
-           :protect!,
-           :protect_delegation!,
-           :protect_permissions_assignment!, to: :permissions
-
-  def merge_permissions!(new_permissions)
-    self.permissions = permissions.merge(new_permissions)
-  end
-end