authlete 1.0.18 → 1.0.23

data/lib/authlete/model/client-extension.rb

@@ -22,7 +22,6 @@ module Authlete
   module Model
     class ClientExtension < Authlete::Model::Hashable
       include Authlete::Utility
-
       # The set of scopes that a client application is allowed to request.
       # (String array)
       attr_accessor :requestableScopes
@@ -36,8 +35,25 @@ module Authlete
       alias_method  :requestable_scopes_enabled, :requestableScopesEnabled
       alias_method  :requestable_scopes_enabled=, :requestableScopesEnabled=
 
+      # The duration of access tokens in seconds that are issued to a client.
+      # (Integer)
+      attr_accessor :accessTokenDuration
+      alias_method  :access_token_duration,  :accessTokenDuration
+      alias_method  :access_token_duration=, :accessTokenDuration=
+
+      # The duration of refresh tokens in seconds that are issued to a client.
+      # (Integer)
+      attr_accessor :refreshTokenDuration
+      alias_method  :refresh_token_duration,  :refreshTokenDuration
+      alias_method  :refresh_token_duration=, :refreshTokenDuration=
+
       private
 
+      # Integer attributes.
+      INTEGER_ATTRIBUTES = ::Set.new([
+        :accessTokenDuration, :refreshTokenDuration
+      ])
+
       # Boolean attributes.
       BOOLEAN_ATTRIBUTES = ::Set.new([
         :requestableScopesEnabled
@@ -51,11 +67,18 @@ module Authlete
       # Mapping from snake cases to camel cases.
       SNAKE_TO_CAMEL = {
         :requestable_scopes         => :requestableScopes,
-        :requestable_scopes_enabled => :requestableScopesEnabled
+        :requestable_scopes_enabled => :requestableScopesEnabled,
+        :access_token_duration      => :accessTokenDuration,
+        :refresh_token_duration     => :refreshTokenDuration
       }
 
       # The constructor
       def initialize(hash = nil)
+        # Set default values to integer attributes.
+        INTEGER_ATTRIBUTES.each do |attr|
+          send("#{attr}=", 0)
+        end
+
         # Set default values to boolean attributes.
         BOOLEAN_ATTRIBUTES.each do |attr|
           send("#{attr}=", false)
@@ -82,6 +105,7 @@ module Authlete
       end
 
       def authlete_model_simple_attribute?(key)
+        INTEGER_ATTRIBUTES.include?(key) or
         BOOLEAN_ATTRIBUTES.include?(key) or
         STRING_ARRAY_ATTRIBUTES.include?(key)
       end

data/lib/authlete/model/client.rb

@@ -371,6 +371,18 @@ module Authlete
       alias_method  :authorization_data_types,  :authorizationDataTypes
       alias_method  :authorization_data_types=, :authorizationDataTypes=
 
+      # Flag of whether this client is required to use the pushed authorization
+      # request endpoint. (Boolean)
+      attr_accessor :parRequired
+      alias_method  :par_required,  :parRequired
+      alias_method  :par_required=, :parRequired=
+
+      # Flag of whether authorization requests from this client must always
+      # contain a request object. (Boolean)
+      attr_accessor :requestObjectRequired
+      alias_method  :request_object_required,  :requestObjectRequired
+      alias_method  :request_object_required=, :requestObjectRequired=
+
       private
 
       # Integer attributes.
@@ -381,7 +393,7 @@ module Authlete
       # Boolean attributes.
       BOOLEAN_ATTRIBUTES = ::Set.new([
         :authTimeRequired, :clientIdAliasEnabled, :tlsClientCertificateBoundAccessTokens,
-        :bcUserCodeRequired, :dynamicallyRegistered
+        :bcUserCodeRequired, :dynamicallyRegistered, :parRequired, :requestObjectRequired
       ])
 
       # String attributes.
@@ -411,64 +423,66 @@ module Authlete
 
       # Mapping from snake cases to camel cases.
       SNAKE_TO_CAMEL = {
-        :service_number                              => :serviceNumber,
-        :client_id                                   => :clientId,
-        :client_id_alias                             => :clientIdAlias,
-        :client_id_alias_enabled                     => :clientIdAliasEnabled,
-        :client_secret                               => :clientSecret,
-        :client_type                                 => :clientType,
-        :redirect_uris                               => :redirectUris,
-        :response_types                              => :responseTypes,
-        :grant_types                                 => :grantTypes,
-        :application_type                            => :applicationType,
-        :client_name                                 => :clientName,
-        :client_names                                => :clientNames,
-        :logo_uri                                    => :logoUri,
-        :logo_uris                                   => :logoUris,
-        :client_uri                                  => :clientUri,
-        :client_uris                                 => :clientUris,
-        :policy_uri                                  => :policyUri,
-        :policy_uris                                 => :policyUris,
-        :tos_uri                                     => :tosUri,
-        :tos_uris                                    => :tosUris,
-        :jwks_uri                                    => :jwksUri,
-        :sector_identifier                           => :sectorIdentifier,
-        :subject_type                                => :subjectType,
-        :id_token_sign_alg                           => :idTokenSignAlg,
-        :id_token_encryption_alg                     => :idTokenEncryptionAlg,
-        :id_token_encryption_enc                     => :idTokenEncryptionEnc,
-        :user_info_sign_alg                          => :userInfoSignAlg,
-        :user_info_encryption_alg                    => :userInfoEncryptionAlg,
-        :user_info_encryption_enc                    => :userInfoEncryptionEnc,
-        :request_sign_alg                            => :requestSignAlg,
-        :request_encryption_alg                      => :requestEncryptionAlg,
-        :request_encryption_enc                      => :requestEncryptionEnc,
-        :token_auth_method                           => :tokenAuthMethod,
-        :token_auth_sign_alg                         => :tokenAuthSignAlg,
-        :default_max_age                             => :defaultMaxAge,
-        :default_acrs                                => :defaultAcrs,
-        :auth_time_required                          => :authTimeRequired,
-        :login_uri                                   => :loginUri,
-        :request_uris                                => :requestUris,
-        :created_at                                  => :createdAt,
-        :modified_at                                 => :modifiedAt,
-        :tls_client_auth_subject_dn                  => :tlsClientAuthSubjectDn,
-        :tls_client_certificate_bound_access_tokens  => :tlsClientCertificateBoundAccessTokens,
-        :self_signed_certificate_key_id              => :selfSignedCertificateKeyId,
-        :authorization_sign_alg                      => :authorizationSignAlg,
-        :authorization_encryption_alg                => :authorizationEncryptionAlg,
-        :authorization_encryption_enc                => :authorizationEncryptionEnc,
-        :bc_delivery_mode                            => :bcDeliveryMode,
-        :bc_notification_endpoint                    => :bcNotificationEndpoint,
-        :bc_request_sign_alg                         => :bcRequestSignAlg,
-        :bc_user_code_required                       => :bcUserCodeRequired,
-        :dynamically_registered                      => :dynamicallyRegistered,
-        :tls_client_auth_san_email                   => :tlsClientAuthSanEmail,
-        :tls_client_auth_san_ip                      => :tlsClientAuthSanIp,
-        :tls_client_auth_san_uri                     => :tlsClientAuthSanUri,
-        :tls_client_auth_san_dns                     => :tlsClientAuthSanDns,
-        :sector_identifier_uri                       => :sectorIdentifierUri,
-        :authorization_data_types                    => :authorizationDataTypes
+        :service_number                             => :serviceNumber,
+        :client_id                                  => :clientId,
+        :client_id_alias                            => :clientIdAlias,
+        :client_id_alias_enabled                    => :clientIdAliasEnabled,
+        :client_secret                              => :clientSecret,
+        :client_type                                => :clientType,
+        :redirect_uris                              => :redirectUris,
+        :response_types                             => :responseTypes,
+        :grant_types                                => :grantTypes,
+        :application_type                           => :applicationType,
+        :client_name                                => :clientName,
+        :client_names                               => :clientNames,
+        :logo_uri                                   => :logoUri,
+        :logo_uris                                  => :logoUris,
+        :client_uri                                 => :clientUri,
+        :client_uris                                => :clientUris,
+        :policy_uri                                 => :policyUri,
+        :policy_uris                                => :policyUris,
+        :tos_uri                                    => :tosUri,
+        :tos_uris                                   => :tosUris,
+        :jwks_uri                                   => :jwksUri,
+        :sector_identifier                          => :sectorIdentifier,
+        :subject_type                               => :subjectType,
+        :id_token_sign_alg                          => :idTokenSignAlg,
+        :id_token_encryption_alg                    => :idTokenEncryptionAlg,
+        :id_token_encryption_enc                    => :idTokenEncryptionEnc,
+        :user_info_sign_alg                         => :userInfoSignAlg,
+        :user_info_encryption_alg                   => :userInfoEncryptionAlg,
+        :user_info_encryption_enc                   => :userInfoEncryptionEnc,
+        :request_sign_alg                           => :requestSignAlg,
+        :request_encryption_alg                     => :requestEncryptionAlg,
+        :request_encryption_enc                     => :requestEncryptionEnc,
+        :token_auth_method                          => :tokenAuthMethod,
+        :token_auth_sign_alg                        => :tokenAuthSignAlg,
+        :default_max_age                            => :defaultMaxAge,
+        :default_acrs                               => :defaultAcrs,
+        :auth_time_required                         => :authTimeRequired,
+        :login_uri                                  => :loginUri,
+        :request_uris                               => :requestUris,
+        :created_at                                 => :createdAt,
+        :modified_at                                => :modifiedAt,
+        :tls_client_auth_subject_dn                 => :tlsClientAuthSubjectDn,
+        :tls_client_certificate_bound_access_tokens => :tlsClientCertificateBoundAccessTokens,
+        :self_signed_certificate_key_id             => :selfSignedCertificateKeyId,
+        :authorization_sign_alg                     => :authorizationSignAlg,
+        :authorization_encryption_alg               => :authorizationEncryptionAlg,
+        :authorization_encryption_enc               => :authorizationEncryptionEnc,
+        :bc_delivery_mode                           => :bcDeliveryMode,
+        :bc_notification_endpoint                   => :bcNotificationEndpoint,
+        :bc_request_sign_alg                        => :bcRequestSignAlg,
+        :bc_user_code_required                      => :bcUserCodeRequired,
+        :dynamically_registered                     => :dynamicallyRegistered,
+        :tls_client_auth_san_email                  => :tlsClientAuthSanEmail,
+        :tls_client_auth_san_ip                     => :tlsClientAuthSanIp,
+        :tls_client_auth_san_uri                    => :tlsClientAuthSanUri,
+        :tls_client_auth_san_dns                    => :tlsClientAuthSanDns,
+        :sector_identifier_uri                      => :sectorIdentifierUri,
+        :authorization_data_types                   => :authorizationDataTypes,
+        :par_required                               => :parRequired,
+        :request_object_required                    => :requestObjectRequired
       }
 
       # The constructor

data/lib/authlete/model/scope.rb

@@ -1,158 +1,158 @@
-# :nodoc:
-#
-# Copyright (C) 2014-2018 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 'set'
-
-
-module Authlete
-  module Model
-    class Scope < Authlete::Model::Hashable
-      include Authlete::Utility
-      # The attributes of this scopes. (Pair array)
-      attr_accessor :attributes
-
-      # The description about this scope. (String)
-      attr_accessor :description
-
-      # The descriptions about this scope with language tags.
-      # (TaggedValue array)
-      attr_accessor :descriptions
-
-      # The name of this scope. (String)
-      attr_accessor :name
-
-      # The flag to indicate whether this scope is included in the
-      # default scope set. (Boolean)
-      attr_accessor :defaultEntry
-      alias_method  :default_entry,  :defaultEntry
-      alias_method  :default_entry=, :defaultEntry=
-
-      private
-
-      # Boolean attributes.
-      BOOLEAN_ATTRIBUTES = ::Set.new([ :defaultEntry ])
-
-      # String attributes.
-      STRING_ATTRIBUTES = ::Set.new([ :description, :name ])
-
-      # Tagged value array attributes.
-      TAGGED_VALUE_ARRAY_ATTRIBUTES = ::Set.new([ :descriptions ])
-
-      # Mapping from snake cases to camel cases.
-      SNAKE_TO_CAMEL = { :default_entry => :defaultEntry }
-
-      # The constructor
-      def initialize(hash = nil)
-        # Set default values to boolean attributes.
-        BOOLEAN_ATTRIBUTES.each do |attr|
-          send("#{attr}=", false)
-        end
-
-        # Set default values to string attributes.
-        STRING_ATTRIBUTES.each do |attr|
-          send("#{attr}=", nil)
-        end
-
-        # Set default values to tagged value array attributes.
-        TAGGED_VALUE_ARRAY_ATTRIBUTES.each do |attr|
-          send("#{attr}=", nil)
-        end
-
-        # Set attribute values using the given hash.
-        authlete_model_update(hash)
-      end
-
-      def authlete_model_convert_key(key)
-        key = key.to_sym
-
-        # Convert snakecase to camelcase, if necessary.
-        if SNAKE_TO_CAMEL.has_key?(key)
-          key = SNAKE_TO_CAMEL[key]
-        end
-
-        key
-      end
-
-      def authlete_model_simple_attribute?(key)
-        BOOLEAN_ATTRIBUTES.include?(key) or
-        STRING_ATTRIBUTES.include?(key)
-      end
-
-      def authlete_model_update(hash)
-        return if hash.nil?
-
-        hash.each do |key, value|
-          key = authlete_model_convert_key(key)
-
-          if authlete_model_simple_attribute?(key)
-            send("#{key}=", value)
-          elsif TAGGED_VALUE_ARRAY_ATTRIBUTES.include?(key)
-            # Get an array consisting of "TaggedValue" objects.
-            parsed = get_parsed_array(value) do |element|
-              Authlete::Model::TaggedValue.parse(element)
-            end
-
-            send("#{key}=", parsed)
-          elsif key == :attributes
-            @attributes = get_parsed_array(value) do |element|
-              Authlete::Model::Pair.parse(element)
-            end
-          end
-        end
-
-        self
-      end
-
-      public
-
-      # Construct an instance from the given hash.
-      #
-      # If the given argument is nil or is not a Hash, nil is returned.
-      # Otherwise, Scope.new(hash) is returned.
-      def self.parse(hash)
-        if hash.nil? or (hash.kind_of?(Hash) == false)
-          return nil
-        end
-
-        Authlete::Model::Scope.new(hash)
-      end
-
-      # Set attribute values using the given hash.
-      def update(hash)
-        authlete_model_update(hash)
-      end
-
-      # Convert this object into a hash.
-      def to_hash
-        hash = {}
-
-        instance_variables.each do |var|
-          key = var.to_s.delete("@").to_sym
-          val = instance_variable_get(var)
-
-          if authlete_model_simple_attribute?(key) or val.nil?
-            hash[key] = val
-          elsif key == :attributes or key == :descriptions
-            hash[key] = val.map { |element| element.to_hash }
-          end
-        end
-
-        hash
-      end
-    end
-  end
+# :nodoc:
+#
+# Copyright (C) 2014-2018 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 'set'
+
+
+module Authlete
+  module Model
+    class Scope < Authlete::Model::Hashable
+      include Authlete::Utility
+      # The attributes of this scopes. (Pair array)
+      attr_accessor :attributes
+
+      # The description about this scope. (String)
+      attr_accessor :description
+
+      # The descriptions about this scope with language tags.
+      # (TaggedValue array)
+      attr_accessor :descriptions
+
+      # The name of this scope. (String)
+      attr_accessor :name
+
+      # The flag to indicate whether this scope is included in the
+      # default scope set. (Boolean)
+      attr_accessor :defaultEntry
+      alias_method  :default_entry,  :defaultEntry
+      alias_method  :default_entry=, :defaultEntry=
+
+      private
+
+      # Boolean attributes.
+      BOOLEAN_ATTRIBUTES = ::Set.new([ :defaultEntry ])
+
+      # String attributes.
+      STRING_ATTRIBUTES = ::Set.new([ :description, :name ])
+
+      # Tagged value array attributes.
+      TAGGED_VALUE_ARRAY_ATTRIBUTES = ::Set.new([ :descriptions ])
+
+      # Mapping from snake cases to camel cases.
+      SNAKE_TO_CAMEL = { :default_entry => :defaultEntry }
+
+      # The constructor
+      def initialize(hash = nil)
+        # Set default values to boolean attributes.
+        BOOLEAN_ATTRIBUTES.each do |attr|
+          send("#{attr}=", false)
+        end
+
+        # Set default values to string attributes.
+        STRING_ATTRIBUTES.each do |attr|
+          send("#{attr}=", nil)
+        end
+
+        # Set default values to tagged value array attributes.
+        TAGGED_VALUE_ARRAY_ATTRIBUTES.each do |attr|
+          send("#{attr}=", nil)
+        end
+
+        # Set attribute values using the given hash.
+        authlete_model_update(hash)
+      end
+
+      def authlete_model_convert_key(key)
+        key = key.to_sym
+
+        # Convert snakecase to camelcase, if necessary.
+        if SNAKE_TO_CAMEL.has_key?(key)
+          key = SNAKE_TO_CAMEL[key]
+        end
+
+        key
+      end
+
+      def authlete_model_simple_attribute?(key)
+        BOOLEAN_ATTRIBUTES.include?(key) or
+        STRING_ATTRIBUTES.include?(key)
+      end
+
+      def authlete_model_update(hash)
+        return if hash.nil?
+
+        hash.each do |key, value|
+          key = authlete_model_convert_key(key)
+
+          if authlete_model_simple_attribute?(key)
+            send("#{key}=", value)
+          elsif TAGGED_VALUE_ARRAY_ATTRIBUTES.include?(key)
+            # Get an array consisting of "TaggedValue" objects.
+            parsed = get_parsed_array(value) do |element|
+              Authlete::Model::TaggedValue.parse(element)
+            end
+
+            send("#{key}=", parsed)
+          elsif key == :attributes
+            @attributes = get_parsed_array(value) do |element|
+              Authlete::Model::Pair.parse(element)
+            end
+          end
+        end
+
+        self
+      end
+
+      public
+
+      # Construct an instance from the given hash.
+      #
+      # If the given argument is nil or is not a Hash, nil is returned.
+      # Otherwise, Scope.new(hash) is returned.
+      def self.parse(hash)
+        if hash.nil? or (hash.kind_of?(Hash) == false)
+          return nil
+        end
+
+        Authlete::Model::Scope.new(hash)
+      end
+
+      # Set attribute values using the given hash.
+      def update(hash)
+        authlete_model_update(hash)
+      end
+
+      # Convert this object into a hash.
+      def to_hash
+        hash = {}
+
+        instance_variables.each do |var|
+          key = var.to_s.delete("@").to_sym
+          val = instance_variable_get(var)
+
+          if authlete_model_simple_attribute?(key) or val.nil?
+            hash[key] = val
+          elsif key == :attributes or key == :descriptions
+            hash[key] = val.map { |element| element.to_hash }
+          end
+        end
+
+        hash
+      end
+    end
+  end
 end