mumukit-auth 7.6.1 → 7.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc16320fa7c0766234a7fdeb72d8d72c35a0cdfc6958047b9c9c4ca914e25cdd
-  data.tar.gz: bffbe73adfd28218177ffbc45e7a0ffe9eee3423515bfe9187e6e252769102ea
+  metadata.gz: 517de6c84d1b25e0b31a83da4dbf8f0d5c234eb05c9c23476d2e721fa19b6049
+  data.tar.gz: 3e2ae789e5dff9857e63f298c126fffe69a815b63649fdf1b7346c18f583e29a
 SHA512:
-  metadata.gz: a61f937372d9309e2ed7a39e47d91262e0708b0fbeca8f8b4db34f43b3d45a1750c7e61c6ac8854e306896cff1342b4092b64e2b686e4473cc5df0689c58d62f
-  data.tar.gz: 2338aa6727863a3d6a100aa25bf97c5c2c2286d2ec68f7444d644a6a32472b399823ea2269ca243842212eb769d70901900d53c93336e2fb0764abf8869b03f4
+  metadata.gz: c28eac074b926567be11f09700623e3fdbd9eb1379ba22c794f87f3b06fd901fb5bb9cb436e56fbbb0985a55bb708651a9632003e4ea3849cb43408d61038717
+  data.tar.gz: 253cc4b87c062b9e97e4ba350fbcef2922c198c396cea345675b490532d7b1528ade0d257cc872cc663cf47cd374b9338a5c3a656b62daaea298bce5c7927892

data/lib/mumukit/auth/grant.rb

@@ -7,6 +7,8 @@ end
 
 module Mumukit::Auth
   class Grant
+    delegate :organization, to: :to_mumukit_slug
+
     def as_json(options={})
       to_s
     end

data/lib/mumukit/auth/permissions.rb

@@ -41,8 +41,16 @@ class Mumukit::Auth::Permissions
     granted_organizations_for :student
   end
 
+  def any_granted_organizations
+    scopes.values.flat_map(&:grants).map(&:organization).to_set
+  end
+
+  def any_granted_roles
+    scopes.select { |_, scope| scope.present? }.keys.to_set
+  end
+
   def granted_organizations_for(role)
-    scope_for(role)&.grants&.map { |grant| grant.to_mumukit_slug.organization }.to_set
+    scope_for(role)&.grants&.map(&:organization).to_set
   end
 
   def add_permission!(role, *grants)

data/lib/mumukit/auth/role.rb

@@ -41,12 +41,18 @@ module Mumukit::Auth
       parent :editor
     end
     class Editor < Role
-      parent :owner
+      parent :admin
     end
     class Janitor < Role
-      parent :owner
+      parent :admin
     end
     class Moderator < Role
+      parent :forum_supervisor
+    end
+    class ForumSupervisor < Role
+      parent :admin
+    end
+    class Admin < Role
       parent :owner
     end
     class Owner < Role
@@ -57,4 +63,4 @@ module Mumukit::Auth
       end
     end
   end
-end
+end

data/lib/mumukit/auth/roles.rb

@@ -1,6 +1,6 @@
 module Mumukit::Auth
   module Roles
-    ROLES = [:student, :teacher, :headmaster, :writer, :editor, :janitor, :moderator, :owner]
+    ROLES = [:student, :teacher, :headmaster, :writer, :editor, :janitor, :moderator, :forum_supervisor, :admin, :owner]
 
     ROLES.each do |role|
       define_method "#{role}?" do |scope = Mumukit::Auth::Slug.any|

data/lib/mumukit/auth/slug.rb

@@ -51,8 +51,8 @@ module Mumukit::Auth
     end
 
     def normalize!
-      @first = @first.downcase
-      @second = @second.downcase
+      @first = normalize_part @first
+      @second = normalize_part @second
       self
     end
 
@@ -104,12 +104,16 @@ module Mumukit::Auth
 
     private
 
+    def normalize_part(slug_part)
+      slug_part.split('.').map(&:parameterize).join('.')
+    end
+
     def match(pattern, part)
       pattern == '_' || pattern == part
     end
 
     def self.validate_slug!(slug)
-      unless slug =~ /.*\/.*/
+      unless slug =~ /\A[^\/\n]+\/[^\/\n]+\z/
         raise Mumukit::Auth::InvalidSlugFormatError, "Invalid slug: #{slug}. It must be in first/second format"
       end
     end

data/lib/mumukit/auth/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Auth
-    VERSION = '7.6.1'
+    VERSION = '7.10.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-auth
 version: !ruby/object:Gem::Version
-  version: 7.6.1
+  version: 7.10.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     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: '2'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement