microsoft_kiota_authentication_oauth 0.25.1 → 0.25.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b00ad195eb3933fe1efd796a5346257abf818e80a5063bda1a63c5a3ef9e7c5c
-  data.tar.gz: 8fc9c22ce06ceed7f06458b1faf10f4d304be855ae3b13888d9680a7ff4e0be3
+  metadata.gz: 16a7322e45b5fe81041d3ee2615f4101f3eec9fb795bb20edc2477c2236e0069
+  data.tar.gz: c9bb37a3fe121fb366f6a3cb6b00201ae612981bab514d1da821937e2a77a387
 SHA512:
-  metadata.gz: 911583ddfadad02fd709e60983e28533058de14952e6b36b6dc9301c6abd844d4dd723bf36ce92687b1e5150bad20593344519530b2b10853490c7ffc32fcb98
-  data.tar.gz: 2e0c098e7780bc71c9ae2472ae4781926b86335746039ce1937b08ffc54f5cfdd8174ddea6b9f79886b30fa828c79fa04a3dba2f70767895aec71ee5d4acdedf
+  metadata.gz: 7fa056cfa525c11c57f9b512678bb45135b3b83dfeaaafeb349a1037ff1738433f5856628007768c4d2413b0bef5caac66ae084b9fc65835195b38ad233a74bc
+  data.tar.gz: 50afae4667edee83700ffed74d9b68012999a90227044c062fc2de50fff3f9fbecc06878f9ad4e92a29b939478565606ee691177f0c9c8f52d846e9c7182813e

data/lib/microsoft_kiota_authentication_oauth/oauth_access_token_provider.rb

@@ -12,6 +12,8 @@ require_relative 'contexts/oauth_custom_flow'
 module MicrosoftKiotaAuthenticationOAuth
   # Access Token Provider class implementation
   class OAuthAccessTokenProvider
+    LOCALHOST_STRINGS = MicrosoftKiotaAbstractions::AllowedHostsValidator::LOCALHOST_STRINGS
+
     # This is the initializer for OAuthAccessTokenProvider.
     # :params
     #   token_request_context: a instance of one of our token request context or a custom implementation
@@ -27,7 +29,7 @@ module MicrosoftKiotaAuthenticationOAuth
               'Parameter token_request_context must be an instance of one of our grant flow context classes.'
       end
 
-      @cached_token = nil
+      @cached_tokens = {}
 
       @host_validator = if allowed_hosts.nil? || allowed_hosts.empty?
                           MicrosoftKiotaAbstractions::AllowedHostsValidator.new([])
@@ -38,7 +40,7 @@ module MicrosoftKiotaAuthenticationOAuth
       @scopes = if scopes.nil?
                   []
                 else
-                  scopes
+                  scopes.dup
                 end
     end
 
@@ -48,40 +50,98 @@ module MicrosoftKiotaAuthenticationOAuth
     #   additional_params: hash of symbols to string values, ie { response_mode: 'fragment', prompt: 'login' }
     #                      default is empty hash
     def get_authorization_token(uri, _additional_properties = {})
-      return Fiber.new { nil } if !uri || !@host_validator.url_host_valid?(uri)
+      return Fiber.new { nil } if !uri || uri.to_s.empty?
 
-      parsed_url = URI(uri)
+      parsed_url = parse_uri(uri)
+      return Fiber.new { nil } if parsed_url.nil? || !valid_host?(parsed_url)
 
-      raise StandardError, 'Only https is supported' if parsed_url.scheme != 'https'
+      validate_scheme!(parsed_url)
 
-      @scopes << "#{parsed_url.scheme}://#{parsed_url.host}/.default" if @scopes.empty?
-      @token_request_context.initialize_scopes(@scopes)
+      effective_scopes = determine_scopes(parsed_url)
+      cache_key = effective_scopes.freeze
       Fiber.new do
-        if @cached_token
-          token = OAuth2::AccessToken.from_hash(@token_request_context.oauth_provider, @cached_token)
-          token.token unless token.nil? || token.expired?
-
-          if token.expired?
-            token = token.refresh!
-            @cached_token = token.to_hash
-            token.token
-          end
-        end
+        @token_request_context.initialize_scopes(effective_scopes)
+        fetch_token(cache_key)
+      end
+    end
 
-        nil
-        token = @token_request_context.get_token
+    attr_reader :scopes, :host_validator
+
+    protected
+
+    attr_writer :host_validator, :token_credential, :scopes, :cached_tokens
 
+    private
+
+    def parse_uri(uri)
+      parsed = URI(uri)
+      return nil if parsed.nil? || parsed.host.nil? || parsed.host.empty?
+
+      parsed
+    rescue URI::InvalidURIError, ArgumentError
+      nil
+    end
+
+    def valid_host?(parsed_url)
+      https_version = parsed_url.dup
+      https_version.scheme = 'https'
+      @host_validator.url_host_valid?(https_version.to_s)
+    end
+
+    def validate_scheme!(parsed_url)
+      scheme = parsed_url.scheme&.downcase
+      return if scheme == 'https' || (scheme == 'http' && localhost?(parsed_url))
+
+      raise StandardError, 'Only https is supported'
+    end
+
+    def determine_scopes(parsed_url)
+      @scopes.empty? ? ["#{parsed_url.scheme}://#{parsed_url.host}/.default"] : @scopes.dup
+    end
+
+    def fetch_token(cache_key)
+      token_value = nil
+      cached_token = @cached_tokens[cache_key]
+      token_value = resolve_cached_token(cached_token, cache_key) unless cached_token.nil?
+
+      if token_value.nil?
+        token = @token_request_context.get_token
         unless token.nil?
-          @cached_token = token.to_hash
-          token.token
+          @cached_tokens[cache_key] = token.to_hash
+          token_value = token.token
         end
       end
+
+      token_value
     end
 
-    attr_reader :scopes, :host_validator
+    def resolve_cached_token(cached_token, cache_key)
+      token = OAuth2::AccessToken.from_hash(@token_request_context.oauth_provider, cached_token)
+      return nil unless token
 
-    protected
+      if token.expired?
+        return nil if token.refresh_token.nil? || token.refresh_token.empty?
 
-    attr_writer :host_validator, :token_credential, :scopes, :cached_token
+        token = token.refresh!
+        @cached_tokens[cache_key] = token.to_hash
+      end
+      token.token
+    end
+
+    def localhost?(parsed_url)
+      if @host_validator.respond_to?(:localhost?)
+        @host_validator.localhost?(parsed_url)
+      else
+        host = parsed_url.host
+        return false if host.nil?
+
+        return true if LOCALHOST_STRINGS.include?(host.downcase)
+
+        hostname = parsed_url.hostname
+        return false if hostname.nil?
+
+        LOCALHOST_STRINGS.include?(hostname.downcase)
+      end
+    end
   end
 end

data/lib/microsoft_kiota_authentication_oauth/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MicrosoftKiotaAuthenticationOAuth
-  VERSION = '0.25.1' # x-release-please-version
+  VERSION = '0.25.3' # x-release-please-version
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: microsoft_kiota_authentication_oauth
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.25.3
 platform: ruby
 authors:
 - Microsoft Corporation
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.1
+        version: 0.25.3
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement