isomorfeus-transport 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2a7d2c1a8f19bd039510a71ad4e145d49244bcd3806457af5bdad78bc4f6ecd
-  data.tar.gz: 2c07e48156e16722515868b552878be2b8189cddebd1ca7500be7aee95a445cc
+  metadata.gz: fa0acbcbd591284295e444b772feb04cfd666a9ffc760f9883d6ca4e1ab92cf8
+  data.tar.gz: a71a263b02d3652bc2a934c2369c8e432baa8b11f4bca1c3b44202a819f4d650
 SHA512:
-  metadata.gz: d2e6929114aa91f8a4a7e0144a33015d296febe5ac8743695e191194ae23653f49eebb430365f637f69463d8d8ef65b0a42454564ec6b80af1450a5036c22206
-  data.tar.gz: 9cd43f123afcac86b6e1bccb305201a9e1bbced142e66650974472dadb949e678fbe8f5dcce30f9f541e8e8b85fe87265dd93a18bd593c624f9999311ed939b5
+  metadata.gz: 1069e0e06fd752d82ef00f059c9afddb095e13b0891d14e4d3e5d2f4d27498ea2971142f8c6535566864d41aad49a804af538f6fc53cb9a65230a6555305c193
+  data.tar.gz: 57f34ceceea085bb19891bd4c30420aa506f8c69d6305f04eb1a8662fb9dff8089785b043bd9703caa0be3e5fd42c9d33cb02ef6b9abc7c62673393dabb13157

data/README.md

@@ -3,7 +3,7 @@
 Transport and PubSub for Isomorfeus.
 
 ### Community and Support
