glogin 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56ba569dbb60a5e6e480c86cf2b5e103c6bd42d695e57d16bfc9b94a9b819526
-  data.tar.gz: 4cd694c79226b6a7946caf4adac29ea10326f7944f89facb7b578c2ea1bc9034
+  metadata.gz: a7e981c77fb4b32d821a8c6959a2772d37af2f4cf7133aa18374b662040bedcc
+  data.tar.gz: 4f87e9d5512dc2712ac91d770488a5fe799cdc069dfeeb2d6aecf32b0772af78
 SHA512:
-  metadata.gz: 37236f4de0ef6c6984c450cf03c0c6a79f51564911d3cf8a35408158d57153bfbda6c966cb0f5aa678e96c4482f89142d189f1d5054efd5b4c10227a01aa75d3
-  data.tar.gz: 0f3a77248cd9c7ec6c925693ee125b8a34b86fd1def5d3f7e4bf45265d4a7ae46bf36b628444ce669e8da164116d57c88af6fb953e803520f6209bb3f066b954
+  metadata.gz: b59c8c6f1d5d763a8a9317aab9a27a73fe803406a6a3366efff7fefa9b6a298a079357f55854c08df6e05a2987a2415f2b23c1696a332c86d8f711512d50528e
+  data.tar.gz: 3a50c24837adee03fcc16ff3f42a216cd74bd16235c268b3b45194f7c2fc9c901c570c7a7323e966733895d908fac77b46f8b4583dc7b52b7f822d34b306eb7a

data/.github/workflows/codecov.yml

@@ -8,7 +8,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/rake.yml

@@ -8,15 +8,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

@@ -7,5 +7,5 @@ jobs:
   xcop:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@v4
       - uses: g4s8/xcop-action@master

data/.rultor.yml

@@ -1,5 +1,5 @@
 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.23.1', require: false
+gem 'rake', '13.2.1', require: false
+gem 'rdoc', '6.7.0', require: false
+gem 'rspec-rails', '6.1.2', require: false
+gem 'rubocop', '1.64.0', require: false
+gem 'rubocop-rspec', '2.29.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

@@ -9,7 +9,6 @@
 [![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)
 

data/lib/glogin/auth.rb

@@ -57,8 +57,7 @@ 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?

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.15.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.15.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-24 00:00:00.000000000 Z
+date: 2024-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base58