omniauth-goodgame 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e411f599f0ea95cd38842d919854edcdf1a4c05adc651487a2763668fb8ce9a1
-  data.tar.gz: 311a27381db43067f26a614e0c82824b9e66846925da8b100197059346bc704a
+  metadata.gz: 4aff38db60ec33ad9b536d1f8e49f358bcea8b87449261ad4afc1b941a4882e1
+  data.tar.gz: a05d507800a2da66099297f3e29c9c1794c779ab5913cc85952a3c9849bb12c9
 SHA512:
-  metadata.gz: e7d528d076239ecf71292c197e69eb431c767cfaaa5b9ed5dbe3018e8e34941a83e6b1b84d25c7ee148dabb3b88ca7357f7dcd3dc6a129011c9cedb50ee15014
-  data.tar.gz: b62d6c67a00d91aaa54fa8a1b7c8595d9da79ebe07834dbc003407ed9c1d6e68f73b62db6098cb70a71aebafdabc91035f2a33d8fad36a320ed867a13ee4ad00
+  metadata.gz: 394475cc4f8f3378ad6bcc3d1be44230aea709c05b80ebbed9cd061f595f8d5242fb4c8360e6393463de9874ec9e7ee4e9e03d1e273c51798129338fa79c185d
+  data.tar.gz: a4b3e666d74e41e06c301fac958ff5daed39db3a5ec832aaeef266642c6fb42942df9401a119d6532c8f93a15dde0826ed2b75043b8da630e8133280a902e4a5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omniauth-goodgame (0.0.4)
+    omniauth-goodgame (0.0.6)
       omniauth-oauth2 (~> 1.6)
 
 GEM

data/README.md

@@ -1,15 +1,10 @@
-# Omniauth::Goodgame
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/omniauth/goodgame`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this lines to your application's Gemfile:
 
 ```ruby
 gem 'omniauth-goodgame'
