mumukit-auth 7.13.0 → 7.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a77054a911454b7372cadecd8bda02e894ff80bd24ee5d19eb4b9086fb17dcc
-  data.tar.gz: 69b57019319e45c0a2c49425fea3964d9e270c5452c61c3f20d374ee41077464
+  metadata.gz: 600ea97ec7444992f512908fd046eace4f4fbe4cdf13438f0b5035e39f4de529
+  data.tar.gz: b0d7c15848351ab61c58e6a236ab998f5889f60921840e4c7381f7a521b3cbfe
 SHA512:
-  metadata.gz: 36a9d0459ed2513e94851f01312aab4ed88e8abcf17707c2c9c7bb3a86a9be406e8b5d43ac6d7194d568118622bb2801125aba27996c4eff7b12dd6824c538f6
-  data.tar.gz: e16a35c4478a206125c1d489b24ea79c84e0ba5d0082057363deb0d653c44d09e1bf7cc6e86f31268fad9b76d66c3d240eaf1b6f5643121dd7930f4765963289
+  metadata.gz: 04de29634c9fc0910e4f57af3d9be417e83f4b0ac8c23db94a0b21dc2edd6fe162f39b85dee9ee39f9030df59314caf90d5f041db1a43311c1decd0bc37e6b8d
+  data.tar.gz: 69228424458087b021989753f7420f1479b90626fb02262d626cbe18f2f6b4cbdcb053a58d324cbd2d28cdd0994a8fa34ae2b2dee93495cd0d2ee8c5fdb552eb

data/lib/mumukit/auth/permissions.rb

@@ -5,7 +5,7 @@ class Mumukit::Auth::Permissions
   attr_accessor :scopes
 
   def initialize(scopes={})
-    @scopes = {}.with_indifferent_access
+    clear!
     add_scopes! scopes
   end
 
@@ -132,6 +132,10 @@ class Mumukit::Auth::Permissions
     raise Mumukit::Auth::UnauthorizedAccessError unless assign_to?(self.class.reparse(other), previous)
   end
 
+  def clear!
+    @scopes = {}.with_indifferent_access
+  end
+
   def as_set
     Set.new scopes.flat_map { |role, scope| scope.grants.map {|grant| [role, grant]} }
   end

data/lib/mumukit/auth/role.rb

@@ -73,15 +73,18 @@ module Mumukit::Auth
       parent :editor
     end
     class Editor < Role
-      parent :admin
+      parent :manager
     end
     class Janitor < Role
-      parent :admin
+      parent :manager
     end
     class Moderator < Role
-      parent :forum_supervisor
+      parent :supervisor
+    end
+    class Manager < Role
+      parent :supervisor
     end
-    class ForumSupervisor < Role
+    class Supervisor < Role
       parent :admin
     end
     class Admin < Role

data/lib/mumukit/auth/roles.rb

@@ -1,6 +1,13 @@
 module Mumukit::Auth
   module Roles
-    ROLES = [:ex_student, :student, :teacher, :headmaster, :writer, :editor, :janitor, :moderator, :forum_supervisor, :admin, :owner]
+    FINE_GRAINED_ROLES = [
+      :ex_student, :student, :teacher, :headmaster, :writer, :editor, :janitor,
+      :moderator, :manager
+    ]
+    COARSE_GRAINED_ROLES = [:supervisor, :admin, :owner]
+
+    ROLES = COARSE_GRAINED_ROLES + FINE_GRAINED_ROLES
+
 
     ROLES.each do |role|
       define_method "#{role}?" do |scope = Mumukit::Auth::Slug.any|
@@ -9,4 +16,3 @@ module Mumukit::Auth
     end
   end
 end
-

data/lib/mumukit/auth/token.rb

@@ -43,22 +43,12 @@ module Mumukit::Auth
       'Bearer ' + encode
     end
 
-    def self.encode(uid, metadata, client = Mumukit::Auth::Client.new)
-      warn "Deprecated: please use build and then encode"
-      build(uid, client, metadata: metadata).encode
-    end
-
     def self.decode(encoded, client = Mumukit::Auth::Client.new)
       new client.decode(encoded), client
     rescue JWT::DecodeError => e
       raise Mumukit::Auth::InvalidTokenError.new(e)
     end
 
-    def self.encode_header(uid, metadata)
-      warn "Deprecated: please use build and then encode_header"
-      'Bearer ' + build(uid, metadata: metadata).encode_header
-    end
-
     def self.decode_header(header, client = Mumukit::Auth::Client.new)
       decode extract_from_header(header), client
     end

data/lib/mumukit/auth/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Auth
-    VERSION = '7.13.0'
+    VERSION = '7.14.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-auth
 version: !ruby/object:Gem::Version
-  version: 7.13.0
+  version: 7.14.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler