omniauth-discord 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eb69f9639617d5747654388e3fef787150c7ac82802f3c29c07889c2baa5c2b
-  data.tar.gz: f9c7d75499726e2dfc28c6da5172492a326852015fc31521d2cff95a6d57141f
+  metadata.gz: c7e8c36d444404a9248c61a4cbe2efc24ab9daedcc8d72b95371a64844c975eb
+  data.tar.gz: 96619b3fd3c018843e8be931f8520fda07b2b30bfae2e843e587b5259f11f236
 SHA512:
-  metadata.gz: 2e9da45436efa842917566fa28a91d75d13c49b346fe9e2f29d90b017ec45b64d8f0e90a1903648a0840a5ca238bbb24f7ab672eb47007b4873cae8e551e46f3
-  data.tar.gz: ea0a1c97d9a7c7e8c43c40fd4de90af831829df2cd5b57addd706ee06431c6c51c878d07d09391eeec62023f47473269e1b57327dbc11e540356fc65493c78d9
+  metadata.gz: a593ff764c850a8a4efb395e8bb8efe9cc56fe2e938aac169f782675dd89f80ff75882e0c5ac13fecf0870942371574df71da914cedf71608be80bbbcfc757cf
+  data.tar.gz: 061d325e89a4a29e24b8bcdaf32c6a276f5d7e96da1cef5cb2ba87478ea2b93543b873c692c1d6535c4a996eae6aa2aa6ce3c7ba793b9ae616984f0be758c001

data/.github/workflows/gem-push.yml

@@ -0,0 +1,33 @@
+name: Ruby Gem
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  build:
+
+    name: Build + Publish Gem
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: 2.7.2
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

data/.github/workflows/rspec.yml

@@ -0,0 +1,25 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.travis.yml

@@ -1,17 +1,28 @@
+env:
+  global:
+    - CC_TEST_REPORTER_ID=ABC123
+
 language: ruby
 before_install: gem install bundler
 
 rvm:
+  - 2.6.1
   - 2.3.0
-  - 2.2
-  - 2.1
-  - 2.0
   - jruby-head
-  - rbx-2
-  
+
 gemfile:
   - Gemfile
 
 notifications:
-  email: false
+  email: true
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+
+script:
+  - bundle exec rspec
 
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/README.md

@@ -47,6 +47,15 @@ Rails.application.config.middleware.use OmniAuth::Builder do
 end
 ```
 
+You can set callback url
+
+
+```ruby
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :discord, ENV['DISCORD_CLIENT_ID'], ENV['DISCORD_CLIENT_SECRET'], scope: 'email identify', callback_url: 'https://someurl.com/users/auth/discord/callback'
+end
+```
+
 ## Specifying additional permissions
 
 You can also request additional permissions from the user. See the
@@ -61,6 +70,10 @@ end
 This will request permission to the MANAGE_CHANNELS and the MANAGE_ROLES
 permissions.
 
+## Specifying the prompt options
+
+Discord looks for the prompt option to indicate if the user should be prompted to reauthorize on sign in. Valid options are 'consent' and 'none'. Note that the use is always prompted to authorize on sign up.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/adaoraul/omniauth-discord.

data/example/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'sinatra'
+gem 'sinatra-reloader'
+gem 'omniauth-discord', path: '../'

data/example/Gemfile.lock

@@ -0,0 +1,60 @@
+PATH
+  remote: ..
+  specs:
+    omniauth-discord (1.0.0)
+      omniauth
+      omniauth-oauth2
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    backports (3.15.0)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
+    hashie (3.6.0)
+    jwt (2.2.1)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    mustermann (1.0.3)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.9.0)
+      hashie (>= 3.4.6, < 3.7.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-oauth2 (1.6.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.9)
+    rack (2.2.3)
+    rack-protection (2.0.5)
+      rack
+    sinatra (2.0.5)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.5)
+      tilt (~> 2.0)
+    sinatra-contrib (2.0.5)
+      backports (>= 2.8.2)
+      multi_json
+      mustermann (~> 1.0)
+      rack-protection (= 2.0.5)
+      sinatra (= 2.0.5)
+      tilt (>= 1.3, < 3)
+    sinatra-reloader (1.0)
+      sinatra-contrib
+    tilt (2.0.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  omniauth-discord!
+  sinatra
+  sinatra-reloader
+
+BUNDLED WITH
+   2.0.2

data/example/app.rb

@@ -0,0 +1,23 @@
+require 'sinatra'
+require "sinatra/reloader"
+require 'yaml'
+
+# configure sinatra
+set :run, false
+set :raise_errors, true
+
+get '/' do
+  content_type 'text/html'
+  <<-HTML
+    <html>
+      <body>
+        <a href="/auth/discord">Connect to Discord!</a>
+      </body>
+    </html>
+  HTML
+end
+
+get '/auth/:provider/callback' do
+  content_type 'application/json'
+  MultiJson.encode(request.env)
+end

data/example/config.ru

@@ -0,0 +1,11 @@
+require 'bundler/setup'
+require 'omniauth-discord'
+require './app.rb'
+
+use Rack::Session::Cookie, secret: '123456789'
+
+use OmniAuth::Builder do
+  provider :discord, ENV['DISCORD_CLIENT_ID'], ENV['DISCORD_CLIENT_ID'], scope: ENV['SCOPE']
+end
+
+run Sinatra::Application

data/lib/omniauth/discord/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Discord
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.0.2'.freeze
   end
 end

data/lib/omniauth/strategies/discord.rb

@@ -8,11 +8,11 @@ module OmniAuth
       option :name, 'discord'
 
       option :client_options,
-             site: 'https://discordapp.com/api',
+             site: 'https://discord.com/api',
              authorize_url: 'oauth2/authorize',
              token_url: 'oauth2/token'
 
-      option :authorize_options, %i[scope permissions]
+      option :authorize_options, %i[scope permissions prompt]
 
       uid { raw_info['id'] }
 
@@ -20,7 +20,8 @@ module OmniAuth
         {
           name: raw_info['username'],
           email: raw_info['verified'] ? raw_info['email'] : nil,
-          image: "https://cdn.discordapp.com/avatars/#{raw_info['id']}/#{raw_info['avatar']}"
+          # CDN is still cdn.discordapp.com
+          image: raw_info['avatar'].present? ? "https://cdn.discordapp.com/avatars/#{raw_info['id']}/#{raw_info['avatar']}" : nil,
         }
       end
 
@@ -36,7 +37,7 @@ module OmniAuth
 
       def callback_url
         # Discord does not support query parameters
-        full_host + script_name + callback_path
+        options[:callback_url] || (full_host + script_name + callback_path)
       end
 
       def authorize_params

data/omniauth-discord.gemspec

@@ -17,10 +17,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'omniauth'
+  spec.add_runtime_dependency 'omniauth', '~> 2.0.4'
   spec.add_runtime_dependency 'omniauth-oauth2'
 
   spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-discord
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Adão Raul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+- !ruby/object:Gem::Dependency
+  name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-oauth2
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,6 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gem-push.yml"
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -108,6 +124,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- example/Gemfile
+- example/Gemfile.lock
+- example/app.rb
+- example/config.ru
 - lib/omniauth-discord.rb
 - lib/omniauth/discord.rb
 - lib/omniauth/discord/version.rb
@@ -132,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Discord OAuth2 Strategy for OmniAuth