authlete 1.7.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 97d78dd039d8f22081dd1085109d84809e5ee772
-  data.tar.gz: 7b3569794b98ad7c59eb28d0e458d4d05be474c6
+SHA256:
+  metadata.gz: 577aec2ce8765b18c221169cbee8c7daa6b6c4e48bfffc665cbb819325373318
+  data.tar.gz: d01b7ababf92b96a193d59a28bae1a8d98a5170e01f047288ab766ce8909388e
 SHA512:
-  metadata.gz: b737891b85b5507471f8ffe9ababe62ca7b2134b1b31a0e08c97ab8c36d862e296bc78649e2fc95768c2ce93895ca8dab189d74c0c13c609075268d89de9d27a
-  data.tar.gz: 3b1c04aba0b8e84bf1d0306ca93f0a9e93b0841442deba6d5e170c5cca75b9d8694338a91906671e44a37d97c9913f59d4f253f4e3b7486d1e6047d29a3f71a5
+  metadata.gz: fc4b13c802eefd16f51b5dd5af62bde5671fd8e49509ea0755641106847041d85675ec13290c40f1ab15d160829ec467b72beebfe3cabe598c07cf653a8e109b
+  data.tar.gz: e02ac5ffa5c47d88d7bc3b5ab6368696268a122a9ca1ab828f89b1d8f6efcee10a66690452e37eb35ddb2c780cc56ca09658a473624a22f4e4fe95ae50d0bfe3

data/authlete.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "rest-client", ">= 1.7.2"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  spec.add_development_dependency "rake", ">= 12.3.3"
 end

data/lib/authlete/model/hsk.rb

@@ -0,0 +1,67 @@
+# :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.
+
+
+module Authlete
+  module Model
+    class Hsk < Authlete::Model::Base
+      include Authlete::Model::Hashable
+      include Authlete::Utility
+
+      attr_accessor :kty
+
+      attr_accessor :use
+
+      attr_accessor :alg
+
+      attr_accessor :kid
+
+      attr_accessor :hsmName
+      alias_method  :hsm_name,  :hsmName
+      alias_method  :hsm_name=, :hsmName=
+
+      attr_accessor :handle
+
+      attr_accessor :publicKey
+      alias_method  :public_key,  :publicKey
+      alias_method  :public_key=, :publicKey=
+
+      private
+
+      def defaults
+        {
+          kty:       nil,
+          use:       nil,
+          alg:       nil,
+          kid:       nil,
+          hsmName:   nil,
+          handle:    nil,
+          publicKey: nil,
+        }
+      end
+
+      def set_params(hash)
+        @kty       = hash[:kty]
+        @use       = hash[:use]
+        @alg       = hash[:alg]
+        @kid       = hash[:kid]
+        @hsmName   = hash[:hsmName]
+        @handle    = hash[:handle]
+        @publicKey = hash[:publicKey]
+      end
+    end
+  end
+end

data/lib/authlete/model/service.rb

@@ -457,6 +457,27 @@ module Authlete
       alias_method  :request_object_encryption_enc_match_required,  :requestObjectEncryptionEncMatchRequired
       alias_method  :request_object_encryption_enc_match_required=, :requestObjectEncryptionEncMatchRequired=
 
+      attr_accessor :hsks
+
+      attr_accessor :hsmEnabled
+      alias_method  :hsm_enabled,  :hsmEnabled
+      alias_method  :hsm_enabled=, :hsmEnabled=
+
+      attr_accessor :refreshTokenDurationReset
+      alias_method  :refresh_token_duration_reset,  :refreshTokenDurationReset
+      alias_method  :refresh_token_duration_reset=, :refreshTokenDurationReset=
+
+      attr_accessor :grantManagementEndpoint
+      alias_method  :grant_management_endpoint,  :grantManagementEndpoint
+      alias_method  :grant_management_endpoint=, :grantManagementEndpoint=
+
+      attr_accessor :grantManagementActionRequired
+      alias_method  :grant_management_action_required,  :grantManagementActionRequired
+      alias_method  :grant_management_action_required=, :grantManagementActionRequired=
+
+      attr_accessor :unauthorizedOnClientConfigSupported
+      alias_method  :unauthorized_on_client_config_supported,  :unauthorizedOnClientConfigSupported
+      alias_method  :unauthorized_on_client_config_supported=, :unauthorizedOnClientConfigSupported=
       private
 
       def defaults
@@ -572,7 +593,13 @@ module Authlete
           tokenExpirationLinked:                       false,
           frontChannelRequestObjectEncryptionRequired: false,
           requestObjectEncryptionAlgMatchRequired:     false,
-          requestObjectEncryptionEncMatchRequired:     false
+          requestObjectEncryptionEncMatchRequired:     false,
+          hsks:                                        nil,
+          hsmEnabled:                                  false,
+          refreshTokenDurationReset:                   false,
+          grantManagementEndpoint:                     nil,
+          grantManagementActionRequired:               false,
+          unauthorizedOnClientConfigSupported:         false
         }
       end
 
@@ -689,6 +716,12 @@ module Authlete
         @frontChannelRequestObjectEncryptionRequired = hash[:frontChannelRequestObjectEncryptionRequired]
         @requestObjectEncryptionAlgMatchRequired     = hash[:requestObjectEncryptionAlgMatchRequired]
         @requestObjectEncryptionEncMatchRequired     = hash[:requestObjectEncryptionEncMatchRequired]
+        @hsks                                        = get_parsed_array(hash[:hsks]) { |e| Authlete::Model::Hsk.parse(e) }
+        @hsmEnabled                                  = hash[:hsmEnabled]
+        @refreshTokenDurationReset                   = hash[:refreshTokenDurationReset]
+        @grantManagementEndpoint                     = hash[:grantManagementEndpoint]
+        @grantManagementActionRequired               = hash[:grantManagementActionRequired]
+        @unauthorizedOnClientConfigSupported         = hash[:unauthorizedOnClientConfigSupported]
       end
 
       def to_hash_value(key, var)
@@ -696,7 +729,7 @@ module Authlete
 
         case key
           when :snsCredentials, :developerSnsCredentials, :supportedScopes,
-               :metadata, :mtlsEndpointAliases, :attributes
+               :metadata, :mtlsEndpointAliases, :attributes, :hsks
             raw_val&.map { |e| e.to_hash }
           else
             raw_val

data/lib/authlete/version.rb

@@ -16,5 +16,5 @@
 
 
 module Authlete
-  VERSION = "1.7.0"
+  VERSION = "1.11.0"
 end

data/lib/authlete.rb

@@ -39,6 +39,7 @@ module Authlete
     autoload :SnsCredentials, 'authlete/model/sns-credentials'
     autoload :TaggedValue, 'authlete/model/tagged-value'
     autoload :NamedUri, 'authlete/model/named-uri'
+    autoload :Hsk, 'authlete/model/hsk'
 
     module Request
       autoload :AuthenticationCallbackRequest, 'authlete/model/request/authentication-callback-request'

data/test/authlete/model/test_hsk.rb

@@ -0,0 +1,108 @@
+# :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 HskTest < Minitest::Test
+  KTY        = 'EC'
+  USE        = 'sig'
+  ALG        = 'ES256'
+  KID        = 'jane'
+  HSM_NAME   = 'google'
+  HANDLE     = '<handle>'
+  PUBLIC_KEY = '<public-key>'
+
+
+  def generate_json
+    return <<~JSON
+      {
+        "kty":       "EC",
+        "use":       "sig",
+        "alg":       "ES256",
+        "kid":       "jane",
+        "hsmName":   "google",
+        "handle":    "<handle>",
+        "publicKey": "<public-key>"
+      }
+    JSON
+  end
+
+
+  def generate_hash
+    {
+      kty:       'EC',
+      use:       'sig',
+      alg:       'ES256',
+      kid:       'jane',
+      hsmName:   'google',
+      handle:    '<handle>',
+      publicKey: '<public-key>'
+    }
+  end
+
+
+  def set_params(obj)
+    obj.kty       = KTY
+    obj.use       = USE
+    obj.alg       = ALG
+    obj.kid       = KID
+    obj.hsmName   = HSM_NAME
+    obj.handle    = HANDLE
+    obj.publicKey = PUBLIC_KEY
+  end
+
+
+  def match(obj)
+    assert_equal KTY,        obj.kty
+    assert_equal USE,        obj.use
+    assert_equal ALG,        obj.alg
+    assert_equal KID,        obj.kid
+    assert_equal HSM_NAME,   obj.hsmName
+    assert_equal HANDLE,     obj.handle
+    assert_equal PUBLIC_KEY, obj.publicKey
+  end
+
+
+  def test_from_json
+    jsn    = generate_json
+    hsh    = JSON.parse(jsn)
+    actual = Authlete::Model::Hsk.new(hsh)
+
+    match(actual)
+  end
+
+
+  def test_setters
+    actual = Authlete::Model::Hsk.new
+    set_params(actual)
+
+    match(actual)
+  end
+
+
+  def test_to_hash
+    obj = Authlete::Model::Hsk.new
+    set_params(obj)
+    actual   = obj.to_hash
+    expected = generate_hash
+
+    assert_equal expected, actual
+  end
+end

data/test/authlete/model/test_service.rb

@@ -147,7 +147,19 @@ class ServiceTest < Minitest::Test
   FRONT_CHANNEL_REQUEST_OBJECT_ENCRYPTION_REQUIRED = false
   REQUEST_OBJECT_ENCRYPTION_ALG_MATCH_REQUIRED     = false
   REQUEST_OBJECT_ENCRYPTION_ENC_MATCH_REQUIRED     = false
-
+  HSKS_KTY                                         = 'EC'
+  HSKS_USE                                         = 'sig'
+  HSKS_ALG                                         = 'ES256'
+  HSKS_KID                                         = 'jane'
+  HSKS_HSMNAME                                     = 'google'
+  HSKS_HANDLE                                      = '<handle>'
+  HSKS_PUBLICKEY                                   = '<public-key>'
+  HSKS                                             = [ Authlete::Model::Hsk.new(kty: HSKS_KTY, use: HSKS_USE, alg: HSKS_ALG, kid: HSKS_KID, hsmName: HSKS_HSMNAME, handle: HSKS_HANDLE, publicKey: HSKS_PUBLICKEY) ]
+  HSM_ENABLED                                      = false
+  REFRESH_TOKEN_DURATION_RESET                     = false
+  GRANT_MANAGEMENT_ENDPOINT                        = '<grant-management-endpoint>'
+  GRANT_MANAGEMENT_ACTION_REQUIRED                 = false
+  UNATHORIZED_ON_CLIENT_CONFIG_SUPPORTED           = false
 
   def generate_json
     return <<~JSON
@@ -165,6 +177,8 @@ class ServiceTest < Minitest::Test
         "userInfoEndpoint":                            "<user-info-endpoint>",
         "jwksUri":                                     "<jwks-uri>",
         "jwks":                                        "<jwks>",
+        "hsks":                                        [ { "kty": "EC", "use": "sig", "alg": "ES256", "kid": "jane", "hsmName": "google", "handle": "<handle>", "publicKey": "<public-key>" } ],
+        "hsmEnabled":                                  false,
         "registrationEndpoint":                        "<registration-endpoint>",
         "registrationManagementEndpoint":              "<registration-management-endpoint>",
         "supportedScopes":                             [ { "name": "scope0", "description": "<scope0-description>" } ],
@@ -263,7 +277,11 @@ class ServiceTest < Minitest::Test
         "tokenExpirationLinked":                       false,
         "frontChannelRequestObjectEncryptionRequired": false,
         "requestObjectEncryptionAlgMatchRequired":     false,
-        "requestObjectEncryptionEncMatchRequired":     false
+        "requestObjectEncryptionEncMatchRequired":     false,
+        "refreshTokenDurationReset":                   false,
+        "grantManagementEndpoint":                     "<grant-management-endpoint>",
+        "grantManagementActionRequired":               false,
+        "unauthorizedOnClientConfigSupported":         false
       }
     JSON
   end
@@ -382,7 +400,13 @@ class ServiceTest < Minitest::Test
       tokenExpirationLinked:                       false,
       frontChannelRequestObjectEncryptionRequired: false,
       requestObjectEncryptionAlgMatchRequired:     false,
-      requestObjectEncryptionEncMatchRequired:     false
+      requestObjectEncryptionEncMatchRequired:     false,
+      hsks:                                        [ { kty: 'EC', use: 'sig', alg: 'ES256', kid: 'jane', hsmName: 'google', handle: '<handle>', publicKey: '<public-key>' } ],
+      hsmEnabled:                                  false,
+      refreshTokenDurationReset:                   false,
+      grantManagementEndpoint:                     '<grant-management-endpoint>',
+      grantManagementActionRequired:               false,
+      unauthorizedOnClientConfigSupported:         false
     }
   end
 
