mumukit-auth 7.5.2 → 7.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a233658a7f1e3cfb135b4a483349e9fe38e20d92a5bf8a97040ccc618640c077
-  data.tar.gz: 0664fea5f198d4870f21c681f1e42e36df4d4081735e4844edc0891211ffe5a2
+  metadata.gz: 6e2864d6f9f4aa09030ed3d4a71f1235edb1e3d96ab88d519d1abdc57eede221
+  data.tar.gz: 4184f9c764bd8d54d9c93351fbf0f087df2086cd69ec7244d21a9f1031ee95f0
 SHA512:
-  metadata.gz: 836d44fcc5880cbc22268a9705e4f4d5a9f77256d7de7a84851356ce7da06daf5b5da0bea28b56a7aebabd1b89109b9e556e6af728ea6edbb923cc13e67e8d37
-  data.tar.gz: d8860943ad2c1da1190189664deaeb73681abf3543c93e219b7c563eb1c27d998954678ef70da2de6b7c22e4332115af612b7aea31db325b27d08aba10e9ebef
+  metadata.gz: d6a0ee484b131da39f8590d58973f98193e05f55e958326f299602e5e97c91882132ba69116f6e96ad5a7d25994c2cd4b527779f697e237a022f43197ffe8367
+  data.tar.gz: 0a4f659f95f3592ae4c26b286fd58c58869f071907c3ead1df0f979b5b8ea1a4b04fd6078346b3814f50d3b847eb9791dc0adc8dd01c1265a99a740e8ce0e277

data/lib/mumukit/auth/grant.rb

@@ -59,11 +59,11 @@ module Mumukit::Auth
 
   class FirstPartGrant < Grant
     def initialize(first)
-      @first = first.downcase
+      @first = first.parameterize
     end
 
     def allows?(resource_slug)
-      resource_slug.to_mumukit_slug.match_first @first
+      resource_slug.to_mumukit_slug.normalize!.match_first @first
     end
 
     def to_s
@@ -77,16 +77,16 @@ module Mumukit::Auth
 
   class SingleGrant < Grant
     def initialize(slug)
-      @slug = slug
+      @slug = slug.normalize
     end
 
     def allows?(resource_slug)
-      resource_slug = resource_slug.to_mumukit_slug
+      resource_slug = resource_slug.to_mumukit_slug.normalize!
       resource_slug.match_first(@slug.first) && resource_slug.match_second(@slug.second)
     end
 
     def to_s
-      @slug.to_case_insensitive_s
+      @slug.to_s
     end
 
     def to_mumukit_slug

data/lib/mumukit/auth/permissions.rb

@@ -28,8 +28,21 @@ class Mumukit::Auth::Permissions
     self.scopes[role] ||= Mumukit::Auth::Scope.new
   end
 
+  # Deprecated: use `student_granted_organizations` organizations instead
   def accessible_organizations
-    scope_for(:student)&.grants&.map { |grant| grant.to_mumukit_slug.organization }.to_set
+    warn "Don't use accessible_organizations, since this method is probably not doing what you would expect.\n" +
+         "Use student_granted_organizations if you still need its behaviour"
+    student_granted_organizations
+  end
+
+  # Answers the organizations for which the user has been explicitly granted acceses as student.
+  # This method does not include the organizations the user has access because of the roles hierarchy
+  def student_granted_organizations
+    granted_organizations_for :student
+  end
+
+  def granted_organizations_for(role)
+    scope_for(role)&.grants&.map { |grant| grant.to_mumukit_slug.organization }.to_set
   end
 
   def add_permission!(role, *grants)

data/lib/mumukit/auth/slug.rb

@@ -23,11 +23,11 @@ module Mumukit::Auth
     end
 
     def match_first(first)
-      match self.first.downcase, first.downcase
+      match self.first, first
     end
 
     def match_second(second)
-      match self.second.downcase, second.downcase
+      match self.second, second
     end
 
     def rebase(new_organizaton)
@@ -35,21 +35,29 @@ module Mumukit::Auth
     end
 
     def ==(o)
-      self.class == o.class && to_case_insensitive_s == o.to_case_insensitive_s
+      self.class == o.class && self.normalize.eql?(o.normalize)
     end
 
-    alias_method :eql?, :==
+    def eql?(o)
+      self.class == o.class && to_s == o.to_s
+    end
 
     def hash
-      to_case_insensitive_s.hash
+      to_s.hash
     end
 
     def to_s
       "#{first}/#{second}"
     end
 
-    def to_case_insensitive_s
-      @case_insensitive_s ||= to_s.downcase
+    def normalize!
+      @first = @first.parameterize
+      @second = @second.parameterize
+      self
+    end
+
+    def normalize
+      dup.normalize!
     end
 
     def inspect
@@ -90,6 +98,10 @@ module Mumukit::Auth
       parse '_/_'
     end
 
+    def self.normalize(first, second)
+      new(first, second).normalize!
+    end
+
     private
 
     def match(pattern, part)

data/lib/mumukit/auth/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Auth
-    VERSION = '7.5.2'
+    VERSION = '7.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-auth
 version: !ruby/object:Gem::Version
-  version: 7.5.2
+  version: 7.6.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler