ixtlan-user-management 0.1.1 → 0.1.2

data/lib/ixtlan/user_management/authenticator.rb

@@ -19,6 +19,7 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 require 'ixtlan/user_management/authentication_model'
+require 'multi_json'
 module Ixtlan
   module UserManagement
     class Authenticator
@@ -34,7 +35,7 @@ module Ixtlan
       def login( username_or_email, password )
         user = nil
         @restserver.create( Authentication.new(:login => username_or_email, :password => password) ) do |json, req|
-          user = user_new( JSON.load( json ) ) unless json.strip == ''
+          user = user_new( MultiJson.load( json ) ) unless json.strip == ''
           #tell restserver to ignore response
           nil
         end

data/lib/ixtlan/user_management/session_cuba.rb

@@ -18,7 +18,6 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-
 module Ixtlan
   module UserManagement
   
@@ -72,17 +71,39 @@ module Ixtlan
           end
         end
         
-        on get, :ping do
-          self.class.authenticator.ping( current_user )
-          head 200
+        on authenticated? do
+          on get, 'me' do
+            if current_user.respond_to? :updated_at
+              if modified_since.nil? || current_user.updated_at > modified_since
+                last_modified( current_user.updated_at )
+                browser_only_cache_no_store
+                write current_user, :use => :me
+              else
+                last_modified( modified_since )          
+              end
+            else
+              browser_only_cache_no_store
+              write current_user, :use => :me
+            end
+          end
+
+          on get, 'ping' do
+            self.class.authenticator.ping( current_user )
+            head 200
+          end
         end
-        
+
+        on get, /(me|ping)/ do
+          head :unauthorized
+        end
+
         on delete do
           self.class.authenticator.logout( current_user ) if current_user
           log "logout"
           reset_current_user
           head 200
         end
+
       end
     end
   end

data/lib/ixtlan/user_management/session_manager.rb

@@ -48,7 +48,7 @@ module Ixtlan
               Group.new( g )
             end
             user = User.first( :login => data[ 'login' ] )
-            user.groups = groups
+            user.groups = groups if user
             user
           end
         end
@@ -67,4 +67,4 @@ module Ixtlan
       end
     end
   end
-end
+end

data/lib/ixtlan/user_management/session_model.rb

@@ -24,7 +24,7 @@ module Ixtlan
     class Session
       include Virtus
 
-      attribute :idle_session_timeout, Integer
+      attribute :idle_session_timeout, Integer, :default => 30
       attribute :user, User
       attribute :permissions, Array[Object]
 
@@ -33,4 +33,4 @@ module Ixtlan
       end
     end
   end
-end
+end

data/lib/ixtlan/user_management/session_serializer.rb

@@ -25,17 +25,17 @@ module Ixtlan
 
       root 'session'
 
-      add_context(:single,
-                  :only => [:idle_session_timeout],
-                  :include => { 
-                    :user => {
-                    },
-                    :permissions => {
-                      :include => [:actions, :associations]
-                    }
-                  }
-                  )
+      add_context( :single,
+                   :only => [ :idle_session_timeout ],
+                   :include => { 
+                     :user => {
+                       :only => [ :id, :login, :name ]
+                     },
+                     :permissions => {
+                       :include => [ :actions, :associations ]
+                     }
+                   } )
       
     end
   end
-end
+end

metadata

@@ -2,15 +2,31 @@
 name: ixtlan-user-management
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
   version_requirements: !ruby/object:Gem::Requirement