microsoft_kiota_authentication_oauth 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f49ff1a865cc86dc2ebd9a925d5ba9ac014c1e1b83515914d3a6baf92ea5f7f
-  data.tar.gz: e0add8d9df6e81895e77493e7125b84604a6a021c269315076fe1b0cc7e5a416
+  metadata.gz: f62df65c21976f6c761f82bcec62fe603d36a139c19db481c7e23b1c90d47524
+  data.tar.gz: d6525e628ef7a822cceefd9b83c0dc66d7830a3245f9226a0fa53fa924337b8e
 SHA512:
-  metadata.gz: 5f44f1eb63e0b13b7454fde399ed6a52a87c569c456c7ff598d1cc62698904c159633d79bc0a3fe2c721348ff6498afc54c3f0dcfd834cbc2c5e878cfcaaf9be
-  data.tar.gz: 4a9ce2aa365181f4c90d805338b6b53f7f63f2aeee54e05e44cf308adc64790b3ecd3817c8f86c8f88dd733f7e60319456e54e45d0fcd3048b351922ace6cb2a
+  metadata.gz: f68aca9abc1f4b337b16f2171a238c896e29187c779b3cdb7598150de55e988fdaa47fc56756d0574664355c3a68686b9ce1f3d3ac48ffc2fb22ce5d653f64e4
+  data.tar.gz: 7c38d9c15ad533372599c2fe8a77b056451ec869c5b9ffbca7bd8743d118f469b4f8ed328bdc51f3174026b844160fc0f0fe954d1ecf5645adb363ab665ea186

data/.github/CODEOWNERS

@@ -1 +1 @@
-* @andrueastman @baywet @darrelmiller @zengin @MichaelMainer @ddyett @peombwa @nikithauc @ramsessanchez @calebkiage @Ndiritu @rkodev @gavinbarron
+* @andrueastman @baywet @zengin @MichaelMainer @peombwa @calebkiage @Ndiritu @rkodev

data/.github/workflows/auto-merge-dependabot.yml

@@ -0,0 +1,32 @@
+name: Auto-merge dependabot updates
+
+on:
+  pull_request:
+    branches: [ main ]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+
+  dependabot-merge:
+
+    runs-on: ubuntu-latest
+
+    if: ${{ github.actor == 'dependabot[bot]' }}
+
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.6
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Enable auto-merge for Dependabot PRs
+        # Only if version bump is not a major version change
+        if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

data/.github/workflows/projectsbot.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: tibdex/github-app-token@021a2405c7f990db57f5eae5397423dcc554159c
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
         with:
           app_id: ${{ secrets.GRAPHBOT_APP_ID }}
           private_key: ${{ secrets.GRAPHBOT_APP_PEM }}

data/.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: '3.2'
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
           bundler: 'latest'
           cache-version: 1

data/.github/workflows/ruby.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby-version: ['2.7', '3.0', '3.1', head, jruby, jruby-head, truffleruby, truffleruby-head]
+        ruby-version: ['3.0', '3.1', '3.2', head, jruby, jruby-head, truffleruby, truffleruby-head]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -25,7 +25,7 @@ jobs:
       - name: Run tests
         run: bundle exec rake
       - name: Upload artifacts for ruby version 3 and ubuntu
-        if: ${{ matrix.os == 'ubuntu-latest'  && matrix.ruby-version == '3.1'}}
+        if: ${{ matrix.os == 'ubuntu-latest'  && matrix.ruby-version == '3.2'}}
         uses: actions/upload-artifact@v3
         with:
           name: drop

data/CHANGELOG.md

@@ -11,6 +11,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+## [0.8.0] - 2023-03-28
+
+### Changed
+
+- Updated kiota abstractions reference
+- Bumped minimum required ruby version to 3.0.
+
+## [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.8.0"
 end

data/microsoft_kiota_authentication_oauth.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name = "microsoft_kiota_authentication_oauth"
   spec.version = MicrosoftKiotaAuthenticationOAuth::VERSION
   spec.authors = 'Microsoft Corporation'
-  spec.email = 'graphsdkpub@microsoft.com'
+  spec.email = 'graphsdkpub+ruby@microsoft.com'
   spec.description   = 'Kiota Authentication implementation with oauth2'
   spec.summary       = 'Microsoft Kiota Authentication OAuth - Kiota Ruby Authentication OAuth library'
   spec.homepage      = 'https://microsoft.github.io/kiota/'
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
     'source_code_uri' => 'https://github.com/microsoft/kiota-authentication-oauth-ruby',
     'github_repo'     => 'ssh://github.com/microsoft/kiota-authentication-oauth-ruby'
   }
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.0.0"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -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.14.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,29 @@
 --- !ruby/object:Gem::Specification
 name: microsoft_kiota_authentication_oauth
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-16 00:00:00.000000000 Z
+date: 2023-03-28 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'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.12'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -87,13 +81,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Kiota Authentication implementation with oauth2
-email: graphsdkpub@microsoft.com
+email: graphsdkpub+ruby@microsoft.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".github/CODEOWNERS"
 - ".github/dependabot.yml"
+- ".github/workflows/auto-merge-dependabot.yml"
 - ".github/workflows/code-ql.yml"
 - ".github/workflows/conflicting-pr-label.yml"
 - ".github/workflows/projectsbot.yml"
@@ -136,14 +131,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: Microsoft Kiota Authentication OAuth - Kiota Ruby Authentication OAuth library