user_mgmt 0.9.3 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a43659ff2d3ea507c76c2730d4f81ad8a372e7b1
-  data.tar.gz: 86126687d9e99cc2ef8153500f5ff3d92e36e1d7
+  metadata.gz: 35a361a3b80bf695a8214c749bf7120693dee0c6
+  data.tar.gz: d3e63cfe8ef91ce9037b026b4f4b3e79451559d3
 SHA512:
-  metadata.gz: e94e35b4a1713942115f76171b1308d8ccbdda6b28da61cbc1ee5aa9318533ddf0068683b9dedfe24799aa6745aad0264d54554f81568ce08514c3c51cb89a44
-  data.tar.gz: dd8cf6dca2f017c7ee06ea72cd1b0ba8ad823d166ee568a2d497742bfc415b3bb1700ec6fe9d978bb890fbb5fd9caff7565c0818c644bc7c53af12caf7b0ef46
+  metadata.gz: 414209f2cb3337934a932838eb2770aabccb71c722c0db7497a0ad0617db042015e06eafe6f7a1e4de8e3cbf1ae951d0034cfe1c0b038c99134492c4800a616d
+  data.tar.gz: 05316bb64de8e3e63dc2c6bb0120682591d76f1068eb4ca33149a9b5bf31689b81c8f34db90e0f991ddc91980a0ea81fcbc45e526722b4144dbc9e32c57b2b28

data/app/controllers/user_mgmt/registrations_controller.rb

@@ -16,6 +16,7 @@ module UserMgmt
       if response[:status] == "200"
         flash[:success] = "User was created succesfully!"
         session[:user_session_id] = response[:body]["session"] 
+        session.permanent[:user_session_id] = response[:body]["session"] 
         redirect_to main_app.root_path
       else 
         flash[:error] = response[:body]

data/app/controllers/user_mgmt/sessions_controller.rb

@@ -18,6 +18,7 @@ module UserMgmt
         if response[:status] == "200"  
             flash[:success] = "User logged in!"
             session[:user_session_id] = response[:body]["session"] 
+            session.permanent[:user_session_id] = response[:body]["session"] 
             redirect_to main_app.root_path
         else 
             flash[:error] = response[:body]
@@ -52,7 +53,11 @@ module UserMgmt
             if @umid
                 redirect_to main_app.root_path, flash: { error: "User already signed up for the app!" }
             else
+<<<<<<< HEAD
                 session[:user_session_id] = response[:body]["session"]
+=======
+                session.permanent[:user_session_id] = response[:body]["session"]
+>>>>>>> ad0fd9cf191cb4a0bb0dc01fe3cfc5737ea76786
                 redirect_to main_app.root_path, flash: { success: "User logged in!" }
             end
         elsif @umid
@@ -72,7 +77,11 @@ module UserMgmt
             redirect_to sign_up_path, flash: { error: response[:body] }
         else
             response = log_in_oauth params["uid"], params["provider"].to_sym
+<<<<<<< HEAD
             session[:user_session_id] = response[:body]["session"]
+=======
+            session.permanent[:user_session_id] = response[:body]["session"]
+>>>>>>> ad0fd9cf191cb4a0bb0dc01fe3cfc5737ea76786
             redirect_to main_app.root_path, flash: { success: "User logged in!" }
         end
 
@@ -80,7 +89,11 @@ module UserMgmt
 
     # GET /user/log_out
     def destroy
+<<<<<<< HEAD
         session[:user_session_id] = nil
+=======
+        session.delete(:user_session_id)
+>>>>>>> ad0fd9cf191cb4a0bb0dc01fe3cfc5737ea76786
         redirect_to main_app.root_path, flash: { success: "Logged out!" }
     end
 

data/app/helpers/user_mgmt/application_helper.rb

@@ -7,11 +7,14 @@ module UserMgmt
 			if status == "200"
 				return true
 			else
-				session[:user_session_id] = nil
+				session.delete(:user_session_id)
 				return false
 			end
 		end
 
+		def get_email umid, host=UserMgmt.external_database_URI
+			send_request :get, :user_info, { umid: umid }, host
+
 		def current_user
 			@current_user ||= user_info(session[:user_session_id])[:body] unless session[:user_session_id] == nil
 		end

data/lib/user_mgmt/version.rb

@@ -1,3 +1,3 @@
 module UserMgmt
-  VERSION = "0.9.3"
+  VERSION = "1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: user_mgmt
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: '1.0'
 platform: ruby
 authors:
 - Danilo Faria, Fernando Gorodscy, Josh Leslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3