authkeeper 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb7f1f4130b52a8878512bba20d49699f5b1ec3d114b4f3bd68a158162fcc94
-  data.tar.gz: baa31e32501b36ecd77bcb42fbfd2e21dda6592f9862225f99923a15501277af
+  metadata.gz: 65f8ece85bc4e6ed31e1ed3ae5b142cd2b79b7cfe2e3fdd87009e1537a37a271
+  data.tar.gz: e92f55f1bb92d4c2b910436650fc90aa13749f7f03d3ba3c4d0b1d6b7917d2e9
 SHA512:
-  metadata.gz: 912999e53eb4568cf122b963e277f525cc37b9e4bd38dc47f7116f18437b876a8ac2984c3ba8fca033bcbb49e9e53d059abd48ca6c1f467441512f142820aa15
-  data.tar.gz: 12cc60b9dc9a3505e7301aec7b352eae956476677e655bc892e2575150ae8e7d270119a62c629a70a6cf7bd044a4dbdb4ce639c15839b17a7b45e85d75658a3f
+  metadata.gz: 8abc1c3a419e87aa6b1e3456ae22152824f9f823ef430fb7748108a2959dd78253331674e510ceef753e73107d59531bbe6a2633aad11c9b66fd43e32957bf21
+  data.tar.gz: a0b54c38844b41e5def8c6ac8a153cbb99c711d25c5ba5044b7c074ebc2169814c3afdcd3b06ba3ce21383a169617bfb0f5cf31b0c006948a287774d51aa8e71

data/app/controllers/authkeeper/omniauth_callbacks_controller.rb

@@ -7,6 +7,7 @@ module Authkeeper
       generate_token: 'services.generate_token'
     ]
 
+    DISCORD = 'discord'
     GITHUB = 'github'
     GITLAB = 'gitlab'
     TELEGRAM = 'telegram'

data/app/helpers/authkeeper/application_helper.rb

@@ -4,6 +4,7 @@ module Authkeeper
   module ApplicationHelper
     def omniauth_link(provider, oauth_data=nil)
       case provider
+      when :discord then discord_oauth_link
       when :github then github_oauth_link
       when :gitlab then gitlab_oauth_link
       when :google then google_oauth_link
@@ -15,6 +16,10 @@ module Authkeeper
     private
 
     # rubocop: disable Layout/LineLength
+    def discord_oauth_link
+      "https://discord.com/oauth2/authorize?client_id=#{value(:discord, :client_id)}&response_type=code&redirect_uri=#{value(:discord, :redirect_url)}&scope=identify"
+    end
+
     def github_oauth_link
       "https://github.com/login/oauth/authorize?scope=user:email&response_type=code&client_id=#{value(:github, :client_id)}&redirect_uri=#{value(:github, :redirect_url)}"
     end

data/app/lib/authkeeper/discord_api/client.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Authkeeper
+  module DiscordApi
+    class Client < HttpService::Client
+      include Requests::User
+
+      BASE_URL = 'https://discord.com/api/v10/'
+
+      option :url, default: proc { BASE_URL }
+
+      private
+
+      def headers(access_token)
+        {
+          'Authorization' => "Bearer #{access_token}"
+        }
+      end
+    end
+  end
+end

data/app/lib/authkeeper/discord_api/requests/user.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Authkeeper
+  module DiscordApi
+    module Requests
+      module User
+        def user(access_token:)
+          get(
+            path: 'oauth2/@me',
+            headers: headers(access_token)
+          )
+        end
+      end
+    end
+  end
+end

data/app/lib/authkeeper/discord_auth_api/client.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Authkeeper
+  module DiscordAuthApi
+    class Client < HttpService::Client
+      include Requests::FetchAccessToken
+
+      BASE_URL = 'https://discord.com/api/v10/'
+
+      option :url, default: proc { BASE_URL }
+    end
+  end
+end

data/app/lib/authkeeper/discord_auth_api/requests/fetch_access_token.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Authkeeper
+  module DiscordAuthApi
+    module Requests
+      module FetchAccessToken
+        def fetch_access_token(client_id:, client_secret:, code:, redirect_uri:)
+          form_post(
+            path: 'oauth2/token',
+            body: {
+              grant_type: 'authorization_code',
+              code: code,
+              redirect_uri: redirect_uri,
+              client_id: client_id,
+              client_secret: client_secret
+            },
+            headers: {
+              'Content-Type' => 'application/x-www-form-urlencoded'
+            }
+          )
+        end
+      end
+    end
+  end
+end

