#1194 fixed and tested

yegor256 · Jan 22, 2024 · 9fd90d7 · 9fd90d7
1 parent 45656a4
commit 9fd90d7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -116,7 +116,7 @@ GEM
       racc (~> 1.4)
     openssl (3.2.0)
     parallel (1.24.0)
-    parser (3.3.0.4)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     pg (1.5.4)

diff --git a/front/front_login.rb b/front/front_login.rb
@@ -51,11 +51,10 @@
 get '/github-callback' do
   code = params[:code]
   error(400) if code.nil?
-  login = settings.glogin.user(code)[:login]
-  identity = login
-  humans.create(identity) unless humans.github?(login)
+  json = settings.glogin.user(code)
+  identity = json['login']
   cookies[:identity] = GLogin::Cookie::Open.new(
-    identity,
+    { id: identity },
     settings.config['github']['encryption_secret'],
     context
   ).to_s

diff --git a/netbout.rb b/netbout.rb
@@ -51,7 +51,7 @@
   config = {
     'github' => {
       'client_id' => '?',
-      'client_secret' => '?',
+      'client_secret' => '',
       'encryption_secret' => ''
     },
     'sentry' => ''

diff --git a/test/test_netbout.rb b/test/test_netbout.rb
@@ -130,6 +130,11 @@ def test_flag_message
     assert_equal(name, json['flags'][0]['name'])
   end
 
+  def test_github_callback
+    get('/github-callback?code=99999')
+    assert_equal(302, last_response.status, last_response.body)
+  end
+
   private
 
   def login(name = test_name)