omniauth-pagerduty 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe2dc85dab1301ca82296b54aec38b4a0d6d6e29970769a6e341d6e2469f3b37
-  data.tar.gz: c3bb1c303e57a3dca735daee720dfbe9b8979beee928bef67dd20ceb7ea0e859
+  metadata.gz: 375ec937ffed26c1d1b993f31408aa944f269bd6864bc1628c4a5b7c0da20249
+  data.tar.gz: 3a7351de98716415128707c2b41c35f8d441fe8d8782b84b99aa22589069b3ee
 SHA512:
-  metadata.gz: cacffbc4532af2dd6bc857b7173d0526ee836dd8c0b2536ac80d29001a29754a69a9b8a7838571a7b420dee514d0887978aa34f1f838321a7eab599910286380
-  data.tar.gz: 980b12706b49bb370a5c11500b61b6146baab7ed132b73a2a06d859f08469d75e957cf1ff9eff31d0002b505637a55cb8da38ce74ce4fec290d8878ff3a5e2e4
+  metadata.gz: 32465ee14a2d9d1c92ad3c85ecf28af73216201e97b670331565097de1004941f6852bb1611a42796b4cfdde1713276dcf22b47a0234e9e7ad317111a3b9958d
+  data.tar.gz: ec125f006f421f562078fa4a772dff26fa6e85fe0e43fa0971eea9d1256e028d466ff51eda7dd6da93962fcd76614908e81f61dca778cb1094fb13ad9d4593da

data/.github/workflows/ruby.yml

@@ -7,12 +7,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ["2.4", "2.5", "2.6", "2.7"]
+        ruby-version: ["3.0", "3.1", "3.2", "3.3"]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby ${{ matrix.ruby-version }}
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
       - name: Build and test with Rake

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version
+.DS_Store

data/README.md

@@ -9,14 +9,14 @@ on the [PagerDuty Developer Page](https://developer.pagerduty.com/sign-up/).
 ## Installation
 
 ```ruby
-gem 'omniauth-pagerduty', github: 'kwent/omniauth-pagerduty', branch: 'master'
+gem 'omniauth-pagerduty'
 ```
 
 ## Basic Usage
 
 ```ruby
 use OmniAuth::Builder do
-  provider :pagerduty, ENV['PAGERDUTY_KEY'], ENV['PAGERDUTY_SECRET']
+  provider :pagerduty, ENV['PAGERDUTY_CLIENT_ID'], ENV['PAGERDUTY_CLIENT_SECRET']
 end
 ```
 
@@ -26,20 +26,10 @@ In `config/initializers/pagerduty.rb`
 
 ```ruby
   Rails.application.config.middleware.use OmniAuth::Builder do
-    provider :pagerduty, ENV['PAGERDUTY_KEY'], ENV['PAGERDUTY_SECRET']
+    provider :pagerduty, ENV['PAGERDUTY_CLIENT_ID'], ENV['PAGERDUTY_CLIENT_SECRET']
   end
 ```
 
-## Scopes
-
-PagerDuty API v3 lets you set scopes to provide granular access to different types of data:
-
-```ruby
-use OmniAuth::Builder do
-  provider :pagerduty, ENV['PAGERDUTY_KEY'], ENV['PAGERDUTY_SECRET']
-end
-```
-
 ## Semver
 
 This project adheres to Semantic Versioning 2.0.0. Any violations of this scheme are considered to be bugs.

data/lib/omniauth/strategies/pagerduty.rb

@@ -1,4 +1,5 @@
 require 'omniauth-oauth2'
+require 'digest'
 
 module OmniAuth
   module Strategies
@@ -6,13 +7,10 @@ module OmniAuth
       option :client_options, {
         site: 'https://api.pagerduty.com',
         authorize_url: 'https://app.pagerduty.com/oauth/authorize',
-        token_url: 'https://app.pagerduty.com/oauth/token',
-        response_type: 'code',
-      }
-
-      option :auth_token_params, {
-        grant_type: 'authorization_code',
+        token_url: 'https://app.pagerduty.com/oauth/token'
       }
+      
+      option :pkce, true
 
       def request_phase
         super
@@ -44,11 +42,11 @@ module OmniAuth
       end
 
       def callback_url
-        full_host + script_name + callback_path
+        options.redirect_url || (full_host + callback_path)
       end
     end
   end
 end
 
 OmniAuth.config.add_camelization 'pagerduty', 'PagerDuty'
-OmniAuth.config.add_camelization 'pager_duty', 'PagerDuty'
+OmniAuth.config.add_camelization 'pager_duty', 'PagerDuty'

data/lib/omniauth-pagerduty/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module PagerDuty
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

data/omniauth-pagerduty.gemspec

@@ -16,8 +16,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = OmniAuth::PagerDuty::VERSION
 
-  gem.add_dependency 'omniauth', '~> 1.5'
+  gem.required_ruby_version = ">= 3"
+
+  gem.add_dependency 'omniauth', '~> 2.0.0'
   gem.add_dependency 'omniauth-oauth2', '>= 1.4.0', '< 2.0'
+
   gem.add_development_dependency 'rspec', '~> 3.5'
   gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'simplecov'

data/spec/omniauth/strategies/pagerduty_spec.rb

@@ -9,7 +9,7 @@ describe OmniAuth::Strategies::PagerDuty do
   let(:enterprise_authorize_url) { 'https://some.other.site.com/login/oauth/authorize' }
   let(:enterprise_token_url)     { 'https://some.other.site.com/login/oauth/token' }
   let(:enterprise) do
-    OmniAuth::Strategies::PagerDuty.new('PAGERDUTY_KEY', 'PAGERDUTY_SECRET',
+    OmniAuth::Strategies::PagerDuty.new('PAGERDUTY_CLIENT_ID', 'PAGERDUTY_CLIENT_SECRET',
         {
             :client_options => {
                 :site => enterprise_site,
@@ -57,11 +57,24 @@ describe OmniAuth::Strategies::PagerDuty do
   end
 
   describe '#callback_url' do
-    it 'is a combination of host, script name, and callback path' do
-      allow(subject).to receive(:full_host).and_return('https://example.com')
-      allow(subject).to receive(:script_name).and_return('/sub_uri')
+    let(:base_url) { 'https://example.com' }
 
-      expect(subject.callback_url).to eq('https://example.com/sub_uri/auth/pagerduty/callback')
+    context 'no script name present' do
+      it 'has the correct default callback path' do
+        allow(subject).to receive(:full_host) { base_url }
+        allow(subject).to receive(:script_name) { '' }
+        allow(subject).to receive(:query_string) { '' }
+        expect(subject.callback_url).to eq(base_url + '/auth/pagerduty/callback')
+      end
+    end
+
+    context 'script name' do
+      it 'should set the callback path with script_name' do
+        allow(subject).to receive(:full_host) { base_url }
+        allow(subject).to receive(:script_name) { '/v1' }
+        allow(subject).to receive(:query_string) { '' }
+        expect(subject.callback_url).to eq(base_url + '/v1/auth/pagerduty/callback')
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-pagerduty
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Michael Bleigh
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2024-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ homepage: https://pagerduty.com/intridea/omniauth-pagerduty
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -133,15 +133,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Official OmniAuth strategy for PagerDuty.
 test_files: