microsoft_kiota_authentication_oauth 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f49ff1a865cc86dc2ebd9a925d5ba9ac014c1e1b83515914d3a6baf92ea5f7f
-  data.tar.gz: e0add8d9df6e81895e77493e7125b84604a6a021c269315076fe1b0cc7e5a416
+  metadata.gz: 902714067fe546a76f525e981f431a9742080faa68f3cb1f82acee3e35a653d3
+  data.tar.gz: baf5b2ae57890e1a98430eb814cb7ffbf4f5dc24b9315d1c31c95aa03b1661a0
 SHA512:
-  metadata.gz: 5f44f1eb63e0b13b7454fde399ed6a52a87c569c456c7ff598d1cc62698904c159633d79bc0a3fe2c721348ff6498afc54c3f0dcfd834cbc2c5e878cfcaaf9be
-  data.tar.gz: 4a9ce2aa365181f4c90d805338b6b53f7f63f2aeee54e05e44cf308adc64790b3ecd3817c8f86c8f88dd733f7e60319456e54e45d0fcd3048b351922ace6cb2a
+  metadata.gz: e07859e61b73bfbebb575e229cc459bfa45ed49fd95db28002e92fbc7ada8c9878389fe7f8bda1c772babfeb07eb506af206c5041ed0244256df14e1a687df18
+  data.tar.gz: e261ed6bd9290c5f9ac4d9fc9672398dbf063e105142807d6aff77fbd1d29af8e7f564d7dba0373b605c3bec001be1afc4056dcee3776d1db91e9ab3466c2e26

data/CHANGELOG.md

@@ -11,6 +11,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+## [0.7.0] - 2023-01-17
+
+### Changed
+
+- Removed Microsoft Graph specific defaults.
+- Fixed an issue where the access token provider would fail on return.
+
 ## [0.6.0] - 2023-01-16
 
 ### Changed

data/README.md

@@ -15,7 +15,7 @@ Read more about Kiota [here](https://github.com/microsoft/kiota/blob/main/README
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "microsoft_kiota_authentication_oauth", "0.5.0"
+gem "microsoft_kiota_authentication_oauth", "0.6.0"
 ```
 
 And then execute:
@@ -27,7 +27,7 @@ bundle install
 Or install it yourself as:
 
 ```shell
-gem install microsoft_kiota_authentication_oauth --version "0.5.0"
+gem install microsoft_kiota_authentication_oauth --version "0.6.0"
 ```
 
 ## Contributing

data/lib/microsoft_kiota_authentication_oauth/contexts/client_credential_context.rb

@@ -44,11 +44,9 @@ module MicrosoftKiotaAuthenticationOAuth
     end
 
     # Function to initialize the scope for the client credential context object.
-    # This function forces to default since gradual consent is not supported 
-    # for this flow.
+    # Only a single scope is supported for this flow and it's expected to be schme://service/.default
     def initialize_scopes(scopes = []) 
-      scope_str = 'https://graph.microsoft.com/.default'
-      @scopes = scope_str
+      @scopes = scopes[0] unless scopes.empty?
     end
 
 

data/lib/microsoft_kiota_authentication_oauth/oauth_access_token_provider.rb

@@ -29,14 +29,16 @@ module MicrosoftKiotaAuthenticationOAuth
       @cached_token = nil
 
       @host_validator = if allowed_hosts.nil? || allowed_hosts.size.zero?
-                          MicrosoftKiotaAbstractions::AllowedHostsValidator.new(['graph.microsoft.com', 'graph.microsoft.us', 'dod-graph.microsoft.us',
-                                                     'graph.microsoft.de', 'microsoftgraph.chinacloudapi.cn',
-                                                     'canary.graph.microsoft.com'])
+                          MicrosoftKiotaAbstractions::AllowedHostsValidator.new([])
                         else
                           MicrosoftKiotaAbstractions::AllowedHostsValidator.new(allowed_hosts)
                         end
       @token_request_context.initialize_oauth_provider
-      @token_request_context.initialize_scopes(scopes)
+      if scopes.nil?
+        @scopes = []
+      else
+        @scopes = scopes
+      end
     end
 
     # This function obtains the authorization token.
@@ -45,29 +47,37 @@ 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 nil if !uri || !@host_validator.url_host_valid?(uri)
+      nil if !uri || !@host_validator.url_host_valid?(uri)
 
       parsed_url = URI(uri)
 
       raise StandardError, 'Only https is supported' if parsed_url.scheme != 'https'
 
+      if @scopes.empty?
+        @scopes << "#{parsed_url.scheme}://#{parsed_url.host}/.default"
+      end
+      @token_request_context.initialize_scopes(@scopes)
       Fiber.new do
         if @cached_token
           token = OAuth2::AccessToken.from_hash(@token_request_context.oauth_provider, @cached_token) 
-          return token.token if !token.nil? && !token.expired?
+          token.token unless token.nil? || token.expired?
 
           if token.expired?
             token = token.refresh!
             @cached_token = token.to_hash
-            return token.token
+            token.token
           end
         end
 
         token = nil
         token = @token_request_context.get_token
 
-        @cached_token = token.to_hash unless token.nil?
-        return token.token unless token.nil?
+        if !token.nil?
+          @cached_token = token.to_hash
+          token.token
+        else
+          nil
+        end
       end
     end
 

data/lib/microsoft_kiota_authentication_oauth/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MicrosoftKiotaAuthenticationOAuth
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/microsoft_kiota_authentication_oauth.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
   
-  spec.add_runtime_dependency 'microsoft_kiota_abstractions', '>= 0.12', '< 0.14'
+  spec.add_runtime_dependency 'microsoft_kiota_abstractions', '~> 0.13.0', '>= 0.13.0'
   spec.add_runtime_dependency 'oauth2', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: microsoft_kiota_authentication_oauth
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-16 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: microsoft_kiota_abstractions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - "<"
+        version: 0.13.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - "<"
+        version: 0.13.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement