isomorfeus-transport 1.0.0.zeta12 → 1.0.0.zeta13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 429764404614628b8b9f1c62d36a496b57e173dc5c67720f4ba8a07fdac182d8
-  data.tar.gz: 8d125f4501ea5ebbbe32112a77e8a6163907e9fd252e9dbf29f4599fc81e3613
+  metadata.gz: 5afe07287186efbadeb44399e12872613c72c13754d6c2286f5942d74e399c65
+  data.tar.gz: 43d9ede92dcf3f9abd5dddecdab7721d348095645692a59ca4a8a8349a956e67
 SHA512:
-  metadata.gz: 3ef22091cda95389354afd86d0131cb6395bc5d8207f8b310131063c2b2be4d29ea3bf224d702e4c32b9abba981646821ae45dcf98998a2f7ce9525ee27e2da3
-  data.tar.gz: 16395e5e7b942a3317cdacb114f03d97269d2f695dcc1d8b35fadf98acd309bc39e1afdff5551eecd93a43effb22537966d5ebe5fff288e617c08e62b0fc11e6
+  metadata.gz: bddf5e798a2ce98f0f1b7c1852e8fde0f9fe3a52f9b7e621bf26128aac82d5d73cb4ba917e693de2b6056126d9fe05e1a1b9f719128053d9825984992e7f868a
+  data.tar.gz: 1af593318aa9a0fff41e0d7adb5e2c4d0895b62e719b5dae783f2a3cac619b94db647d7c11b54210f184613947b4901d4c495aa82c7036dc30ddf8cc7364f560

data/README.md

@@ -34,11 +34,11 @@ Server only:
 
 For authentication in isomorfeus there is a class `Anonymous`, so whenever no user is logged in, the anonymous user is passed on to operations
 or data loads. In my opinion it is more true than no user (nil), because in fact there probably is a user, just the user is unknown.
-The Anonymous user has a default policy that denies everything, the user will respond to .authorized?(whatever) always with false by default.
-Of  course, the developer can add a Policy easily, to allow certain operations or data loads, or whatever or everything:
+The Anonymous user has a default policy that allows everything, the user will respond to .authorized?(whatever) always with true by default.
+Of  course, the developer can add a Policy easily, to deny certain operations or data loads, or whatever or deny everything:
 ```ruby
 class AnonymousPolicy < LucidPolicy::Base
- allow all
+ deny all
 end
 ```
 For more information about policy see [the policy docs](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-policy/README.md).
@@ -47,14 +47,14 @@ A class representing a user should be a LucidNode and include LucidAuthenticatio
 ```ruby
 class User < LucidGenericDocument::Base
   include LucidAuthentication::Mixin
-  authentication do |user_identifier, user_password_or token|
+  authentication do |user:, pass:|
     # should return either a User instance or a Promise which reselves to a User instance
   end
 end
 ```
 With that its possible to do on the client (or server):
 ```ruby
-User.promise_login(user_identifier, user_password_or_token).then do |user|
+User.promise_login(user: user_identifier, pass: user_password_or_token).then do |user|
    # do something with user
 end
 ```
@@ -64,13 +64,13 @@ user.promise_logout
 ```
 The authentication in isomorfeus is prepared for external or alternate authentication schemes, example:
 ```ruby
-User.promise_login(user_identifier, token, :facebook).then do |user|
+User.promise_login(user: user_identifier, pass: token, :facebook).then do |user|
    # do something with user
 end
 ```
 will call:
 ```ruby
