authlete 1.18.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a6d6b54fff66206e4a72791605ec3f84cdc835365a4dce359c3acadda49c56d
-  data.tar.gz: 5418a92d1c23f717ff8ac6e393961c0e5fef71b276ffb6c528bae32f3002ea03
+  metadata.gz: 0f0f975f450b062ce2e4c699ecf963ab67e0594b9912edda6e237aa34a5d232a
+  data.tar.gz: 5b65c27d14a277aa1a3118e3c0381c06426f43eb3a04e9a5cf5b1ddef87d80b9
 SHA512:
-  metadata.gz: 53cacf0ae8c7f6edf51c9628598234297666a96aa877bf284fd6c41469c7ec74892d56912b240658ff7ed8c14e1f68a55504a615c89406cb0d6c4086792084d5
-  data.tar.gz: fe43a9a51a6716e103bd57d9c9699870f637310c2c0b255a83d0d61b16453e5ffb75b5717da73711b66e051a29e917e642ea81b478d101246716f0df4b75a6c0
+  metadata.gz: 6259dfda0962dcc6da2c5fa2a2e316471c14b0c302019a5a1fd942a0ae705155bcccd7469576b64642962ea6b3cbfa994778e130044659c34c8d8a9d6cbffd53
+  data.tar.gz: 966937e26341c3b9ec375c1118f156519dda150cd8c20c18bb29fba411bd2594c9bcbb78220eabdf21b2bbcf633fd817ab679f1dbd4b26e995f30fb2ea9ec357

data/lib/authlete/model/client.rb

@@ -308,6 +308,10 @@ module Authlete
       attr_accessor :digestAlgorithm
       alias_method  :digest_algorithm,  :digestAlgorithm
       alias_method  :digest_algorithm=, :digestAlgorithm=
+
+      attr_accessor :singleAccessTokenPerSubject
+      alias_method  :single_access_token_per_subject,  :singleAccessTokenPerSubject
+      alias_method  :single_access_token_per_subject=, :singleAccessTokenPerSubject=    
       private
 
       def defaults
@@ -387,7 +391,8 @@ module Authlete
           frontChannelRequestObjectEncryptionRequired: false,
           requestObjectEncryptionAlgMatchRequired:     false,
           requestObjectEncryptionEncMatchRequired:     false,
-          digestAlgorithm:                             nil
+          digestAlgorithm:                             nil,
+          singleAccessTokenPerSubject:                 false
         }
       end
 
@@ -468,6 +473,7 @@ module Authlete
         @requestObjectEncryptionAlgMatchRequired     = hash[:requestObjectEncryptionAlgMatchRequired]
         @requestObjectEncryptionEncMatchRequired     = hash[:requestObjectEncryptionEncMatchRequired]
         @digestAlgorithm                             = hash[:digestAlgorithm]
+        @singleAccessTokenPerSubject                 = hash[:singleAccessTokenPerSubject]
       end
 
       def to_hash_value(key, var)

data/lib/authlete/model/service.rb

@@ -530,6 +530,39 @@ module Authlete
       attr_accessor :refreshTokenIdempotent
       alias_method  :refresh_token_idempotent,  :refreshTokenIdempotent
       alias_method  :refresh_token_idempotent=, :refreshTokenIdempotent=
+
+      attr_accessor :federationEnabled
+      alias_method  :federation_enabled,  :federationEnabled
+      alias_method  :federation_enabled=, :federationEnabled=
+
+      attr_accessor :organizationName
+      alias_method  :organization_name,  :organizationName
+      alias_method  :organization_name=, :organizationName=
+
+      attr_accessor :authorityHints
+      alias_method  :authority_hints,  :authorityHints
+      alias_method  :authority_hints=, :authorityHints=
+
+      attr_accessor :federationJwks
+      alias_method  :federation_jwks,  :federationJwks
+      alias_method  :federation_jwks=, :federationJwks=
+
+      attr_accessor :signedJwksUri
+      alias_method  :signed_jwks_uri,  :signedJwksUri
+      alias_method  :signed_jwks_uri=, :signedJwksUri=
+
+      attr_accessor :federationRegistrationEndpoint
+      alias_method  :federation_registration_endpoint,  :federationRegistrationEndpoint
+      alias_method  :federation_registration_endpoint=, :federationRegistrationEndpoint=
+
+      attr_accessor :supportedClientRegistrationTypes
+      alias_method  :supported_client_registration_types,  :supportedClientRegistrationTypes
+      alias_method  :supported_client_registration_types=, :supportedClientRegistrationTypes=
+
+      attr_accessor :trustAnchors
+      alias_method  :trust_anchors,  :trustAnchors
+      alias_method  :trust_anchors=, :trustAnchors=
+
       private
       
       def defaults
@@ -665,6 +698,14 @@ module Authlete
           requestObjectAudienceChecked:                false,
           accessTokenForExternalAttachmentEmbedded:    false,
           refreshTokenIdempotent:                      false,
+          federationEnabled:                           false,
+          organizationName:                            nil,
+          authorityHints:                              nil,
+          federationJwks:                              nil,
+          signedJwksUri:                               nil,
+          federationRegistrationEndpoint:              nil,
+          supportedClientRegistrationTypes:            nil,
+          trustAnchors:                                nil,
         }
       end
 
@@ -800,6 +841,15 @@ module Authlete
         @requestObjectAudienceChecked                = hash[:requestObjectAudienceChecked]
         @accessTokenForExternalAttachmentEmbedded    = hash[:accessTokenForExternalAttachmentEmbedded]
         @refreshTokenIdempotent                      = hash[:refreshTokenIdempotent]
+        @federationEnabled                           = hash[:federationEnabled]
+        @organizationName                            = hash[:organizationName]
+        @authorityHints                              = hash[:authorityHints]
+        @federationJwks                              = hash[:federationJwks]
+        @signedJwksUri                               = hash[:signedJwksUri]
+        @federationRegistrationEndpoint              = hash[:federationRegistrationEndpoint]
+        @supportedClientRegistrationTypes            = hash[:supportedClientRegistrationTypes]
+        @trustAnchors                                = get_parsed_array(hash[:trustAnchors]) { |e| Authlete::Model::TrustAnchor.parse(e) }
+
       end
 
       def to_hash_value(key, var)
@@ -807,7 +857,7 @@ module Authlete
 
         case key
           when :snsCredentials, :developerSnsCredentials, :supportedScopes,
-               :metadata, :mtlsEndpointAliases, :attributes, :hsks
+               :metadata, :mtlsEndpointAliases, :attributes, :hsks, :trustAnchors
             raw_val&.map { |e| e.to_hash }
           else
             raw_val

data/lib/authlete/model/trust-anchor.rb

@@ -0,0 +1,44 @@
+# :nodoc:
+#
+# Copyright (C) 2014-2020 Authlete, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+module Authlete
+  module Model
+    class TrustAnchor < Authlete::Model::Base
+      include Authlete::Model::Hashable
+
+      attr_accessor :entityId
+      alias_method  :entity_id,  :entityId
+      alias_method  :entity_id=, :entityId=
+
+      attr_accessor :jwks
+
+      private
+
+      def defaults
+        {
+          entityId: nil,
+          jwks:     nil
+        }
+      end
+
+      def set_params(hash)
+        @entityId  = hash[:entityId]
+        @jwks      = hash[:jwks]
+      end
+    end
+  end
+end

data/lib/authlete/version.rb

@@ -16,5 +16,5 @@
 
 
 module Authlete
-  VERSION = "1.18.0"
+  VERSION = "1.20.0"
 end

data/lib/authlete.rb

