support automatic re-login when HTTP session expires

akretion · Jan 12, 2014 · da84df5 · da84df5
1 parent 7b10a88
commit da84df5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/ooor/errors.rb b/lib/ooor/errors.rb
@@ -29,6 +29,8 @@ def self.build(faultCode, faultString, method, *args)
         return UnAuthorizedError.new(method, faultCode, faultString, *args)
       elsif faultCode =~ /AuthenticationError: Credentials not provided/
         return InvalidSessionError.new(method, faultCode, faultString, *args)
+      elsif faultCode =~ /SessionExpiredException/
+        return SessionExpiredError.new(method, faultCode, faultString, *args)
       else
         return new(method, faultCode, faultString, *args)
       end
@@ -79,7 +81,7 @@ class UnAuthorizedError < OpenERPServerError; end
   class TypeError < OpenERPServerError; end
   class ValueError < OpenERPServerError; end
   class InvalidSessionError < OpenERPServerError; end
-
+  class SessionExpiredError < OpenERPServerError; end
 
   class ValidationError < OpenERPServerError
     def extract_validation_error!(errors)

diff --git a/lib/ooor/services.rb b/lib/ooor/services.rb
@@ -84,7 +84,6 @@ def object_service(service, obj, method, *args)
       uid = @session.config[:user_id]
       db = @session.config[:database]
       @session.logger.debug "OOOR object service: rpc_method: #{service}, db: #{db}, uid: #{uid}, pass: #, obj: #{obj}, method: #{method}, *args: #{args.inspect}"
-      begin
       if @session.config[:force_xml_rpc]
         pass = @session.config[:password]
         send(service, db, uid, pass, obj, method, *args)
@@ -98,7 +97,10 @@ def object_service(service, obj, method, *args)
       rescue InvalidSessionError
         @session.config[:force_xml_rpc] = true #TODO set v6 version too
         retry
-      end
+      rescue SessionExpiredError
+        @session.logger.debug "session for uid: #{uid} has expired, trying to login again"
+        @session.common.login(@session.config[:database], @session.config[:username], @session.config[:password])
+        retry
     end
 
     def inject_session_context(*args)