-User.promise_authentication_with_facebook(user_identifier, token)
+User.promise_authentication_with_facebook(user: user_identifier, pass: token)
 ```
 which would have to be implemented.
 

data/lib/isomorfeus-transport.rb

@@ -1,6 +1,5 @@
 require 'isomorfeus-policy'
 require 'lucid_authentication/mixin'
-require 'isomorfeus/transport/props_proxy'
 if RUBY_ENGINE == 'opal'
   require 'json'
   require 'isomorfeus/config'

data/lib/isomorfeus/transport.rb

@@ -95,7 +95,7 @@ module Isomorfeus
               end
             end
             register_request_in_progress(request, agent.id)
-            raise 'No socket!' unless @socket
+            Isomorfeus.raise_error(message: 'No socket!') unless @socket
             begin
               @socket.send(`JSON.stringify(#{{request: { agent_ids: { agent.id => request }}}.to_n})`)
               agent.sent = true
@@ -115,7 +115,7 @@ module Isomorfeus
         end
 
         def send_notification(channel_class, channel, message)
-          raise 'No socket!' unless @socket
+          Isomorfeus.raise_error(message: 'No socket!') unless @socket
           @socket.send(`JSON.stringify(#{{notification: { class: channel_class.name, channel: channel, message: message}}.to_n})`)
           true
         end
@@ -127,7 +127,7 @@ module Isomorfeus
           else
             agent = Isomorfeus::Transport::RequestAgent.new(request)
             register_request_in_progress(request, agent.id)
-            raise 'No socket!' unless @socket
+            Isomorfeus.raise_error(message: 'No socket!') unless @socket
             @socket.send(`JSON.stringify(#{{subscribe: { agent_ids: { agent.id => request }}}.to_n})`)
           end
           result_promise = agent.promise.then do |agent|
@@ -148,7 +148,7 @@ module Isomorfeus
           else
             agent = Isomorfeus::Transport::RequestAgent.new(request)
             register_request_in_progress(request, agent.id)
-            raise 'No socket!' unless @socket
+            Isomorfeus.raise_error(message: 'No socket!') unless @socket
             @socket.send(`JSON.stringify(#{{unsubscribe: { agent_ids: { agent.id => request }}}.to_n})`)
           end
           result_promise = agent.promise.then do |agent|

data/lib/isomorfeus/transport/config.rb

@@ -8,6 +8,14 @@ module Isomorfeus
     def self.add_transport_init_class_name(init_class_name)
       transport_init_class_names << init_class_name
     end
+
+    def self.current_user
+      @current_user ||= Anonymous.new
+    end
+
+    def self.set_current_user(user)
+      @current_user = user ? user : Anonymous.new
+    end
   else
     class << self
       attr_accessor :api_websocket_path
@@ -113,6 +121,14 @@ module Isomorfeus
         class_name = class_name.split('>::').last if class_name.start_with?('#<')
         class_name
       end
+
+      def current_user
+        Thread.current[:isomorfeus_user]
+      end
+
+      def pub_sub_client
+        Thread.current[:isomorfeus_pub_sub_client]
+      end
     end
   end
 

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

@@ -4,7 +4,7 @@ module Isomorfeus
       class AuthenticationHandler < LucidHandler::Base
         TIMEOUT = 30
 
-        on_request do |pub_sub_client, current_user, response_agent|
+        on_request do |response_agent|
           result = { error: 'Authentication failed' }
           # promise_send_path('Isomorfeus::Transport::Handler::AuthenticationHandler', 'login', user_class_name, user_identifier, user_password)
           response_agent.request.each_key do |login_or_logout|
@@ -13,13 +13,13 @@ module Isomorfeus
               tries = 0 unless tries
               tries += 1
               sleep(5) if tries > 3 # TODO, this needs a better solution (store data in user/session)
-              pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, tries)
+              Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, tries)
               response_agent.request['login'].each_key do |user_class_name|
                 user = nil
                 if Isomorfeus.valid_user_class_name?(user_class_name)
                   user_class = Isomorfeus.cached_user_class(user_class_name)
                   response_agent.request['login'][user_class_name].each_key do |user_identifier|
-                    promise = user_class.promise_login(user_identifier, response_agent.request['login'][user_class_name][user_identifier])
+                    promise = user_class.promise_login(user: user_identifier, pass: response_agent.request['login'][user_class_name][user_identifier])
                     unless promise.realized?
                       start = Time.now
                       until promise.realized?
@@ -32,15 +32,17 @@ module Isomorfeus
                   end
                 end
                 if user
-                  pub_sub_client.instance_variable_set(:@isomorfeus_user, user)
-                  pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
+                  Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_user, user)
+                  Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_authentication_tries, nil)
                   # TODO store session in db and supply session cookie: session_cookie: uuid or so
                   response_agent.agent_result = { success: 'ok', data: user.to_transport }
                 end
               end
             elsif login_or_logout == 'logout'
               begin
-                promise = current_user.promise_logout
+                promise = Isomorfeus.current_user.promise_logout
+                # TODO remove session from db
+                # response_agent.agent_result = { success: 'ok', data: user.to_transport }
                 unless promise.realized?
                   start = Time.now
                   until promise.realized?
@@ -49,7 +51,7 @@ module Isomorfeus
                   end
                 end
               ensure
-                pub_sub_client.instance_variable_set(:@isomorfeus_user, nil)
+                Isomorfeus.pub_sub_client.instance_variable_set(:@isomorfeus_user, nil)
                 response_agent.agent_result = { success: 'ok' }
               end
             end

data/lib/isomorfeus/transport/server_processor.rb

@@ -3,9 +3,7 @@
 module Isomorfeus
   module Transport
     module ServerProcessor
-      def process_request(client, current_user, request, handler_instance_cache, response_agent_array)
-        Thread.current[:isomorfeus_pub_sub_client] = client
-
+      def process_request(request, handler_instance_cache, response_agent_array)
         if request.key?('request') && request['request'].key?('agent_ids')
           request['request']['agent_ids'].each_key do |agent_id|
             request['request']['agent_ids'][agent_id].each_key do |handler_class_name|
@@ -19,7 +17,7 @@ module Isomorfeus
                             handler_instance_cache[handler_class_name] = handler_class.new if handler_class
                           end
                 if handler
-                  handler.process_request(client, current_user, response_agent)
+                  handler.process_request(response_agent)
                 else
                   response_agent.error = { error: { handler_class_name => 'No such handler!'}}
                 end
@@ -35,8 +33,8 @@ module Isomorfeus
 
             if Isomorfeus.valid_channel_class_name?(class_name) && channel
               channel_class = Isomorfeus.cached_channel_class(class_name)
-              if channel_class && current_user.authorized?(channel_class, :send_message, channel)
-                client.publish(request['notification']['channel'], Oj.dump({ 'notification' => request['notification'] }, mode: :strict))
+              if channel_class && Isomorfeus.current_user.authorized?(channel_class, :send_message, channel)
+                Isomorfeus.pub_sub_client.publish(request['notification']['channel'], Oj.dump({ 'notification' => request['notification'] }, mode: :strict))
               else
                 response_agent = OpenStruct.new
                 response_agent_array << response_agent
@@ -61,8 +59,8 @@ module Isomorfeus
             class_name = response_agent.request['class']
             if Isomorfeus.valid_channel_class_name?(class_name) && channel
               channel_class = Isomorfeus.cached_channel_class(class_name)
-              if channel_class && current_user.authorized?(channel_class, :subscribe, channel)
-                client.subscribe(channel)
+              if channel_class && Isomorfeus.current_user.authorized?(channel_class, :subscribe, channel)
+                Isomorfeus.pub_sub_client.subscribe(channel)
                 response_agent.agent_result = { success: channel }
               else
                 response_agent.error = { error: "Not authorized!"}
@@ -82,8 +80,8 @@ module Isomorfeus
             class_name = response_agent.request['class']
             if Isomorfeus.valid_channel_class_name?(class_name) && channel
               channel_class = Isomorfeus.cached_channel_class(class_name)
-              if channel_class && current_user.authorized?(channel_class, :unsubscribe, channel)
-                client.unsubscribe(channel)
+              if channel_class && Isomorfeus.current_user.authorized?(channel_class, :unsubscribe, channel)
+                Isomorfeus.pub_sub_client.unsubscribe(channel)
                 response_agent.agent_result = { success: channel }
               else
                 response_agent.error = { error: "Not authorized!"}

data/lib/isomorfeus/transport/server_socket_processor.rb

@@ -15,7 +15,9 @@ module Isomorfeus
         request_hash = Oj.load(data, mode: :strict)
         handler_instance_cache = {}
         response_agent_array = []
-        process_request(client, user(client), request_hash, handler_instance_cache, response_agent_array)
+        Thread.current[:isomorfeus_user] = user(client)
+        Thread.current[:isomorfeus_pub_sub_client] = client
+        process_request(request_hash, handler_instance_cache, response_agent_array)
         handler_instance_cache.each_value do |handler|
           handler.resolve if handler.resolving?
         end
@@ -25,6 +27,8 @@ module Isomorfeus
         end
         client.write Oj.dump(result, mode: :strict)
       ensure
+        Thread.current[:isomorfeus_user] = nil
+        Thread.current[:isomorfeus_pub_sub_client] = nil
         Isomorfeus.zeitwerk_lock.release_read_lock if Isomorfeus.development?
       end
 

data/lib/isomorfeus/transport/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Transport
-    VERSION = '1.0.0.zeta12'
+    VERSION = '1.0.0.zeta13'
   end
 end