@@ -40,6 +40,7 @@ module Authlete
     autoload :TaggedValue, 'authlete/model/tagged-value'
     autoload :NamedUri, 'authlete/model/named-uri'
     autoload :Hsk, 'authlete/model/hsk'
+    autoload :TrustAnchor, 'authlete/model/trust-anchor'
 
     module Request
       autoload :AuthenticationCallbackRequest, 'authlete/model/request/authentication-callback-request'

data/test/authlete/model/test_client.rb

@@ -120,6 +120,7 @@ class ClientTest < Minitest::Test
   REQUEST_OBJECT_ENCRYPTION_ALG_MATCH_REQUIRED     = false
   REQUEST_OBJECT_ENCRYPTION_ENC_MATCH_REQUIRED     = false
   DIGEST_ALGORITHM                                 = '<digest-algorithm>'
+  SINGLE_ACCESS_TOKEN_PER_SUBJECT                  = false
 
   def generate_json
     return <<~JSON
@@ -204,7 +205,8 @@ class ClientTest < Minitest::Test
         "frontChannelRequestObjectEncryptionRequired": false,
         "requestObjectEncryptionAlgMatchRequired":     false,
         "requestObjectEncryptionEncMatchRequired":     false,
-        "digestAlgorithm":                             "<digest-algorithm>"
+        "digestAlgorithm":                             "<digest-algorithm>",
+        "singleAccessTokenPerSubject":                 false
       }
     JSON
   end
@@ -292,7 +294,8 @@ class ClientTest < Minitest::Test
       frontChannelRequestObjectEncryptionRequired: false,
       requestObjectEncryptionAlgMatchRequired:     false,
       requestObjectEncryptionEncMatchRequired:     false,
-      digestAlgorithm:                             '<digest-algorithm>'
+      digestAlgorithm:                             '<digest-algorithm>',
+      singleAccessTokenPerSubject:                 false
     }
   end
 
@@ -374,6 +377,7 @@ class ClientTest < Minitest::Test
     obj.requestObjectEncryptionAlgMatchRequired     = REQUEST_OBJECT_ENCRYPTION_ALG_MATCH_REQUIRED
     obj.requestObjectEncryptionEncMatchRequired     = REQUEST_OBJECT_ENCRYPTION_ENC_MATCH_REQUIRED
     obj.digestAlgorithm                             = DIGEST_ALGORITHM
+    obj.singleAccessTokenPerSubject                 = SINGLE_ACCESS_TOKEN_PER_SUBJECT
   end
 
 
@@ -462,6 +466,7 @@ class ClientTest < Minitest::Test
     assert_equal REQUEST_OBJECT_ENCRYPTION_ALG_MATCH_REQUIRED,     obj.requestObjectEncryptionAlgMatchRequired
     assert_equal REQUEST_OBJECT_ENCRYPTION_ENC_MATCH_REQUIRED,     obj.requestObjectEncryptionEncMatchRequired
     assert_equal DIGEST_ALGORITHM,                                 obj.digestAlgorithm
+    assert_equal SINGLE_ACCESS_TOKEN_PER_SUBJECT,                  obj.singleAccessTokenPerSubject
   end
 
 

data/test/authlete/model/test_service.rb

@@ -173,6 +173,17 @@ class ServiceTest < Minitest::Test
   REQUEST_OBJECT_AUDIENCE_CHECKED                  = true
   ACCESS_TOKEN_FOR_EXTERNAL_ATTACHMENT_EMBEDDED    = false
   REFRESH_TOKEN_IDEMPOTENT                         = false
