glogin 0.16.1 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6960c45e5d074619ac8a5b4997f5fca734f445ffbf2ea203bf6264436af521ff
-  data.tar.gz: 6718628c2085dca6a4dae18a3eea5e0de734dfe99676530d7fc70d3dea166bf3
+  metadata.gz: eda8e66e30f5f90d9a125ca84f104c5bddaf38f9b0ac2381935ee9dac92aff70
+  data.tar.gz: 74d58b5818dbd3f0809336de8895866aa8d9f1a01aa326ba1f1d73fc1383ebab
 SHA512:
-  metadata.gz: fe27db59e34f29a75550a21641710a6f199bf9be582c065d0dd94aca1448a0193e2f481aeae5d642e29202e077355b684f5a3cc5e2a7639ba2f276edb475468b
-  data.tar.gz: ef9537ee5ec99726b5e02658a12905f35b411cc5aeaa139ca4a15902645e823504f24ffdd0ce1fe1cbbf35d60feb36ce686ba1bf94b8e4f98455cf09f7add689
+  metadata.gz: 63ec19df364df3d7db038e71798dff21713df174ecbddb3ef8e26de8a0a76d2c39efaed520809252bf42f0bbf077fd3628f65e006126a56e64ba8fe19700233d
+  data.tar.gz: 280d55cd553045833c0fb23e58918db97659a7f270efa1837223f2d02b781a5e9a60b7db5b96f86aaf9eb4b6fa897d147de5f258c0ecf55c9e4b545fd40a235f

data/Gemfile

@@ -29,6 +29,6 @@ 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 'rubocop-rspec', '3.0.3', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'webmock', '3.23.1', require: false

data/lib/glogin/auth.rb

@@ -94,7 +94,10 @@ module GLogin
       req['Accept'] = 'application/json'
       res = http.request(req)
       raise "HTTP error ##{res.code} with code #{escape(code)}: #{res.body}" unless res.code == '200'
-      JSON.parse(res.body)['access_token']
+      json = JSON.parse(res.body)
+      token = json['access_token']
+      raise "There is no 'access_token' in JSON response from GitHub: #{res.body}" if token.nil?
+      token
     end
 
     def escape(txt)

data/lib/glogin/cookie.rb

@@ -92,9 +92,9 @@ module GLogin
         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)
+          raise "The key #{k} is not a string" unless k.is_a?(String)
+          raise "The key #{k} is not allowed" unless %w[id login avatar_url bearer].include?(k)
+          raise "The value '#{v}' of #{k} is not String or Integer" unless v.is_a?(String) || v.is_a?(Integer)
         end
         @id = json['id']
         @login = json['login'] || ''

data/lib/glogin/version.rb

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

data/test/glogin/test_auth.rb

@@ -65,4 +65,18 @@ class TestAuth < Minitest::Test
     e = assert_raises { auth.user('437849732894732') }
     assert(e.message.include?('with code "43784***'))
   end
+
+  def test_broken_json
+    auth = GLogin::Auth.new('1234', '4433', 'https://example.org')
+    stub_request(:post, 'https://github.com/login/oauth/access_token').to_return(body: 'Hello!')
+    e = assert_raises { auth.user('47839893') }
+    assert(e.message.include?('unexpected token'), e)
+  end
+
+  def test_no_token_in_json
+    auth = GLogin::Auth.new('1234', '4433', 'https://example.org')
+    stub_request(:post, 'https://github.com/login/oauth/access_token').to_return(body: '{}')
+    e = assert_raises { auth.user('47839893') }
+    assert(e.message.include?('There is no \'access_token\''), e)
+  end
 end

data/test/glogin/test_cookie.rb

@@ -30,7 +30,7 @@ class TestCookie < Minitest::Test
     user = GLogin::Cookie::Closed.new(
       GLogin::Cookie::Open.new(
         JSON.parse(
-          "{\"id\":\"123\",
+          "{\"id\":123,
           \"login\":\"yegor256\",
           \"avatar_url\":\"https://avatars1.githubusercontent.com/u/526301\"}"
         ),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glogin
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.3
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-11 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base58