data/lib/isomorfeus/transport/websocket.rb

@@ -49,8 +49,8 @@ module Isomorfeus
           case ready_state
           when OPEN then @native_websocket.JS.send(data)
           when CONNECTING then Isomorfeus::Transport.delay(50) { send(data) }
-          when CLOSING then raise SendError.new('Cant send, connection is closing!')
-          when CLOSED then raise SendError.new('Cant send, connection is closed!')
+          when CLOSING then Isomorfeus.raise_error(error_class: SendError, message: 'Cant send, connection is closing!')
+          when CLOSED then Isomorfeus.raise_error(error_class: SendError.new, message: 'Cant send, connection is closed!')
           end
         end
 
@@ -120,4 +120,4 @@ module Isomorfeus
       alias_method :write,  :send
     end
   end
-end
+end

data/lib/lucid_authentication/mixin.rb

@@ -7,17 +7,17 @@ module LucidAuthentication
           def authentication(&block)
           end
 
-          def promise_login(user_identifier, user_password, scheme = :isomorfeus)
-              send("promise_authentication_with_#{scheme}", user_identifier, user_password)
+          def promise_login(user: nil, pass: nil, scheme: :isomorfeus)
+              send("promise_authentication_with_#{scheme}",user: user, pass: pass)
           end
 
-          def promise_authentication_with_isomorfeus(user_identifier, user_password)
+          def promise_authentication_with_isomorfeus(user: nil, pass: nil)
             if Isomorfeus.production?
-              raise "Connection not secure, can't login" unless Isomorfeus::Transport.socket.url.start_with?('wss:')
+              Isomorfeus.raise_error(message: "Connection not secure, can't login") unless Isomorfeus::Transport.socket.url.start_with?('wss:')
             else
               `console.warn("Connection not secure, ensure a secure connection in production, otherwise login will fail!")` unless Isomorfeus::Transport.socket.url.start_with?('wss:')
             end
-            Isomorfeus::Transport.promise_send_path('Isomorfeus::Transport::Handler::AuthenticationHandler', 'login', self.name, user_identifier, user_password).then do |agent|
+            Isomorfeus::Transport.promise_send_path('Isomorfeus::Transport::Handler::AuthenticationHandler', 'login', self.name, user, pass).then do |agent|
               if agent.processed
                 agent.result
               else
@@ -29,11 +29,13 @@ module LucidAuthentication
 
                   # TODO set session cookie
                   # agent.response[:session_cookie]
-                  agent.result = Isomorfeus.cached_data_class(class_name).new(key: key)
+                  logged_in_user = Isomorfeus.cached_data_class(class_name).new(key: key)
+                  Isomorfeus.set_current_user(logged_in_user)
+                  agent.result = logged_in_user
                 else
                   error = agent.response[:error]
                   `console.err(error)` if error
-                  raise 'Login failed!' # calls .fail
+                  Isomorfeus.raise_error(message: 'Login failed!') # triggers .fail
                 end
               end
             end
@@ -41,12 +43,15 @@ module LucidAuthentication
         end
       end
 
-      def promise_logout(scheme = :isomorfeus)
+      def promise_logout(scheme: :isomorfeus)
         send("promise_deauthentication_with_#{scheme}")
       end
 
       def promise_deauthentication_with_isomorfeus
         Isomorfeus::Transport.promise_send_path('Isomorfeus::Transport::Handler::AuthenticationHandler', 'logout', 'logout').then do |agent|
+          # TODO unset session cookie
+          # agent.response[:session_cookie]
+          Isomorfeus.set_current_user(nil)
           agent.processed = true
           agent.response.key?(:success) ? true : raise('Logout failed!')
         end
@@ -60,12 +65,12 @@ module LucidAuthentication
             @authentication_block = block
           end
 
-          def promise_login(user_identifier, user_password_or_token, scheme = :isomorfeus)
-            send("promise_authentication_with_#{scheme}", user_identifier, user_password_or_token)
+          def promise_login(user: nil, pass: nil, scheme: :isomorfeus)
+            send("promise_authentication_with_#{scheme}", user: user, pass: pass)
           end
 
-          def promise_authentication_with_isomorfeus(user_identifier, user_password_or_token)
-            promise_or_user = @authentication_block.call(user_identifier, user_password_or_token)
+          def promise_authentication_with_isomorfeus(user: nil, pass: nil)
+            promise_or_user = @authentication_block.call(user: user, pass: pass)
             if promise_or_user.class == Promise
               promise_or_user
             else
@@ -75,7 +80,7 @@ module LucidAuthentication
         end
       end
 
-      def promise_logout(scheme = :isomorfeus)
+      def promise_logout(scheme: :isomorfeus)
         send("promise_deauthentication_with_#{scheme}")
       end
 

data/lib/lucid_channel/mixin.rb

@@ -40,6 +40,10 @@ module LucidChannel
           channel = channel ? channel : self.name
           Isomorfeus::Transport.unsubscribe(self, channel)
         end
+
+        def current_user
+          Isomorfeus.current_user
+        end
       end
     end
   end

data/lib/lucid_handler/mixin.rb

@@ -15,5 +15,13 @@ module LucidHandler
     def resolving?
       false
     end
+
+    def current_user
+      Isomorfeus.current_user
+    end
+
+    def pub_sub_client
+      Isomorfeus.pub_sub_client
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.0.zeta12
+  version: 1.0.0.zeta13
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.12.9
+        version: 16.12.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.12.9
+        version: 16.12.14
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta12
+        version: 1.0.0.zeta13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta12
+        version: 1.0.0.zeta13
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta12
+        version: 1.0.0.zeta13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta12
+        version: 1.0.0.zeta13
 - !ruby/object:Gem::Dependency
   name: opal-webpack-loader
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,6 @@ files:
 - lib/isomorfeus/transport/config.rb
 - lib/isomorfeus/transport/handler/authentication_handler.rb
 - lib/isomorfeus/transport/middlewares.rb
-- lib/isomorfeus/transport/props_proxy.rb
 - lib/isomorfeus/transport/rack_middleware.rb
 - lib/isomorfeus/transport/request_agent.rb
 - lib/isomorfeus/transport/response_agent.rb

data/lib/isomorfeus/transport/props_proxy.rb

@@ -1,95 +0,0 @@
-module Isomorfeus
-  module Transport
-    class PropsProxy
-      def initialize(props_hash)
-        props_hash = {} unless props_hash
-        @props_hash = props_hash
-      end
-
-      def any?
-        @props_hash.keys.size > 0
-      end
-
-      if RUBY_ENGINE == 'opal'
-        def [](prop_name)
-          @props_hash[prop_name]
-        end
-
-        def []=(prop_name, value)
-          @props_hash[prop_name] = value
-        end
-
-        def key?(prop_name)
-          @props_hash.key?(prop_name)
-        end
-
-        def keys
-          @props_hash.keys
-        end
-
-        def method_missing(prop_name, *args, &block)
-          return @props_hash[prop_name] if @props_hash.key?(prop_name)
-          super(prop_name, *args, &block)
-        end
-
-        def set(prop_name, value)
-          @props_hash[prop_name] = value
-        end
-
-        def to_json
-          JSON.dump(to_transport)
-        end
-
-        def to_transport
-          transport_hash = {}.merge(@props_hash)
-          transport_hash
-        end
-      else # RUBY_ENGINE
-        def [](prop_name)
-          name = prop_name.to_sym
-          return @props_hash[name] if @props_hash.key?(name)
-          name = prop_name.to_s
-          return @props_hash[name] if @props_hash.key?(name)
-          nil
-        end
-
-        def []=(prop_name, value)
-          @props_hash[prop_name.to_sym] = value
-        end
-
-        def key?(prop_name)
-          @props_hash.key?(prop_name.to_sym) || @props_hash.key?(prop_name.to_s)
-        end
-
-        def keys
-          @props_hash.keys.map(&:to_sym)
-        end
-
-        def method_missing(prop_name, *args, &block)
-          name = prop_name.to_sym
-          return @props_hash[name] if @props_hash.key?(name)
-          name = prop_name.to_s
-          return @props_hash[name] if @props_hash.key?(name)
-          super(prop_name, *args, &block)
-        end
-
-        def set(prop_name, value)
-          @props_hash[prop_name.to_sym] = value
-        end
-
-        def to_json
-          Oj.dump(to_transport, mode: :strict)
-        end
-
-        def to_transport
-          transport_hash = {}.merge(@props_hash)
-          transport_hash.delete(:pub_sub_client)
-          transport_hash.delete(:current_user)
-          transport_hash
-        end
-      end # RUBY_ENGINE
-
-      alias_method :has_key?, :key?
-    end
-  end
-end