omniauth-discord 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7e8c36d444404a9248c61a4cbe2efc24ab9daedcc8d72b95371a64844c975eb
-  data.tar.gz: 96619b3fd3c018843e8be931f8520fda07b2b30bfae2e843e587b5259f11f236
+  metadata.gz: 5a19b6c4bf2c6b7007749e7cffecb160e7da0b333c9a2be2607aeabeb1098453
+  data.tar.gz: 826c1db9c50b1d94ab02b973a6a4e642393a5bac5d44f6372bcafa739589a814
 SHA512:
-  metadata.gz: a593ff764c850a8a4efb395e8bb8efe9cc56fe2e938aac169f782675dd89f80ff75882e0c5ac13fecf0870942371574df71da914cedf71608be80bbbcfc757cf
-  data.tar.gz: 061d325e89a4a29e24b8bcdaf32c6a276f5d7e96da1cef5cb2ba87478ea2b93543b873c692c1d6535c4a996eae6aa2aa6ce3c7ba793b9ae616984f0be758c001
+  metadata.gz: 845d18523d8844e0b8e85e2a6b102377dfc4a391a44c04c98978d74b0e28e27a6bf3e379d15a1cb54f3ccbda5977ee14617d6e8031e424b1710a98506bd379a6
+  data.tar.gz: 2f409257c5d20cdd4d275fa425981807139ecd7ed3bf902dde9de6a272244206b7d0ecbf9978d41344ce6db043159a5fdadf7797c005755f05f0db57798e1c9d

data/.github/workflows/rspec.yml

@@ -12,12 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2']
 
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
-      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      uses: ruby/setup-ruby@v1.131.0
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/README.md

@@ -1,24 +1,22 @@
 # OmniAuth Discord
 
-Discord OAuth2 Strategy for OmniAuth.
+OmniAuth Discord - OAuth2 Strategy for OmniAuth
 
-Read the Discord API documentation for more details: https://discordapp.com/developers/docs/topics/oauth2
+OmniAuth Discord is an OAuth2 strategy for OmniAuth that allows you to authenticate users using Discord. If you're not familiar with Discord's OAuth2, we recommend you check out the Discord API documentation for more details.
 
-## Installing
+## Installation
 
-Add to your `Gemfile`:
+To install OmniAuth Discord, simply add the following line to your Gemfile:
 
 ```ruby
 gem 'omniauth-discord'
 ```
 
-Then `bundle install`.
+Then run bundle install to install the gem.
 
 ## Usage
 
-`OmniAuth::Strategies::Discord` is simply a Rack middleware. Read the OmniAuth docs for detailed instructions: https://github.com/intridea/omniauth.
-
-Here's a quick example, adding the middleware to a Rails app in `config/initializers/omniauth.rb`:
+OmniAuth Discord is a Rack middleware. If you're not familiar with OmniAuth, we recommend reading the documentation for detailed instructions. Here's an example of how to add the middleware to a Rails app in config/initializers/omniauth.rb:
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
@@ -26,10 +24,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do
 end
 ```
 
-By default, Discord does not return a user's email address. Their API uses
-[scopes](https://discordapp.com/developers/docs/topics/oauth2#scopes) to provide
-access to certain resources of a user's account. For example, to get a user's
-email set the scope to `email`.
+By default, Discord does not return a user's email address. You can request access to additional resources by setting scopes. For example, to get a user's email, you would set the scope to 'email'.
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
@@ -37,8 +32,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do
 end
 ```
 
-You can pass multiple scopes in the same string. For example to get a user's
-Discord account info set the scope to `email identify`
+You can pass multiple scopes in the same string. For example, to get a user's Discord account info, you would set the scope to 'email identify'.
 
 
 ```ruby
@@ -47,7 +41,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do
 end
 ```
 
-You can set callback url
+You can also specify a callback URL by adding callback_url to the provider options.
 
 
 ```ruby
@@ -56,10 +50,9 @@ Rails.application.config.middleware.use OmniAuth::Builder do
 end
 ```
 
-## Specifying additional permissions
+## Additional Permissions
 
