compeon-access_token 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c83a325f189d8170cdb5fb9fcf020f4cd5492040fc6a87b31a05e74d67df661
-  data.tar.gz: 3c1f2246d1dc267270443f86dc21f6418dd4b33085f96c45ac5004be59b37d81
+  metadata.gz: 0cc9d4474834d3d8f14b3de7fba0da4ada1ca28853808405ff2b1af80f7f7886
+  data.tar.gz: 0f02baf6512b4dd6bb0fde8fe481e6a795164827d4bb92c282fdb71b6254c38b
 SHA512:
-  metadata.gz: 8d26055e1302ab75ec0739d17f5e9310062224f95df4f540ce049d5574c50e2c9d5d18959e52c887179f58a4504d16524c0cd5a945f8afd5d486781df108aa93
-  data.tar.gz: 278d1e3e423f513717e022d42e613d43c9d0528f60644a5d4bc3db99b7ff5057dfae602e3e9a7ff92f03a0b0663b8da6d38558d0b84c0a76427764756f64b647
+  metadata.gz: dbc7b9b07c6348450b5e3ea2ddf1330b24e5c6f2f6542a02f4c239d950c5cbbeaa717d2dce6fbf337b4ee9c6fd02eccecf6789f2dfa9489fd41e79e0dc6fdf31
+  data.tar.gz: 6c5c5161559225af5c8e61b9861d324ecd41e7f578ea04a77b0ff421a6ca59b9f7a974d5207a8c87bdaac973593edbc9712c18b14922029d5d5cf342026f6d1e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    compeon-access_token (0.3.0)
+    compeon-access_token (0.4.0)
       jwt (~> 2.1)
 
 GEM

data/lib/compeon/access_token.rb

@@ -9,15 +9,16 @@ module Compeon
   class AccessToken
     class ParseError < RuntimeError; end
 
-    def initialize(role:, user_id:, kind:, client_id:, token:)
+    def initialize(role:, user_id:, kind:, client_id:, session_id: nil, token:)
       @role = role
       @user_id = user_id
       @kind = kind
       @client_id = client_id
+      @session_id = session_id
       @token = token
     end
 
-    attr_reader :role, :user_id, :kind, :client_id, :token
+    attr_reader :role, :user_id, :kind, :client_id, :session_id, :token
 
     class << self
       attr_writer :environment
@@ -35,8 +36,9 @@ module Compeon
         user_id = data.fetch('uid')
         kind = data.fetch('knd')
         client_id = data.fetch('cid')
+        session_id = data.fetch('sid')
 
-        new(role: role, user_id: user_id, kind: kind, client_id: client_id, token: token)
+        new(role: role, user_id: user_id, kind: kind, client_id: client_id, session_id: session_id, token: token)
       rescue JWT::DecodeError
         raise ParseError
       end

data/lib/compeon/access_token/version.rb

@@ -1,5 +1,5 @@
 module Compeon
   class AccessToken
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/lib/compeon/token/access.rb

@@ -4,7 +4,7 @@ module Compeon
   module Token
     class Access < Base
       class << self
-        def attributes_mapping
+        def required_attributes_mapping
           {
             client_id: :cid,
             role: :role,
@@ -12,6 +12,10 @@ module Compeon
           }.freeze
         end
 
+        def optional_attributes_mapping
+          { session_id: :sid }.freeze
+        end
+
         def jwt_algorithm
           'RS256'
         end
@@ -21,13 +25,14 @@ module Compeon
         end
       end
 
-      attr_accessor :client_id, :role, :user_id
+      attr_accessor :client_id, :role, :user_id, :session_id
 
-      def initialize(client_id:, role:, user_id:, **claims)
+      def initialize(client_id:, role:, user_id:, session_id: nil, **claims)
         super(claims)
         @client_id = client_id
         @role = role
         @user_id = user_id
+        @session_id = session_id
       end
     end
   end

data/lib/compeon/token/authorization.rb

@@ -4,7 +4,7 @@ module Compeon
   module Token
     class Authorization < Base
       class << self
-        def attributes_mapping
+        def required_attributes_mapping
           {
             client_id: :cid,
             redirect_uri: :uri,
@@ -12,6 +12,10 @@ module Compeon
           }.freeze
         end
 
+        def optional_attributes_mapping
+          { session_id: :sid }.freeze
+        end
+
         def jwt_algorithm
           'RS256'
         end
@@ -21,13 +25,14 @@ module Compeon
         end
       end
 
-      attr_accessor :client_id, :redirect_uri, :user_id
+      attr_accessor :client_id, :redirect_uri, :user_id, :session_id
 
-      def initialize(client_id:, redirect_uri:, user_id:, **claims)
+      def initialize(client_id:, redirect_uri:, user_id:, session_id: nil, **claims)
         super(claims)
         @client_id = client_id
         @redirect_uri = redirect_uri
         @user_id = user_id
+        @session_id = session_id
       end
     end
   end

data/lib/compeon/token/base.rb

@@ -10,6 +10,18 @@ module Compeon
           @attributes ||= attributes_mapping.keys.freeze
         end
 
+        def attributes_mapping
+          required_attributes_mapping.merge(optional_attributes_mapping).freeze
+        end
+
+        def required_attributes
+          @required_attributes ||= required_attributes_mapping.keys.freeze
+        end
+
+        def optional_attributes
+          @optional_attributes ||= optional_attributes_mapping.keys.freeze
+        end
+
         def registered_claims_mapping
           {
             audience: :aud,
@@ -65,7 +77,7 @@ module Compeon
       end
 
       def attributes_valid?
-        self.class.attributes.none? { |accessor| public_send(accessor).nil? }
+        self.class.required_attributes.none? { |accessor| public_send(accessor).nil? }
       end
     end
   end

data/lib/compeon/token/encoder.rb

@@ -39,6 +39,7 @@ module Compeon
           .attributes_mapping
           .invert
           .transform_values { |attribute| token.public_send(attribute) }
+          .reject { |attribute, value| token.class.optional_attributes.include?(attribute) && value.nil? }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compeon-access_token
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Timo Schilling
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt