ixtlan-user-management 0.1.0 → 0.1.1

data/lib/ixtlan/user_management/authenticator.rb

@@ -35,6 +35,7 @@ module Ixtlan
         user = nil
         @restserver.create( Authentication.new(:login => username_or_email, :password => password) ) do |json, req|
           user = user_new( JSON.load( json ) ) unless json.strip == ''
+          #tell restserver to ignore response
           nil
         end
         user
@@ -60,4 +61,4 @@ module Ixtlan
       end
     end
   end
-end
+end

data/lib/ixtlan/user_management/session_cuba.rb

@@ -18,14 +18,34 @@
 # 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.
 #
-require 'ixtlan/user_management/session_plugin'
 
 module Ixtlan
   module UserManagement
   
     class SessionCuba < CubaAPI
 
-      plugin SessionPlugin
+      def self.authenticator
+        self[ :authenticator ] ||= Authenticator.new( self[ :rest ] )
+      end
+
+      def log( msg )
+        if self.respond_to? :audit
+          audit( msg, { :username => login } )
+        else
+          warn( "[#{login}] #{msg}" )
+        end
+      end
+  
+      def login_and_password
+        source = parse_request_body rescue nil
+        source = req if source.nil? || source.empty?
+        auth = source[ 'authentication' ] || source
+        [ auth[ 'login' ] || auth[ 'email' ], auth[ 'password' ] ]
+      end
+      
+      def login
+        login_and_password[ 0 ]
+      end
 
       define do
         on post, :reset_password do
@@ -57,8 +77,8 @@ module Ixtlan
           head 200
         end
         
-        on delete, current_user do
-          self.class.authenticator.logout( current_user )
+        on delete do
+          self.class.authenticator.logout( current_user ) if current_user
           log "logout"
           reset_current_user
           head 200
@@ -66,4 +86,4 @@ module Ixtlan
       end
     end
   end
-end
+end

metadata

@@ -2,14 +2,14 @@
 name: ixtlan-user-management
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -126,7 +126,6 @@ files:
 - lib/ixtlan/user_management/group_model.rb
 - lib/ixtlan/user_management/user_resource.rb
 - lib/ixtlan/user_management/session_manager.rb
-- lib/ixtlan/user_management/session_plugin.rb
 - lib/ixtlan/user_management/application_resource.rb
 - lib/ixtlan/user_management/domain_resource.rb
 - lib/ixtlan/user_management/authentication_model.rb

data/lib/ixtlan/user_management/session_plugin.rb

@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2013 Christian Meier
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# 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.
-#
-require 'ixtlan/user_management/authenticator'
-
-module Ixtlan
-  module UserManagement
-    module SessionPlugin
-
-      module ClassMethods
-        def authenticator
-          self[ :authenticator ] ||= Authenticator.new( self[ :rest ] )
-        end
-      end
-
-      def log( msg )
-        if self.respond_to? :audit
-          audit( msg, { :username => login } )
-        else
-          warn( "[#{login}] #{msg}" )
-        end
-      end
-  
-      def login_and_password
-        auth = req[:authentication] || req
-        [ auth[:login] || auth[:email], auth[:password] ]
-      end
-      
-      def login
-        login_and_password[ 0 ]
-      end
-    end
-  end
-end