data/app/services/authkeeper/providers/discord.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Authkeeper
+  module Providers
+    class Discord
+      include AuthkeeperDeps[
+        auth_client: 'api.discord.auth_client',
+        api_client: 'api.discord.client'
+      ]
+
+      def call(params: {})
+        access_token = fetch_access_token(params[:code])
+        return { errors: ['Invalid code'] } unless access_token
+
+        user = fetch_user_info(access_token)
+
+        {
+          result: {
+            uid: user.dig('user', 'id').to_s,
+            provider: 'discord',
+            login: user.dig('user', 'username')
+          }
+        }
+      end
+
+      private
+
+      def fetch_access_token(code)
+        auth_client.fetch_access_token(
+          client_id: omniauth_config[:client_id],
+          client_secret: omniauth_config[:client_secret],
+          redirect_uri: omniauth_config[:redirect_url],
+          code: code
+        )['access_token']
+      end
+
+      def fetch_user_info(access_token)
+        api_client.user(access_token: access_token)[:body]
+      end
+
+      def omniauth_config
+        @omniauth_config ||= Authkeeper.configuration.omniauth_configs[:discord]
+      end
+    end
+  end
+end

data/app/services/authkeeper/providers/telegram.rb

@@ -6,8 +6,8 @@ require 'base64'
 module Authkeeper
   module Providers
     class Telegram
-      REQUIRED_FIELDS = %i[id hash].freeze
-      HASH_FIELDS = %i[auth_date first_name id last_name photo_url username].freeze
+      REQUIRED_FIELDS = %w[id hash].freeze
+      HASH_FIELDS = %w[auth_date first_name id last_name photo_url username].freeze
       SECONDS_IN_DAY = 86_400
 
       def call(params: {})
@@ -19,7 +19,9 @@ module Authkeeper
           result: {
             uid: params[:id].to_s,
             provider: 'telegram',
-            login: params[:username]
+            login: params[:username],
+            first_name: params[:first_name],
+            last_name: params[:last_name]
           }
         }
       end

data/lib/authkeeper/container.rb

@@ -17,6 +17,8 @@ module Authkeeper
 
     register(:jwt_encoder) { Authkeeper::JwtEncoder.new }
 
+    register('api.discord.auth_client') { Authkeeper::DiscordAuthApi::Client.new }
+    register('api.discord.client') { Authkeeper::DiscordApi::Client.new }
     register('api.github.auth_client') { Authkeeper::GithubAuthApi::Client.new }
     register('api.github.client') { Authkeeper::GithubApi::Client.new }
     register('api.gitlab.auth_client') { Authkeeper::GitlabAuthApi::Client.new }
@@ -33,6 +35,7 @@ module Authkeeper
     register('services.providers.google') { Authkeeper::Providers::Google.new }
     register('services.providers.yandex') { Authkeeper::Providers::Yandex.new }
     register('services.providers.vk') { Authkeeper::Providers::Vk.new }
+    register('services.providers.discord') { Authkeeper::Providers::Discord.new }
 
     register('services.fetch_session') { Authkeeper::FetchSessionService.new }
     register('services.generate_token') { Authkeeper::GenerateTokenService.new }

data/lib/authkeeper/controllers/authentication.rb

@@ -58,6 +58,17 @@ module Authkeeper
           expires: 1.week.from_now
         }.compact
       end
+
+      def sign_out
+        access_token = cookies_token.presence || bearer_token.presence || params_token
+
+        if access_token
+          auth_call = Authkeeper::Container['services.fetch_session'].call(token: access_token)
+          auth_call[:result].destroy if auth_call[:result]
+        end
+
+        cookies.delete(access_token_name)
+      end
     end
   end
 end

data/lib/authkeeper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Authkeeper
-  VERSION = '0.1.8'
+  VERSION = '0.1.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authkeeper
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-30 00:00:00.000000000 Z
+date: 2025-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,10 @@ files:
 - app/controllers/authkeeper/omniauth_callbacks_controller.rb
 - app/helpers/authkeeper/application_helper.rb
 - app/jobs/authkeeper/application_job.rb
+- app/lib/authkeeper/discord_api/client.rb
+- app/lib/authkeeper/discord_api/requests/user.rb
+- app/lib/authkeeper/discord_auth_api/client.rb
+- app/lib/authkeeper/discord_auth_api/requests/fetch_access_token.rb
 - app/lib/authkeeper/github_api/client.rb
 - app/lib/authkeeper/github_api/requests/user.rb
 - app/lib/authkeeper/github_api/requests/user_emails.rb
@@ -63,6 +67,7 @@ files:
 - app/models/authkeeper/application_record.rb
 - app/services/authkeeper/fetch_session_service.rb
 - app/services/authkeeper/generate_token_service.rb
+- app/services/authkeeper/providers/discord.rb
 - app/services/authkeeper/providers/github.rb
 - app/services/authkeeper/providers/gitlab.rb
 - app/services/authkeeper/providers/google.rb