-At the [Isomorfeus Framework Project](http://isomorfeus.com) 
+At the [Isomorfeus Framework Project](http://isomorfeus.com)
 
 ## Installation
 isomorfeus-transport is usually installed with the installer.
@@ -23,5 +23,5 @@ Server only:
 
 ## Usage
 
-- [Authentication and Current User](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-transport/docs/authentication.md)
-- [Channels (PubSub)](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-transport/docs/channels.md)
+- [Authentication and Current User](https://github.com/isomorfeus/isomorfeus-project/blob/master/isomorfeus-transport/docs/authentication.md)
+- [Channels (PubSub)](https://github.com/isomorfeus/isomorfeus-project/blob/master/isomorfeus-transport/docs/channels.md)

data/lib/isomorfeus/transport/config.rb

@@ -30,6 +30,7 @@ module Isomorfeus
     add_client_option(:api_websocket_host)
     add_client_option(:api_websocket_port)
     add_client_option(:api_websocket_path)
+    add_client_option(:api_logout_path)
     add_client_option(:cookie_eater_path)
     add_client_option(:transport_init_class_names, [])
 
@@ -69,6 +70,7 @@ module Isomorfeus
       attr_accessor :api_websocket_host
       attr_accessor :api_websocket_port
       attr_accessor :api_websocket_path
+      attr_accessor :api_logout_path
       attr_accessor :cookie_eater_path
       attr_reader :session_store
 
@@ -168,8 +170,8 @@ module Isomorfeus
     end
 
     self.session_store_init do
-      store_path = File.expand_path(File.join(Isomorfeus.root, 'data', Isomorfeus.env), 'session_store')
-      Isomorfeus::Transport::HamsterSessionStore.new(store_path) # dont use this one, but we keep it here to have at least something
+      store_path = File.expand_path(File.join(Isomorfeus.root, 'data', Isomorfeus.env, 'session_store'))
+      Isomorfeus::Transport::HamsterSessionStore.new(store_path)
     end
   end
 
@@ -177,6 +179,6 @@ module Isomorfeus
   self.api_websocket_host = 'localhost'
   self.api_websocket_port = '3000'
   self.api_websocket_path = '/isomorfeus/api/websocket'
-
-  self.cookie_eater_path = '/isomorfeus/cookie/eat'
+  self.api_logout_path    = '/isomorfeus/api/logout'
+  self.cookie_eater_path  = '/isomorfeus/cookie/eat'
 end

data/lib/isomorfeus/transport/handler/authentication_handler.rb

@@ -6,8 +6,8 @@ module Isomorfeus
 
         on_request do |response_agent|
           # promise_send_path('Isomorfeus::Transport::Handler::AuthenticationHandler', 'login', user_class_name, user_identifier, user_password)
-          response_agent.request.each_key do |login_or_logout|
-            if login_or_logout == 'login'
+          response_agent.request.each_key do |login_or_ssr_login|
+            if login_or_ssr_login == 'login'
               response_agent.agent_result = { error: 'Authentication failed' }
               tries = pub_sub_client.instance_variable_get(:@isomorfeus_authentication_tries)
               tries = 0 unless tries
@@ -40,7 +40,7 @@ module Isomorfeus
                   response_agent.agent_result = { success: 'ok', data: user.to_transport, session_cookie_accessor: session_cookie_accessor }
                 end
               end
-            elsif login_or_logout == 'ssr_login'
+            elsif login_or_ssr_login == 'ssr_login'
               response_agent.agent_result = { error: 'Authentication failed' }
               session_id = response_agent.request['ssr_login']
               user = Isomorfeus.session_store.get_user(session_id: session_id)
@@ -50,17 +50,6 @@ module Isomorfeus
                 Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_session_cookie, nil)
                 response_agent.agent_result = { success: 'ok', data: user.to_transport }
               end
-            elsif login_or_logout == 'logout'
-              begin
-                # bogus
-                session_cookie = nil
-              ensure
-                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_user, nil)
-                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
-                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_session_cookie, nil)
-                Isomorfeus.session_store.remove(cookie: session_cookie)
-                response_agent.agent_result = { success: 'ok' }
-              end
             end
           end
         end

data/lib/isomorfeus/transport/rack_middleware.rb

@@ -27,6 +27,27 @@ module Isomorfeus
           else
             [404, {}, ["Must specify relative path!"]]
           end
+        elsif env['PATH_INFO'] == Isomorfeus.api_logout_path
+          cookies = env['HTTP_COOKIE']
+          if cookies
+            cookies = cookies.split('; ')
+            cookie = cookies.detect { |c| c.start_with?('session=') }
+            if cookie
+              session_id = cookie[8..-1]
+              user = Isomorfeus.session_store.get_user(session_id: session_id)
+              if user
+                begin
+                  Isomorfeus.session_store.remove(session_id: session_id)
+                  cookie = "session=#{session_id}; SameSite=Strict; HttpOnly; Path=/; expires=Thu, 01 Jan 1970 00:00:00 UTC#{'; Secure' if Isomorfeus.production?}"
+                  return [302, { 'Location' => '/', 'Set-Cookie' => cookie }, ["Logged out!"]]
+                ensure
+                  Thread.current[:isomorfeus_user] = nil
+                  Thread.current[:isomorfeus_session_id] = nil
+                end
+              end
+            end
+          end
+          return [302, { 'Location' => '/', 'Set-Cookie' => cookie }, ["Tried to log out!"]]
         else
           cookies = env['HTTP_COOKIE']
           if cookies

data/lib/isomorfeus/transport/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Transport
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

data/lib/lucid_authentication/mixin.rb

@@ -60,12 +60,13 @@ module LucidAuthentication
       end
 
       def promise_deauthentication_with_isomorfeus
-        Isomorfeus::Transport.promise_send_path('Isomorfeus::Transport::Handler::AuthenticationHandler', 'logout', 'logout').then do |agent|
-          `document.cookie = "session="`
-          Isomorfeus.set_current_user(nil)
-          Isomorfeus.force_init_store!
-          agent.processed = true
-          agent.response.key?(:success) ? true : raise('Logout failed!')
+        cookie = `document.cookie`
+        p = Promise.new
+        begin
+          logout_query = Isomorfeus.api_logout_path
+          `window.location = logout_query`
+        rescue
+          p.reject
         end
       end
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-transport
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-15 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.14.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.14.5
 - !ruby/object:Gem::Dependency
   name: isomorfeus-hamster
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.6
+        version: 10.6.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.6
+        version: 10.6.11
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement