user_mgmt 0.9 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ca7d16c042b6a54c82a91fc4c2d2a977dfdc53e
-  data.tar.gz: 4e9f10788c72a332678ec63a46c720d703b5f44b
+  metadata.gz: 6b6a52073104bb38a80617fef51aed42509807ff
+  data.tar.gz: bd959bd31fa90f1839b00a89bebab4f9e2e10f47
 SHA512:
-  metadata.gz: 6cd9e510930130724f60d3b9d99d6cabb66b9c913c0d388ff59a2c5c2cf46e3a4addb13b528561384dc5d334c109a1796005de99885f93639549b26065d940fa
-  data.tar.gz: 3d8b888161ab62e3e467df83af26444d4d2b7280df31a6e4b89ad0037878c75d63e8802a735bb7560a43373b9a6f9399edf7aad38f0f0c368de4870e2f514aa2
+  metadata.gz: 945e71852a656ef95b080b396008548ed7b48905d0749b53d3c42776e7ebf5576ab8a1c227e99e02fc680bdde16ce35d00ce6c60125552bf46ba5fe6598439c0
+  data.tar.gz: e9c438b65fbdd00199ccca061bfa6f2ec17de9f4556dcc0387b460247b38a4c3e903ba5bd349871d3ba5fbeb07afb4cf3da81873ff6f14b604090d1f9d644169

data/app/controllers/user_mgmt/registrations_controller.rb

@@ -15,7 +15,7 @@ module UserMgmt
       
       if response[:status] == "200"
         flash[:success] = "User was created succesfully!"
-        session.permanent[:user_session_id] = response[:body]["session"] 
+        cookies.permanent[:user_session_id] = response[:body]["session"] 
         redirect_to main_app.root_path
       else 
         flash[:error] = response[:body]
@@ -29,9 +29,6 @@ module UserMgmt
 
     end
 
-    def add_strategy
-    end
-
     def password_reset
     end
 

data/app/controllers/user_mgmt/sessions_controller.rb

@@ -17,7 +17,7 @@ module UserMgmt
       
         if response[:status] == "200"  
             flash[:success] = "User logged in!"
-            session.permanent[:user_session_id] = response[:body]["session"] 
+            cookies.permanent[:user_session_id] = response[:body]["session"] 
             redirect_to main_app.root_path
         else 
             flash[:error] = response[:body]
@@ -41,23 +41,14 @@ module UserMgmt
             @provider = "windows_live"
         end
 
-        @umid = current_user["umid"] if user_logged_in?
-
         response = log_in_oauth @uid, @provider
         
         # if user logged in succesfully, just redirect to main page,
         # otherwise it means the user doesn't exist yet, so continue 
         # normaly (user will be asked for his email).
         if response[:status] == "200"
-            if @umid
-                redirect_to main_app.root_path, flash: { error: "User already signed up for the app!" }
-            else
-                session.permanent[:user_session_id] = response[:body]["session"]
-                redirect_to main_app.root_path, flash: { success: "User logged in!" }
-            end
-        elsif @umid
-            add_strategy @uid, @provider, @umid, session[:user_session_id]
-            redirect_to main_app.root_path, flash: { success: "Strategy added successfully!" }
+            cookies.permanent[:user_session_id] = response[:body]["session"]
+            redirect_to main_app.root_path, flash: { success: "User logged in!" } 
         end
 
     end
@@ -72,7 +63,7 @@ module UserMgmt
             redirect_to sign_up_path, flash: { error: response[:body] }
         else
             response = log_in_oauth params["uid"], params["provider"].to_sym
-            session.permanent[:user_session_id] = response[:body]["session"]
+            cookies.permanent[:user_session_id] = response[:body]["session"]
             redirect_to main_app.root_path, flash: { success: "User logged in!" }
         end
 
@@ -80,7 +71,7 @@ module UserMgmt
 
     # GET /user/log_out
     def destroy
-        session.delete(:user_session_id)
+        cookies.delete(:user_session_id)
         redirect_to main_app.root_path, flash: { success: "Logged out!" }
     end
 

data/app/helpers/user_mgmt/application_helper.rb

@@ -2,18 +2,18 @@ module UserMgmt
 	module ApplicationHelper
 
 		def user_logged_in?
-			return false if session[:user_session_id] == nil
-			status = user_info(session[:user_session_id])[:status]
+			return false if cookies[:user_session_id] == nil
+			status = user_info(cookies[:user_session_id])[:status]
 			if status == "200"
 				return true
 			else
-				session.delete(:user_session_id)
+				cookies.delete(:user_session_id)
 				return false
 			end
 		end
 
 		def current_user
-			@current_user ||= user_info(session[:user_session_id])[:body] unless session[:user_session_id] == nil
+			@current_user ||= user_info(cookies[:user_session_id])[:body] unless cookies[:user_session_id] == nil
 		end
 
 		def sign_up email, password, password_confirmation, admin=false, host=UserMgmt.external_database_URI

data/app/views/user_mgmt/sessions/new.html.haml

@@ -24,4 +24,8 @@
         = link_to image_tag('user_mgmt/normal/yahoo-copied.jpg', class: "menu_icon", height: '45', width: '45'), "auth/yahoo" 
         = link_to image_tag('user_mgmt/normal/gmail-copied.png', class: "menu_icon", height: '45', width: '45'), "auth/google_oauth2" 
     .password_reset
-      = link_to 'forgot your password?', password_reset_request_path
+      = link_to 'forgot your password?', password_reset_request_path
+
+
+
+

data/config/routes.rb

@@ -12,7 +12,6 @@ UserMgmt::Engine.routes.draw do
   post '/send_password_reset' => 'registrations#send_password_reset', as: 'send_password_reset'
   get '/password_reset_request' => 'registrations#password_reset_request', as: 'password_reset_request'
   post '/send_reset_request' => 'registrations#send_reset_request', as: 'send_reset_request'
-  get '/add_strategy' => 'registrations#add_strategy', as: 'add_strategy'
 
   get 'auth/:provider/callback' => 'sessions#oauth_email', as: 'oauth_email'
   get 'auth/failure' => 'application#main_page', as: 'cancel'

data/lib/user_mgmt/version.rb

@@ -1,3 +1,3 @@
 module UserMgmt
-  VERSION = "0.9"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: user_mgmt
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: 0.9.1
 platform: ruby
 authors:
 - Danilo Faria, Fernando Gorodscy, Josh Leslie