omniauth-goodgame 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e411f599f0ea95cd38842d919854edcdf1a4c05adc651487a2763668fb8ce9a1
-  data.tar.gz: 311a27381db43067f26a614e0c82824b9e66846925da8b100197059346bc704a
+  metadata.gz: '029c7684f5a75abc853c3b28bcfd78b70e52e66fd5d2ec5cd1c0265cb40acf73'
+  data.tar.gz: 00e53bdae1cd987413cb8390d01e187d372568e1fbd142cab65b2c2ffe245326
 SHA512:
-  metadata.gz: e7d528d076239ecf71292c197e69eb431c767cfaaa5b9ed5dbe3018e8e34941a83e6b1b84d25c7ee148dabb3b88ca7357f7dcd3dc6a129011c9cedb50ee15014
-  data.tar.gz: b62d6c67a00d91aaa54fa8a1b7c8595d9da79ebe07834dbc003407ed9c1d6e68f73b62db6098cb70a71aebafdabc91035f2a33d8fad36a320ed867a13ee4ad00
+  metadata.gz: 8791c61174d8e8b99ce0051ff621a4fb1b9a7aeb92c0a2570cfd202bc245f1b05e25f6b4c3244fdd88dcbbe10055b9c255bd6bcb9f8b55799e72d0c55116dda7
+  data.tar.gz: 61bb7d5a5d95fdbfeef8bcde21811b910481b453e568d5399b86366ebb0127b474b3edc9f83bb40ad3055943006f2ae0ec050473df22e6d7becf5a8a48702bc5

data/lib/omniauth/goodgame/version.rb

@@ -2,6 +2,6 @@
 
 module Omniauth
   module Goodgame
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/omniauth/strategies/goodgame.rb

@@ -1,60 +1,58 @@
-require "omniauth-oauth2"
+require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
     class Goodgame < OmniAuth::Strategies::OAuth2
-      DEFAULT_SCOPE = ""
-      option :name, "goodgame"
+      DEFAULT_SCOPE = ''
 
+      option :name, 'goodgame'
+      option :authorize_options, %i[scope display]
       option :client_options, {
-        site: "https://goodgame.ru",
-        authorize_url: "/oauth2/authorize",
-        token_url: "/oauth2/token",
+        site: 'https://goodgame.ru',
+        authorize_url: '/oauth2/authorize',
+        token_url: '/oauth2/token',
         auth_scheme: :request_body
       }
-
       option :access_token_options, {
-        header_format: "application/x-www-form-urlencoded",
-        param_name: "access_token"
+        header_format: 'Bearer %s',
+        param_name: 'access_token'
       }
 
-      option :authorize_options, [:scope]
-
       def request_phase
         redirect client.auth_code
                        .authorize_url({ redirect_uri: callback_url }
-                       .merge(authorize_params)).gsub(/%2[b,B]/, "+")
+                       .merge(authorize_params)).gsub(/%2[b,B]/, '+')
       end
 
       credentials do
-        hash = { "token" => access_token.token }
-        hash["refresh_token"] = access_token.refresh_token if access_token.refresh_token
-        hash["expires_at"] = access_token.expires_at if access_token.expires?
-        hash["expires"] = access_token.expires?
+        hash = { 'token' => access_token.token }
+        hash['refresh_token'] = access_token.refresh_token if access_token.refresh_token
+        hash['expires_at'] = access_token.expires_at if access_token.expires?
+        hash['expires'] = access_token.expires?
         hash
       end
 
-      uid { raw_info["id"] }
+      uid { raw_info['id'] }
 
       info do
         {
-          name: raw_info["nickname"],
-          email: raw_info["email"],
-          nickname: raw_info["username"],
-          description: raw_info["about"],
-          image: raw_info["avatar"],
-          urls: { Goodgame: raw_info["link"] }
+          name: raw_info['nickname'],
+          email: raw_info['email']
         }
       end
+
       extra do
         {
-          raw_info: raw_info
+          raw_info:
         }
       end
+
       def raw_info
-        @raw_info ||=
-          access_token.get("https://goodgame.ru/api/4/users/#{client.id}").parsed
-                      .fetch("data").fetch(0)
+        id = access_token.get("https://goodgame.ru/api/4/users/@me2?access_token=#{access_token.token}",
+                              headers: { 'Accept' => 'application/json' }).parsed.fetch('id')
+        @raw_info =
+          access_token.get("https://goodgame.ru/api/4/users/#{id}?access_token=#{access_token.token}",
+                           headers: { 'Accept' => 'application/json' }).parsed
       end
 
       def build_access_token
@@ -78,7 +76,7 @@ module OmniAuth
       def authorize_params
         super.tap do |params|
           options[:authorize_options].each do |k|
-            params[k] = request.params[k.to_s] unless [nil, ""].include?(request.params[k.to_s])
+            params[k] = request.params[k.to_s] unless [nil, ''].include?(request.params[k.to_s])
           end
           params[:scope] = params[:scope] || DEFAULT_SCOPE
         end
@@ -86,3 +84,4 @@ module OmniAuth
     end
   end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-goodgame
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alex Seregin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2