glogin 0.14.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56ba569dbb60a5e6e480c86cf2b5e103c6bd42d695e57d16bfc9b94a9b819526
-  data.tar.gz: 4cd694c79226b6a7946caf4adac29ea10326f7944f89facb7b578c2ea1bc9034
+  metadata.gz: f95b5783be06871b3fcc570c2c931aa4805df8d9eba5fd3e56efdc324b828947
+  data.tar.gz: 59bad949654ddf467ee7c3c7e520cb885682227fd2b19e2f52131a299d69e0ec
 SHA512:
-  metadata.gz: 37236f4de0ef6c6984c450cf03c0c6a79f51564911d3cf8a35408158d57153bfbda6c966cb0f5aa678e96c4482f89142d189f1d5054efd5b4c10227a01aa75d3
-  data.tar.gz: 0f3a77248cd9c7ec6c925693ee125b8a34b86fd1def5d3f7e4bf45265d4a7ae46bf36b628444ce669e8da164116d57c88af6fb953e803520f6209bb3f066b954
+  metadata.gz: 22863efe1b00bb8fb9da9727d173e2b884986496f50be8d1c4f7fead6f16383ac0be0f2ee5c2acb66834d558e67e290a6855b622e94738f86c729e371abe609d
+  data.tar.gz: 822e2f1c55dada3a6cb2dd5cfc15f77ebb6762bab9f7ad23d270612d94e6489c3352f92973c6491e009d02af955a9522a734419dc6dac1d26b7da9edc9e88c2f

data/.0pdd.yml

@@ -1,3 +1,23 @@
+# Copyright (c) 2017-2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+---
 errors:
   - yegor256@gmail.com
 # alerts:

data/.github/workflows/actionlint.yml

@@ -0,0 +1,41 @@
+# Copyright (c) 2017-2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+---
+name: actionlint
+'on':
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  actionlint:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Download actionlint
+        id: get_actionlint
+        # yamllint disable-line rule:line-length
+        run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
+        shell: bash
+      - name: Check workflow files
+        run: ${{ steps.get_actionlint.outputs.executable }} -color
+        shell: bash

data/.github/workflows/codecov.yml

@@ -1,3 +1,22 @@
+# Copyright (c) 2017-2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 ---
 name: codecov
 on:
@@ -8,7 +27,7 @@ jobs:
   codecov:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7

data/.github/workflows/copyrights.yml

@@ -0,0 +1,30 @@
+# Copyright (c) 2017-2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+---
+name: copyrights
+'on':
+  push:
+  pull_request:
+jobs:
+  copyrights:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: yegor256/copyrights-action@0.0.4

data/.github/workflows/markdown-lint.yml

@@ -0,0 +1,38 @@
+# Copyright (c) 2017-2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+---
+name: markdown-lint
+'on':
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+    paths-ignore: ['paper/**', 'sandbox/**']
+concurrency:
+  group: markdown-lint-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  markdown-lint:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: articulate/actions-markdownlint@v1

data/.github/workflows/pdd.yml

@@ -1,3 +1,22 @@
+# Copyright (c) 2017-2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 ---
 name: pdd
 on:

data/.github/workflows/rake.yml

@@ -1,3 +1,22 @@
+# Copyright (c) 2017-2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 ---
 name: rake
 on:
@@ -8,15 +27,15 @@ on:
     branches:
       - master
 jobs:
-  test:
+  rake:
     name: test
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-12]
-        ruby: [2.7, 3.2]
+        os: [ubuntu-22.04, macos-12]
+        ruby: [2.7, 3.3]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.github/workflows/xcop.yml

@@ -1,3 +1,22 @@
+# Copyright (c) 2017-2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 ---
 name: xcop
 on:
@@ -7,5 +26,5 @@ jobs:
   xcop:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@v4
       - uses: g4s8/xcop-action@master

data/.rubocop.yml

@@ -1,3 +1,23 @@
+# Copyright (c) 2017-2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+---
 AllCops:
   Exclude:
     - 'bin/**/*'

data/.rultor.yml

@@ -1,5 +1,25 @@
+# Copyright (c) 2017-2024 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+---
 docker:
-  image: yegor256/rultor-image:1.22.0
+  image: yegor256/rultor-image:1.23.1
 assets:
   rubygems.yml: yegor256/home#assets/rubygems.yml
 install: |