-You can also request additional permissions from the user. See the
-[permission help page](https://discordapp.com/developers/docs/topics/permissions#bitwise-permission-flags) for a list of all available options.
+You can request additional permissions from the user by setting the permissions option. For example, to request permission to the MANAGE_CHANNELS and MANAGE_ROLES permissions, you would set permissions to 0x00000010 + 0x10000000.
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
@@ -70,15 +63,15 @@ end
 This will request permission to the MANAGE_CHANNELS and the MANAGE_ROLES
 permissions.
 
-## Specifying the prompt options
+## 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.
+You can specify the prompt options by setting the prompt option. The prompt option indicates whether the user should be prompted to reauthorize on sign in. Valid options are 'consent' and 'none'. Note that the user 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.
+If you find a bug or want to contribute to the project, we welcome bug reports and pull requests on GitHub.
 
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+OmniAuth Discord is available as open-source software under the [MIT License](http://opensource.org/licenses/MIT).

data/example/Gemfile

@@ -3,3 +3,5 @@ source 'https://rubygems.org'
 gem 'sinatra'
 gem 'sinatra-reloader'
 gem 'omniauth-discord', path: '../'
+gem 'puma'
+gem 'pry'

data/example/Gemfile.lock

@@ -1,60 +1,77 @@
 PATH
   remote: ..
   specs:
-    omniauth-discord (1.0.0)
-      omniauth
+    omniauth-discord (1.1.0)
+      omniauth (~> 2.1.0)
       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)
+    coderay (1.1.3)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
+    hashie (5.0.0)
+    jwt (2.7.0)
+    method_source (1.0.0)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    mustermann (1.0.3)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    mustermann (3.0.0)
+      ruby2_keywords (~> 0.0.1)
+    nio4r (2.5.9)
+    oauth2 (2.0.9)
+      faraday (>= 0.17.3, < 3.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 (>= 1.2, < 4)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
+    omniauth (2.1.1)
+      hashie (>= 3.4.6)
+      rack (>= 2.2.3)
+      rack-protection
+    omniauth-oauth2 (1.8.0)
+      oauth2 (>= 1.4, < 3)
+      omniauth (~> 2.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    puma (6.2.1)
+      nio4r (~> 2.0)
+    rack (2.2.6.4)
+    rack-protection (3.0.5)
       rack
-    sinatra (2.0.5)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.5)
+    ruby2_keywords (0.0.5)
+    sinatra (3.0.5)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.0.5)
       tilt (~> 2.0)
-    sinatra-contrib (2.0.5)
-      backports (>= 2.8.2)
+    sinatra-contrib (3.0.5)
       multi_json
-      mustermann (~> 1.0)
-      rack-protection (= 2.0.5)
-      sinatra (= 2.0.5)
-      tilt (>= 1.3, < 3)
+      mustermann (~> 3.0)
+      rack-protection (= 3.0.5)
+      sinatra (= 3.0.5)
+      tilt (~> 2.0)
     sinatra-reloader (1.0)
       sinatra-contrib
-    tilt (2.0.9)
+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)
+    tilt (2.1.0)
+    version_gem (1.1.2)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   omniauth-discord!
+  pry
+  puma
   sinatra
   sinatra-reloader
 
 BUNDLED WITH
-   2.0.2
+   2.4.10

data/example/config.ru

@@ -1,6 +1,14 @@
 require 'bundler/setup'
+require 'omniauth'
 require 'omniauth-discord'
-require './app.rb'
+require 'sinatra'
+require "sinatra/reloader"
+
+configure do
+  set :sessions, true
+  set :run, false
+  set :raise_errors, true
+end
 
 use Rack::Session::Cookie, secret: '123456789'
 
@@ -8,4 +16,24 @@ use OmniAuth::Builder do
   provider :discord, ENV['DISCORD_CLIENT_ID'], ENV['DISCORD_CLIENT_ID'], scope: ENV['SCOPE']
 end
 
+get '/' do
+  content_type 'text/html'
+  <<-HTML
+    <html>
+      <body>
+      <form method='post' action='/auth/discord'>
+        <input type="hidden" name="authenticity_token" value='#{request.env["rack.session"]["csrf"]}'>
+        <button type='submit'>Login with Discord</button>
+      </form>
+      </body>
+    </html>
+  HTML
+end
+
+get '/auth/:provider/callback' do
+  content_type 'application/json'
+  request.env['omniauth.auth'].to_json
+end
+
+
 run Sinatra::Application

data/lib/omniauth/discord/version.rb

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

data/lib/omniauth/strategies/discord.rb

@@ -20,14 +20,13 @@ module OmniAuth
         {
           name: raw_info['username'],
           email: raw_info['verified'] ? raw_info['email'] : nil,
-          # CDN is still cdn.discordapp.com
-          image: raw_info['avatar'].present? ? "https://cdn.discordapp.com/avatars/#{raw_info['id']}/#{raw_info['avatar']}" : nil,
+          image: raw_info['avatar'] ? "https://cdn.discordapp.com/avatars/#{raw_info['id']}/#{raw_info['avatar']}" : nil,
         }
       end
 
       extra do
         {
-          'raw_info' => raw_info
+          raw_info: raw_info
         }
       end
 
@@ -37,7 +36,7 @@ module OmniAuth
 
       def callback_url
         # Discord does not support query parameters
-        options[:callback_url] || (full_host + script_name + callback_path)
+        options[:redirect_uri] || (full_host + script_name + callback_path)
       end
 
       def authorize_params

data/omniauth-discord.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-discord
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Adão Raul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2023-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,6 @@ files:
 - Rakefile
 - example/Gemfile
 - example/Gemfile.lock
-- example/app.rb
 - example/config.ru
 - lib/omniauth-discord.rb
 - lib/omniauth/discord.rb

data/example/app.rb

@@ -1,23 +0,0 @@
-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