@@ -500,6 +524,12 @@ class ServiceTest < Minitest::Test
     obj.frontChannelRequestObjectEncryptionRequired   = FRONT_CHANNEL_REQUEST_OBJECT_ENCRYPTION_REQUIRED
     obj.requestObjectEncryptionAlgMatchRequired       = REQUEST_OBJECT_ENCRYPTION_ALG_MATCH_REQUIRED
     obj.requestObjectEncryptionEncMatchRequired       = REQUEST_OBJECT_ENCRYPTION_ENC_MATCH_REQUIRED
+    obj.hsks                                          = HSKS
+    obj.hsm_enabled                                   = HSM_ENABLED
+    obj.refresh_token_duration_reset                  = REFRESH_TOKEN_DURATION_RESET
+    obj.grant_management_endpoint                     = GRANT_MANAGEMENT_ENDPOINT
+    obj.grant_management_action_required              = GRANT_MANAGEMENT_ACTION_REQUIRED
+    obj.unauthorized_on_client_config_supported       = UNATHORIZED_ON_CLIENT_CONFIG_SUPPORTED
   end
 
 
@@ -624,6 +654,18 @@ class ServiceTest < Minitest::Test
     assert_equal FRONT_CHANNEL_REQUEST_OBJECT_ENCRYPTION_REQUIRED, obj.frontChannelRequestObjectEncryptionRequired
     assert_equal REQUEST_OBJECT_ENCRYPTION_ALG_MATCH_REQUIRED,     obj.requestObjectEncryptionAlgMatchRequired
     assert_equal REQUEST_OBJECT_ENCRYPTION_ENC_MATCH_REQUIRED,     obj.requestObjectEncryptionEncMatchRequired
+    assert_equal HSKS_KTY,                                         obj.hsks[0].kty
+    assert_equal HSKS_USE,                                         obj.hsks[0].use
+    assert_equal HSKS_ALG,                                         obj.hsks[0].alg
+    assert_equal HSKS_KID,                                         obj.hsks[0].kid
+    assert_equal HSKS_HSMNAME,                                     obj.hsks[0].hsmName
+    assert_equal HSKS_HANDLE,                                      obj.hsks[0].handle
+    assert_equal HSKS_PUBLICKEY,                                   obj.hsks[0].publicKey
+    assert_equal HSM_ENABLED,                                      obj.hsmEnabled
+    assert_equal REFRESH_TOKEN_DURATION_RESET,                     obj.refreshTokenDurationReset
+    assert_equal GRANT_MANAGEMENT_ENDPOINT,                        obj.grantManagementEndpoint
+    assert_equal GRANT_MANAGEMENT_ACTION_REQUIRED,                 obj.grantManagementActionRequired
+    assert_equal UNATHORIZED_ON_CLIENT_CONFIG_SUPPORTED,           obj.unauthorizedOnClientConfigSupported
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authlete
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Takahiko Kawasaki
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-26 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -29,30 +29,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 description: A library for Authlete Web APIs. See https://docs.authlete.com/ for details.
 email:
 - admin@authlete.com
@@ -75,6 +75,7 @@ files:
 - lib/authlete/model/client-extension.rb
 - lib/authlete/model/client.rb
 - lib/authlete/model/hashable.rb
+- lib/authlete/model/hsk.rb
 - lib/authlete/model/named-uri.rb
 - lib/authlete/model/pair.rb
 - lib/authlete/model/param-initializer.rb
@@ -207,6 +208,7 @@ files:
 - test/authlete/model/response/test_user-info-response.rb
 - test/authlete/model/test_client-extension.rb
 - test/authlete/model/test_client.rb
+- test/authlete/model/test_hsk.rb
 - test/authlete/model/test_named-uri.rb
 - test/authlete/model/test_pair.rb
 - test/authlete/model/test_property.rb
@@ -236,8 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.8
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: A library for Authlete Web APIs
@@ -300,6 +301,7 @@ test_files:
 - test/authlete/model/response/test_user-info-response.rb
 - test/authlete/model/test_client-extension.rb
 - test/authlete/model/test_client.rb
+- test/authlete/model/test_hsk.rb
 - test/authlete/model/test_named-uri.rb
 - test/authlete/model/test_pair.rb
 - test/authlete/model/test_property.rb