data/Gemfile

@@ -24,11 +24,11 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'minitest', '5.21.2', require: false
-gem 'rake', '13.1.0', require: false
-gem 'rdoc', '6.6.1', require: false
-gem 'rspec-rails', '6.1.0', require: false
-gem 'rubocop', '1.60.2', require: false
-gem 'rubocop-rspec', '2.26.1', require: false
+gem 'minitest', '5.24.1', require: false
+gem 'rake', '13.2.1', require: false
+gem 'rdoc', '6.7.0', require: false
+gem 'rspec-rails', '6.1.3', require: false
+gem 'rubocop', '1.65.0', require: false
+gem 'rubocop-rspec', '3.0.2', require: false
 gem 'simplecov', '0.22.0', require: false
-gem 'webmock', '3.19.1', require: false
+gem 'webmock', '3.23.1', require: false

data/README.md

@@ -1,4 +1,4 @@
-<img src="/logo.svg" width="64px" height="64px"/>
+# OAuth Login via GitHub Made Simple
 
 [![DevOps By Rultor.com](http://www.rultor.com/b/yegor256/glogin)](http://www.rultor.com/p/yegor256/glogin)
 [![We recommend RubyMine](https://www.elegantobjects.org/rubymine.svg)](https://www.jetbrains.com/ruby/)
@@ -9,18 +9,17 @@
 [![Maintainability](https://api.codeclimate.com/v1/badges/155f86b639d155259219/maintainability)](https://codeclimate.com/github/yegor256/glogin/maintainability)
 [![Test Coverage](https://img.shields.io/codecov/c/github/yegor256/glogin.svg)](https://codecov.io/github/yegor256/glogin?branch=master)
 [![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/github/yegor256/glogin/master/frames)
-![Lines of code](https://img.shields.io/tokei/lines/github/yegor256/glogin)
 [![Hits-of-Code](https://hitsofcode.com/github/yegor256/glogin)](https://hitsofcode.com/view/github/yegor256/glogin)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/yegor256/glogin/blob/master/LICENSE.txt)
 
 This simple gem will help you enable login/logout through
-[GitHub OAuth](https://developer.github.com/apps/building-integrations/setting-up-and-registering-oauth-apps/)
+[GitHub OAuth][doc]
 for your web application. This is how it works with
 [Sinatra](http://www.sinatrarb.com/),
 but you can do something similar in any framework.
 
 Read this blog post to get the idea:
-[_Simplified GitHub Login for a Ruby Web App_](https://www.yegor256.com/2018/06/19/glogin.html)
+[_Simplified GitHub Login for a Ruby Web App_][blog]
 
 First, somewhere in the global space, before the app starts:
 
@@ -105,11 +104,12 @@ settings.glogin.login_uri
 ```
 
 For unit testing you can just provide an empty string as a `secret` for
-`GLogin::Cookie::Open` and `GLogin::Cookie::Closed` and the encryption will be disabled:
+`GLogin::Cookie::Open` and `GLogin::Cookie::Closed`
+and the encryption will be disabled:
 whatever will be coming from the cookie will be trusted. For testing
 it will be convenient to provide a user name in a query string, like:
 
-```
+```text
 http://localhost:9292/?glogin=tester
 ```
 
@@ -141,14 +141,19 @@ decrypted = codec.decrypt(encrypted)
 
 ## How to contribute
 
-Read [these guidelines](https://www.yegor256.com/2014/04/15/github-guidelines.html).
+Read
+[these guidelines](https://www.yegor256.com/2014/04/15/github-guidelines.html).
 Make sure you build is green before you contribute
-your pull request. You will need to have [Ruby](https://www.ruby-lang.org/en/) 2.3+ and
+your pull request. You will need to have
+[Ruby](https://www.ruby-lang.org/en/) 2.3+ and
 [Bundler](https://bundler.io/) installed. Then:
 
-```
-$ bundle update
-$ bundle exec rake
+```bash
+bundle update
+bundle exec rake
 ```
 
 If it's clean and you don't see any error messages, submit your pull request.
+
+[blog]: https://www.yegor256.com/2018/06/19/glogin.html
+[doc]: https://developer.github.com/apps/building-integrations/setting-up-and-registering-oauth-apps/

data/glogin.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_runtime_dependency 'base58', '>= 0.2'
-  s.add_runtime_dependency 'openssl', '>= 2.0'
+  s.add_dependency 'base58', '>= 0.2'
+  s.add_dependency 'openssl', '>= 2.0'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/glogin/auth.rb

@@ -41,6 +41,7 @@ module GLogin
       raise "GitHub client secret can't be nil" if secret.nil?
       @secret = secret
       raise "Redirect URL can't be nil" if redirect.nil?
+      raise "Redirect URL can't be empty" if redirect.empty?
       @redirect = redirect
     end
 
@@ -57,20 +58,21 @@ module GLogin
         return {
           'id' => 526_301,
           'login' => 'yegor256',
-          'avatar_url' => 'https://github.com/yegor256.png',
-          'bearer' => ''
+          'avatar_url' => 'https://github.com/yegor256.png'
         }
       end
       raise 'Code can\'t be nil' if code.nil?
+      raise 'Code can\'t be empty' if code.empty?
       uri = URI.parse('https://api.github.com/user')
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       req = Net::HTTP::Get.new(uri.request_uri)
       req['Accept-Header'] = 'application/json'
-      req['Authorization'] = "token #{access_token(code)}"
+      token = access_token(code)
+      req['Authorization'] = "token #{token}"
       res = http.request(req)
-      raise "Error (#{res.code}): #{res.body}" unless res.code == '200'
+      raise "HTTP error ##{res.code} with token #{escape(token)}: #{res.body}" unless res.code == '200'
       JSON.parse(res.body)
     end
 
@@ -78,6 +80,7 @@ module GLogin
 
     def access_token(code)
       raise 'Code can\'t be nil' if code.nil?
+      raise 'Code can\'t be empty' if code.empty?
       uri = URI.parse('https://github.com/login/oauth/access_token')
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
@@ -90,8 +93,18 @@ module GLogin
       )
       req['Accept'] = 'application/json'
       res = http.request(req)
-      raise "Error (#{res.code}): #{res.body}" unless res.code == '200'
+      raise "HTTP error ##{res.code} with code #{escape(code)}: #{res.body}" unless res.code == '200'
       JSON.parse(res.body)['access_token']
     end
+
+    def escape(txt)
+      prefix = 4
+      [
+        '"',
+        txt[0..prefix],
+        '*' * (token.length - prefix),
+        '"'
+      ].join
+    end
   end
 end

data/lib/glogin/cookie.rb

@@ -55,7 +55,7 @@ module GLogin
         @context = context.to_s
       end
 
-      # Returns a hash with four elements: `id`, `login`, `avatar`, and `bearer`.
+      # Returns a hash with four elements: `id`, `login`, and `avatar_url`.
       #
       # If the `secret` is empty, the text will not be decrypted, but used
       # "as is". This may be helpful during testing.
@@ -65,20 +65,20 @@ module GLogin
       # to catch in your applicaiton and ignore the login attempt.
       def to_user
         plain = Codec.new(@secret).decrypt(@text)
-        id, login, avatar, bearer, ctx = plain.split(GLogin::SPLIT, 5)
+        id, login, avatar_url, ctx = plain.split(GLogin::SPLIT, 5)
         if !@secret.empty? && ctx.to_s != @context
           raise(
             GLogin::Codec::DecodingError,
             "Context '#{@context}' expected, but '#{ctx}' found"
           )
         end
-        { id: id, login: login, avatar: avatar, bearer: bearer }
+        { 'id' => id, 'login' => login, 'avatar_url' => avatar_url }
       end
     end
 
     # Open
     class Open
-      attr_reader :id, :login, :avatar_url, :bearer
+      attr_reader :id, :login, :avatar_url
 
       # Here comes the JSON you receive from Auth.user().
       #
@@ -91,6 +91,11 @@ module GLogin
       def initialize(json, secret, context = '')
         raise 'JSON can\'t be nil' if json.nil?
         raise 'JSON must contain "id" key' if json['id'].nil?
+        json.each do |k, v|
+          raise "Key #{k} is not a string" unless k.is_a?(String)
+          raise "Key #{k} is not allowed" unless %w[id login avatar_url bearer].include?(k)
+          raise "Value #{v} is not a string" unless v.is_a?(String)
+        end
         @id = json['id']
         @login = json['login'] || ''
         @avatar_url = json['avatar_url'] || ''
@@ -108,7 +113,6 @@ module GLogin
             @id,
             @login,
             @avatar_url,
-            @bearer,
             @context
           ].join(GLogin::SPLIT)
         )

data/lib/glogin/version.rb

@@ -26,5 +26,5 @@
 # Copyright:: Copyright (c) 2017-2024 Yegor Bugayenko
 # License:: MIT
 module GLogin
-  VERSION = '0.14.2'
+  VERSION = '0.16.0'
 end

data/test/glogin/test_cookie.rb

@@ -31,15 +31,15 @@ class TestCookie < Minitest::Test
       GLogin::Cookie::Open.new(
         JSON.parse(
           "{\"id\":\"123\",
-          \"login\":\"yegor256\",\"bearer\":\"\",
+          \"login\":\"yegor256\",
           \"avatar_url\":\"https://avatars1.githubusercontent.com/u/526301\"}"
         ),
         secret
       ).to_s,
       secret
     ).to_user
-    assert_equal(user[:login], 'yegor256')
-    assert_equal(user[:avatar], 'https://avatars1.githubusercontent.com/u/526301')
+    assert_equal(user['login'], 'yegor256')
+    assert_equal(user['avatar_url'], 'https://avatars1.githubusercontent.com/u/526301')
   end
 
   def test_encrypts_and_decrypts_with_context
@@ -47,41 +47,41 @@ class TestCookie < Minitest::Test
     context = '127.0.0.1'
     user = GLogin::Cookie::Closed.new(
       GLogin::Cookie::Open.new(
-        JSON.parse('{"id":"123","login":"jeffrey","avatar_url":"#","bearer":""}'),
+        JSON.parse('{"id":"123","login":"jeffrey","avatar_url":"#"}'),
         secret,
         context
       ).to_s,
       secret,
       context
     ).to_user
-    assert_equal(user[:id], '123')
-    assert_equal(user[:login], 'jeffrey')
-    assert_equal(user[:avatar], '#')
+    assert_equal(user['id'], '123')
+    assert_equal(user['login'], 'jeffrey')
+    assert_equal(user['avatar_url'], '#')
   end
 
   def test_decrypts_in_test_mode
     user = GLogin::Cookie::Closed.new(
       '123|test|http://example.com', ''
     ).to_user
-    assert_equal(user[:id], '123')
-    assert_equal(user[:login], 'test')
-    assert_equal(user[:avatar], 'http://example.com')
+    assert_equal(user['id'], '123')
+    assert_equal(user['login'], 'test')
+    assert_equal(user['avatar_url'], 'http://example.com')
   end
 
   def test_decrypts_in_test_mode_with_context
     user = GLogin::Cookie::Closed.new(
       '123', '', 'some context'
     ).to_user
-    assert_equal('123', user[:id])
-    assert_nil(user[:login])
-    assert_nil(user[:avatar])
+    assert_equal('123', user['id'])
+    assert_nil(user['login'])
+    assert_nil(user['avatar_url'])
   end
 
   def test_fails_on_broken_text
     assert_raises GLogin::Codec::DecodingError do
       GLogin::Cookie::Closed.new(
         GLogin::Cookie::Open.new(
-          JSON.parse('{"login":"x","avatar_url":"x","id":"1","bearer":""}'),
+          JSON.parse('{"login":"x","avatar_url":"x","id":"1"}'),
           'secret-1'
         ).to_s,
         'secret-2'
@@ -94,7 +94,7 @@ class TestCookie < Minitest::Test
     assert_raises GLogin::Codec::DecodingError do
       GLogin::Cookie::Closed.new(
         GLogin::Cookie::Open.new(
-          JSON.parse('{"login":"x","avatar_url":"x","id":"","bearer":""}'),
+          JSON.parse('{"login":"x","avatar_url":"x","id":""}'),
           secret,
           'context-1'
         ).to_s,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glogin
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-24 00:00:00.000000000 Z
+date: 2024-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base58
@@ -48,7 +48,10 @@ extra_rdoc_files:
 files:
 - ".0pdd.yml"
 - ".gitattributes"
+- ".github/workflows/actionlint.yml"
 - ".github/workflows/codecov.yml"
+- ".github/workflows/copyrights.yml"
+- ".github/workflows/markdown-lint.yml"
 - ".github/workflows/pdd.yml"
 - ".github/workflows/rake.yml"
 - ".github/workflows/xcop.yml"