+  FEDERATION_ENABLED                               = false
+  ORGANIZATION_NAME                                = '<organization-name>'
+  AUTHORITY_HINTS                                  = [ '<authority>', '<hints>']
+  FEDERATION_JWKS                                  = '<federation-jwks>'
+  SIGNED_JWKS_URI                                  = '<signed-jwks-uri>'
+  FEDERATION_REGISTRATION_ENDPOINT                 = '<federation-registration-endpoint>'
+  SUPPORTED_CLIENT_REGISTRATION_TYPES              = [ 'AUTOMATIC', 'EXPLICIT']
+  TRUST_ANCHOR_ENTITY_ID                           = '<entity-id>'
+  TRUST_ANCHOR_JWKS                                = '<jwks>'
+  TRUST_ANCHORS                                    = [ Authlete::Model::TrustAnchor.new(entityId: TRUST_ANCHOR_ENTITY_ID, jwks: TRUST_ANCHOR_JWKS) ]
+
 
   def generate_json
     return <<~JSON
@@ -307,9 +318,18 @@ class ServiceTest < Minitest::Test
         "supportedDigestAlgorithms":                   ["<supported-digest-algorithms1>", "<supported-digest-algorithms1>"],
         "requestObjectAudienceChecked":                true,
         "accessTokenForExternalAttachmentEmbedded":    false,
-        "refreshTokenIdempotent":                      false
+        "refreshTokenIdempotent":                      false,
+        "federationEnabled":                           false,
+        "organizationName":                            "<organization-name>",
+        "authorityHints":                              [ "<authority>", "<hints>"],
+        "federationJwks":                              "<federation-jwks>",
+        "signedJwksUri":                               "<signed-jwks-uri>",
+        "federationRegistrationEndpoint":              "<federation-registration-endpoint>",
+        "supportedClientRegistrationTypes":            [ "AUTOMATIC", "EXPLICIT"],
+        "trustAnchors":                                [{ "entityId": "<entity-id>", "jwks": "<jwks>" }]
       }
-    JSON
+      JSON
+
   end
 
 
@@ -445,7 +465,15 @@ class ServiceTest < Minitest::Test
       supportedDigestAlgorithms:                   ['<supported-digest-algorithms1>', '<supported-digest-algorithms1>'],
       requestObjectAudienceChecked:                true,
       accessTokenForExternalAttachmentEmbedded:    false,
-      refreshTokenIdempotent:                      false
+      refreshTokenIdempotent:                      false,
+      federationEnabled:                           false,
+      organizationName:                            '<organization-name>',
+      authorityHints:                              [ '<authority>', '<hints>'],
+      federationJwks:                              '<federation-jwks>',
+      signedJwksUri:                               '<signed-jwks-uri>',
+      federationRegistrationEndpoint:              '<federation-registration-endpoint>',
+      supportedClientRegistrationTypes:            [ 'AUTOMATIC', 'EXPLICIT'],
+      trustAnchors:                                [{ entityId: "<entity-id>", jwks: "<jwks>" }],
     }
   end
 
@@ -582,6 +610,14 @@ class ServiceTest < Minitest::Test
     obj.request_object_audience_checked               = REQUEST_OBJECT_AUDIENCE_CHECKED
     obj.access_token_for_external_attachment_embedded = ACCESS_TOKEN_FOR_EXTERNAL_ATTACHMENT_EMBEDDED
     obj.refresh_token_idempotent                      = REFRESH_TOKEN_IDEMPOTENT
+    obj.federation_enabled                            = FEDERATION_ENABLED
+    obj.organization_name                             = ORGANIZATION_NAME
+    obj.authority_hints                               = AUTHORITY_HINTS
+    obj.federation_jwks                               = FEDERATION_JWKS
+    obj.signed_jwks_uri                               = SIGNED_JWKS_URI
+    obj.federation_registration_endpoint              = FEDERATION_REGISTRATION_ENDPOINT
+    obj.supported_client_registration_types           = SUPPORTED_CLIENT_REGISTRATION_TYPES
+    obj.trust_anchors                                 = TRUST_ANCHORS
   end
 
 
