mumukit-auth 7.12.0 → 7.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c1873c090d214598c8dfde394af11341cbe5ef5da1604479725e3ccab5a30fe
-  data.tar.gz: 315c143eae6654332e7b3d1c13e74d5dfe24a29ecad5ae1063ef3ef7770f121a
+  metadata.gz: 5a77054a911454b7372cadecd8bda02e894ff80bd24ee5d19eb4b9086fb17dcc
+  data.tar.gz: 69b57019319e45c0a2c49425fea3964d9e270c5452c61c3f20d374ee41077464
 SHA512:
-  metadata.gz: ef85cc04780ed65e32524bf1a3f59caabbe9222ea62340b1263c116ac058f06aaf8bac6478605a0b61511ddab04fbe82ee3252b113a8dea2a2bc7cd868ba3795
-  data.tar.gz: dbddcd9a2a0f85d30135fca3b697b1c6a4e99ab8e492aaa81a34fa46b2e4965fd7e867675630aab1889c11650fa992b7c5a162837e906a7690cb2b9ba34ea81a
+  metadata.gz: 36a9d0459ed2513e94851f01312aab4ed88e8abcf17707c2c9c7bb3a86a9be406e8b5d43ac6d7194d568118622bb2801125aba27996c4eff7b12dd6824c538f6
+  data.tar.gz: e16a35c4478a206125c1d489b24ea79c84e0ba5d0082057363deb0d653c44d09e1bf7cc6e86f31268fad9b76d66c3d240eaf1b6f5643121dd7930f4765963289

data/lib/mumukit/auth/token.rb

@@ -2,7 +2,7 @@ module Mumukit::Auth
   class Token
     attr_reader :jwt, :client
 
-    def initialize(jwt, client)
+    def initialize(jwt = {}, client = Mumukit::Auth::Client.new)
       @jwt = jwt
       @client = client
     end
@@ -15,6 +15,22 @@ module Mumukit::Auth
       @uid ||= jwt['uid'] || jwt['email'] || jwt['sub']
     end
 
+    def organization
+      @organization ||= jwt['org']
+    end
+
+    def expiration
+      @expiration ||= Time.at jwt['exp']
+    end
+
+    def subject_id
+      @subject_id ||= jwt['sbid']
+    end
+
+    def subject_type
+      @subject_type ||= jwt['sbt']
+    end
+
     def verify_client!
       raise Mumukit::Auth::InvalidTokenError.new('aud mismatch') if client.id != jwt['aud']
     end
@@ -23,12 +39,13 @@ module Mumukit::Auth
       client.encode jwt
     end
 
-    def self.from_rack_env(env)
-      new(env.dig('omniauth.auth', 'extra', 'raw_info') || {})
+    def encode_header
+      'Bearer ' + encode
     end
 
     def self.encode(uid, metadata, client = Mumukit::Auth::Client.new)
-      new({aud: client.id, metadata: metadata, uid: uid}, client).encode
+      warn "Deprecated: please use build and then encode"
+      build(uid, client, metadata: metadata).encode
     end
 
     def self.decode(encoded, client = Mumukit::Auth::Client.new)
@@ -38,7 +55,8 @@ module Mumukit::Auth
     end
 
     def self.encode_header(uid, metadata)
-      'Bearer ' + encode(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)
@@ -50,6 +68,30 @@ module Mumukit::Auth
       header.split(' ').last
     end
 
+    def self.build(uid, client = Mumukit::Auth::Client.new,
+                   expiration: nil, organization: nil,
+                   subject_id: nil, subject_type: nil,
+                   metadata: {})
+      new({
+          'uid' => uid,
+          'aud' => client.id,
+          'exp' => expiration&.to_i,
+          'org' => organization,
+          'metadata' => metadata,
+          'sbid' => subject_id,
+          'sbt' => subject_type
+        }.compact,
+        client)
+    end
+
+    def self.load(encoded)
+      if encoded.present?
+        decode encoded rescue nil
+      end
+    end
+
+    def self.dump(decoded)
+      decoded.encode
+    end
   end
 end
-

data/lib/mumukit/auth/version.rb

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

metadata

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