+gem 'omniauth-rails_csrf_protection'
 ```
 
 And then execute:
@@ -22,22 +17,94 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Here is an example for adding the middleware to a Rails app in `config/initializers/omniauth.rb`:
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+```ruby
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :twitch, ENV["GOODGAME_CLIENT_ID"], ENV["GOODGAME_CLIENT_SECRET"]
+end
+```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/omniauth-goodgame. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/omniauth-goodgame/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/Alex1324522/omniauth-goodgame. This project is intended to be a safe, welcoming space for collaboration.
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
 ## Code of Conduct
-
-Everyone interacting in the Omniauth::Goodgame project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/omniauth-goodgame/blob/master/CODE_OF_CONDUCT.md).
+Here is an example of an Auth hash that is located in `request.env['omniauth.auth']`:
+```ruby
+{"provider"=>"goodgame",
+ "uid"=>uid,
+ "info"=>
+  {"name"=>"name",
+   "nickname"=>"nickname",
+   "email"=>"your@email",
+   "channelid"=>channelid},
+ "credentials"=>
+  {"token"=>
+    "token",
+   "refresh_token"=>
+    "refresh_token",
+   "expires_at"=>1695420157,
+   "expires"=>true},
+ "extra"=>
+  {"raw_info"=>
+    {"id"=>id,
+     "obj_key"=>"obj_key",
+     "nickname"=>"nickname",
+     "username"=>"username",
+     "avatar"=>"/files/avatars/av_avatar_elf.png",
+     "firstname"=>"firstname",
+     "lastname"=>"lastname",
+     "fullname"=>"fullname",
+     "birthday"=>nil,
+     "regdate"=>"2023-09-04T14:53:08+03:00",
+     "country"=>{"id"=>"68", "code"=>"ru", "title"=>"Россия"},
+     "city"=>{"id"=>"0", "title"=>nil},
+     "sex"=>0,
+     "website"=>"",
+     "about"=>"",
+     "background"=>"/images/profile/smile_pattern.png",
+     "timezone"=>{"id"=>0, "zone"=>false},
+     "activated"=>1,
+     "stream"=>
+      {"id"=>id,
+       "key"=>"key",
+       "preview"=>"https://goodgame.ru/files/logotypes/ch_204504_N2ai.png",
+       "title"=>"title",
+       "viewers"=>0,
+       "streamer"=>
+        {"id"=>id,
+         "obj_key"=>"obj_key",
+         "nickname"=>"nickname",
+         "username"=>"username",
+         "avatar"=>"/files/avatars/av_avatar_elf.png"},
+       "stream_key"=>"stream_key",
+       "status"=>0,
+       "game"=>{"id"=>0, "title"=>nil, "url"=>"/games/"},
+       "poster"=>"poster_link",
+       "hidden"=>true,
+       "adult"=>true,
+       "link"=>"https://goodgame.ru/channel/your_channel/",
+       "watch_together"=>false,
+       "lastseen"=>lastseen,
+       "premiums"=>lastseen,
+       "followers"=>lastseen,
+       "rating"=>{"value"=>value, "place"=>place}},
+     "room"=>
+      {"user_id"=>User_id,
+       "style"=>0,
+       "walls"=>
+        ["/files/pics.png"],
+       "exp"=>600,
+       "level"=>4,
+       "snapshot"=>"",
+       "items"=>nil},
+     "bnet"=>false,
+     "rights"=>0,
+     "email"=>"your@email",
+     "phone"=>0}}}
+```

data/example/app.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "sinatra"
+require "omniauth"
+require "omniauth-goodgame"
+
+configure do
+  set port: 3000
+  set :sessions, true
+end
+
+use OmniAuth::Builder do
+  provider :goodgame, ENV["GOODGAME_CLIENT_ID"], ENV["GOODGAME_CLIENT_SECRET"],
+           display: "popup",
+           redirect_uri: "http://127.0.0.1:3000/auth/goodgame/callback"
+end
+
+get "/" do
+  <<-HTML
+  <form method='post' action='/auth/goodgame'>
+    <button type='submit'>Login with goodgame</button>
+    <input type="hidden" name="authenticity_token" value='#{request.env["rack.session"]["csrf"]}'>
+  </form>
+  HTML
+end
+
+get "/auth/:provider/callback" do
+  content_type "text/plain"
+  pp request.env["omniauth.auth"]
+  request.env["omniauth.auth"].info.to_hash.inspect
+end

data/example/example.html

@@ -0,0 +1 @@
+<a href="/auth/goodgame"> Goodgame</a>

data/example/goodgame.rb

@@ -0,0 +1,88 @@
+require 'omniauth-oauth2'
+
+module OmniAuth
+  module Strategies
+    class Goodgame < OmniAuth::Strategies::OAuth2
+      DEFAULT_SCOPE = ''
+
+      option :name, 'goodgame'
+      option :authorize_options, [:scope]
+      option :client_options, {
+        site: 'https://goodgame.ru',
+        authorize_url: '/oauth2/authorize',
+        token_url: '/oauth2/token',
+        auth_scheme: :request_body
+      }
+      option :access_token_options, {
+        header_format: 'Bearer %s',
+        param_name: 'access_token'
+      }
+
+      def request_phase
+        redirect client.auth_code
+                       .authorize_url({ redirect_uri: callback_url }
+                       .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
+      end
+
+      uid { raw_info['id'] }
+
+      info do
+        {
+          name: raw_info['username'],
+          email: raw_info['email'],
+          nickname: raw_info['nickname'],
+          streamid: raw_info['stream']['id']
+        }
+      end
+
+      extra do
+        {
+          raw_info:
+        }
+      end
+
+      def raw_info
+        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
+        super.tap do |token|
+          token.options.merge!(access_token_options)
+        end
+      end
+
+      def access_token_options
+        options.access_token_options.each_with_object({}) do |(k, v), h|
+          h[k.to_sym] = v
+        end
+      end
+
+      def callback_url
+        return options[:redirect_uri] unless options[:redirect_uri].nil?
+
+        full_host + script_name + callback_path
+      end
+
+      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])
+          end
+          params[:scope] = params[:scope] || DEFAULT_SCOPE
+        end
+      end
+    end
+  end
+end

data/lib/omniauth/goodgame/version.rb

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

data/lib/omniauth/strategies/goodgame.rb

@@ -1,60 +1,60 @@
-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 redirect_uri]
       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['username'],
+          nickname: raw_info['nickname'],
+          email: raw_info['email'],
+          channel_id: raw_info['stream']['id'] 
         }
       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 +78,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 +86,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.6
 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
@@ -38,6 +38,9 @@ files:
 - Gemfile.lock
 - LICENSE.txt
 - README.md
+- example/app.rb
+- example/example.html
+- example/goodgame.rb
 - lib/omniauth-goodgame.rb
 - lib/omniauth/goodgame.rb
 - lib/omniauth/goodgame/version.rb