@@ -731,6 +767,15 @@ class ServiceTest < Minitest::Test
     assert_equal REQUEST_OBJECT_AUDIENCE_CHECKED,                  obj.request_object_audience_checked
     assert_equal ACCESS_TOKEN_FOR_EXTERNAL_ATTACHMENT_EMBEDDED,    obj.access_token_for_external_attachment_embedded
     assert_equal REFRESH_TOKEN_IDEMPOTENT,                         obj.refresh_token_idempotent
+    assert_equal FEDERATION_ENABLED,                               obj.federation_enabled
+    assert_equal ORGANIZATION_NAME,                                obj.organization_name
+    assert_equal AUTHORITY_HINTS,                                  obj.authority_hints
+    assert_equal FEDERATION_JWKS,                                  obj.federation_jwks
+    assert_equal SIGNED_JWKS_URI,                                  obj.signed_jwks_uri
+    assert_equal FEDERATION_REGISTRATION_ENDPOINT,                 obj.federation_registration_endpoint
+    assert_equal SUPPORTED_CLIENT_REGISTRATION_TYPES,              obj.supported_client_registration_types
+    assert_equal TRUST_ANCHOR_ENTITY_ID,                           obj.trustAnchors[0].entityId
+    assert_equal TRUST_ANCHOR_JWKS,                                obj.trustAnchors[0].jwks
   end
 
 

data/test/authlete/model/test_trust-anchor.rb

@@ -0,0 +1,84 @@
+# :nodoc:
+#
+# Copyright (C) 2014-2021 Authlete, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+require 'authlete'
+require 'json'
+require 'minitest/autorun'
+
+
+class TrustAnchorTest < Minitest::Test
+  ENTITY_ID   = '<entity-id>'
+  JWKS        = '<jwks>'
+
+
+  def generate_json
+    return <<~JSON
+      {
+        "entityId":   "<entity-id>",
+        "jwks":       "<jwks>"
+      }
+    JSON
+  end
+
+
+  def generate_hash
+    {
+      entityId:    '<entity-id>',
+      jwks:        '<jwks>',
+    }
+  end
+
+
+  def set_params(obj)
+    obj.entity_id   = ENTITY_ID
+    obj.jwks        = JWKS
+  end
+
+
+  def match(obj)
+    assert_equal ENTITY_ID,   obj.entityId
+    assert_equal JWKS,        obj.jwks
+  end
+
+
+  def test_from_json
+    jsn    = generate_json
+    hsh    = JSON.parse(jsn)
+
+    actual = Authlete::Model::TrustAnchor.new(hsh)
+
+    match(actual)
+  end
+
+
+  def test_setters
+    actual = Authlete::Model::TrustAnchor.new
+    set_params(actual)
+
+    match(actual)
+  end
+
+
+  def test_to_hash
+    obj = Authlete::Model::TrustAnchor.new
+    set_params(obj)
+    actual   = obj.to_hash
+    expected = generate_hash
+
+    assert_equal expected, actual
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authlete
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.20.0
 platform: ruby
 authors:
 - Takahiko Kawasaki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -148,6 +148,7 @@ files:
 - lib/authlete/model/service.rb
 - lib/authlete/model/sns-credentials.rb
 - lib/authlete/model/tagged-value.rb
+- lib/authlete/model/trust-anchor.rb
 - lib/authlete/utility.rb
 - lib/authlete/version.rb
 - test/authlete/model/request/test_authentication-callback-request.rb
@@ -218,6 +219,7 @@ files:
 - test/authlete/model/test_service.rb
 - test/authlete/model/test_sns-credentials.rb
 - test/authlete/model/test_tagged-value.rb
+- test/authlete/model/test_trust-anchor.rb
 - test/authlete/test_exception.rb
 homepage: https://www.authlete.com/
 licenses:
@@ -311,4 +313,5 @@ test_files:
 - test/authlete/model/test_service.rb
 - test/authlete/model/test_sns-credentials.rb
 - test/authlete/model/test_tagged-value.rb
+- test/authlete/model/test_trust-anchor.rb
 - test/authlete/test_exception.rb