user_mgmt 0.0.621 → 0.1.0

data/.gitignore

@@ -21,3 +21,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.DS_Store
+test/ICF_mgmt

data/app/controllers/user_mgmt/application_controller.rb

@@ -7,95 +7,5 @@ module UserMgmt
 		redirect_to main_app.root_path
 	end 
 
-    private
-	def current_user
-	    @current_user ||= nil#User.find(session[:user_session_id]) if session[:user_session_id]
-	end
-	helper_method :current_user
-
-	def sign_up email, password, password_confirmation, host= UserMgmt.external_database_URI
-		send_request :post, :users, { user: { email: email, password: password, 
-			password_confirmation: password_confirmation }, method: :simple }, host
-	end
-
-	def sign_up_oauth uid, strategy, email, host= UserMgmt.external_database_URI
-		send_request :post, :users, { user: { uid: uid, strategy: strategy, email: email }, method: :oauth }, host
-	end
-
-	def log_in email, password, host= UserMgmt.external_database_URI
-		send_request :get, :login, { user: { email: email, password: password }, method: :simple }, host
-	end
-
-	def log_in_oauth uid, strategy, host= UserMgmt.external_database_URI
-		send_request :get, :login, { user: { uid: uid, strategy: strategy }, method: :oauth }, host
-	end
-
-	def log_out umid, host= UserMgmt.external_database_URI
-		send_request :delete, :logout, { user: umid }, host
-	end
-
-	def add_strategy uid, strategy, umid, session, host= UserMgmt.external_database_URI
-		send_request :post, :add_strategy, { new_strategy: { uid: uid, strategy: strategy }, 
-		user: umid, session_id: session }, host
-	end
-
-	def remove_strategy umid, strategy, session, host= UserMgmt.external_database_URI
-		send_request :delete, :remove_strategy, { user: umid, strategy: strategy, 
-		session_id: session }, host
-	end
-
-	def delete_user umid, session, host= UserMgmt.external_database_URI
-		send_request :delete, :destroy, { user: umid, session_id: session }, host
-	end
-
-	def change_password user, password, new_pw, new_pw_confirm, session, host= UserMgmt.external_database_URI
-		send_request :put, :change_password, { user: user, password: password, 
-		new_password: new_pw, new_password_confirmation: new_pw_confirm, 
-		session: session }, host
-	end
-
-	def reset_password reset_token, new_pw, new_pw_confirm, host= UserMgmt.external_database_URI
-		send_request :put, :change_password, { reset_token: reset_token, new_password: new_pw, 
-		new_password_confirmation: new_pw_confirm }, host
-	end
-
-	def reset_password_request email, host= UserMgmt.external_database_URI
-		send_request :post, :reset_password, { email: email }, host
-	end
-
-	def change_email user, password, new_email, new_email_confirm, session, host= UserMgmt.external_database_URI
-		send_request :put, :change_email, { email: user, password: password, new_email: new_email, 
-		new_email_confirmation: new_email_confirm, session: session }, host
-	end
-
-	private
-
-	def send_request method, path='/', params={}, host= UserMgmt.external_database_URI
-		path = path.to_s.downcase
-		path = '/' << path unless path.start_with? '/'
-		uri = URI.parse(host)
-		http = Net::HTTP.new(uri.host, uri.port)
-
-		case method.to_s.downcase
-			when 'get'
-			request = Net::HTTP::Get.new(uri.request_uri << path, initheader = {'Content-Type' =>'application/json'})
-			when 'post'
-			request = Net::HTTP::Post.new(uri.request_uri << path, initheader = {'Content-Type' =>'application/json'})
-			when 'put'
-			request = Net::HTTP::Put.new(uri.request_uri << path, initheader = {'Content-Type' =>'application/json'})
-			when 'delete'
-			request = Net::HTTP::Delete.new(uri.request_uri << path, initheader = {'Content-Type' =>'application/json'})
-		end
-
-		request.body = params.to_json
-		response = http.request(request)
-		begin
-			return { body: JSON.parse(response.body), status: response.code }
-		rescue
-			return { body: response.body, status: response.code }
-		end
-	end
-
-
   end
 end

data/app/controllers/user_mgmt/sessions_controller.rb

@@ -1,7 +1,9 @@
 require_dependency "user_mgmt/application_controller"
+require_dependency "user_mgmt/application_helper"
 
 module UserMgmt
   class SessionsController < ApplicationController
+    include ApplicationHelper
     
     # GET /user/log_in
     def new
@@ -14,8 +16,8 @@ module UserMgmt
         response = log_in *params[:user].values
       
         if response[:status] == "200"  
-            flash[:notice] = "User logged in!"
-            session[:user_session_id] = response[:body]["session"] 
+            flash[:success] = "User logged in!"
+            cookies.permanent[:user_session_id] = response[:body]["session"] 
             redirect_to main_app.root_path
         else 
             flash[:warning] = response[:body]
@@ -45,8 +47,8 @@ module UserMgmt
         # otherwise it means the user doesn't exist yet, so continue 
         # normaly (user will be asked for his email).
         if response[:status] == "200"
-            session[:user_session_id] = response[:body]["session"]
-            redirect_to main_app.root_path, notice: "User logged in!"
+            cookies.permanent[:user_session_id] = response[:body]["session"]
+            redirect_to main_app.root_path, flash: { success: "User logged in!" } 
         end
 
     end
@@ -58,23 +60,19 @@ module UserMgmt
 
         #if for some reason, the user couldn't be created
         if response[:status] == "400"
-            redirect_to sign_up_path, notice: response[:body]
+            redirect_to sign_up_path, flash: { warning: response[:body] }
+        else
+            response = log_in_oauth params["uid"], params["provider"].to_sym
+            cookies.permanent[:user_session_id] = response[:body]["session"]
+            redirect_to main_app.root_path, flash: { success: "User logged in!" }
         end
 
-        response = log_in_oauth params["uid"], params["provider"].to_sym
-
-        session[:user_session_id] = response[:body]["session"]
-
-        redirect_to main_app.root_path, notice: "User logged in!"
-
     end
 
     # GET /user/log_out
     def destroy
-
-        session[:user_session_id] = nil
-        redirect_to main_app.root_path, notice: "Logged out!"
-
+        cookies.delete(:user_session_id)
+        redirect_to main_app.root_path, flash: { success: "Logged out!" }
     end
 
   end

data/app/controllers/user_mgmt_controller.rb

@@ -0,0 +1,4 @@
+# All controllers are inherited from here.
+class UserMgmtController < UserMgmt.parent_controller.constantize
+
+end

data/app/helpers/user_mgmt/application_helper.rb

@@ -1,9 +1,102 @@
 module UserMgmt
-  module ApplicationHelper
+	module ApplicationHelper
 
-	def user_logged_in
-		session[:user_session_id] != nil
-	end
+		def user_logged_in?
+			cookies[:user_session_id] != nil
+		end
+
+		def current_user
+			@current_user ||= user_info(cookies[:user_session_id])[:body] if cookies[:user_session_id]
+		end
+
+		def sign_up email, password, password_confirmation, host=UserMgmt.external_database_URI
+			send_request :post, :users, { user: { email: email, password: password, 
+				password_confirmation: password_confirmation }, method: :simple }, host
+		end
+
+		def sign_up_oauth uid, strategy, email, host=UserMgmt.external_database_URI
+			send_request :post, :users, { user: { uid: uid, strategy: strategy, email: email }, method: :oauth }, host
+		end
+
+		def log_in email, password, host=UserMgmt.external_database_URI
+			send_request :get, :login, { user: { email: email, password: password }, method: :simple }, host
+		end
+
+		def log_in_oauth uid, strategy, host=UserMgmt.external_database_URI
+			send_request :get, :login, { user: { uid: uid, strategy: strategy }, method: :oauth }, host
+		end
+
+		def log_out umid, host=UserMgmt.external_database_URI
+			send_request :delete, :logout, { user: umid }, host
+		end
+
+		def user_info session, host=UserMgmt.external_database_URI
+			send_request :get, :user_info, { session_id: session }, host
+		end
+
+		def add_strategy uid, strategy, umid, session, host=UserMgmt.external_database_URI
+			send_request :post, :add_strategy, { new_strategy: { uid: uid, strategy: strategy }, 
+																					 user: umid, session_id: session }, host
+		end
+
+		def remove_strategy umid, strategy, session, host=UserMgmt.external_database_URI
+			send_request :delete, :remove_strategy, { user: umid, strategy: strategy, 
+																								session_id: session }, host
+		end
 
-  end
+		def delete_user umid, session, host=UserMgmt.external_database_URI
+			send_request :delete, :destroy, { user: umid, session_id: session }, host
+		end
+
+		def change_password user, password, new_pw, new_pw_confirm, session, host=UserMgmt.external_database_URI
+			send_request :put, :change_password, { user: user, password: password, 
+										new_password: new_pw, new_password_confirmation: new_pw_confirm, 
+										session: session }, host
+		end
+
+		def reset_password reset_token, new_pw, new_pw_confirm, host=UserMgmt.external_database_URI
+			send_request :put, :change_password, { reset_token: reset_token, new_password: new_pw, 
+										new_password_confirmation: new_pw_confirm }, host
+		end
+
+		def reset_password_request email, host=UserMgmt.external_database_URI
+			send_request :post, :reset_password, { email: email }, host
+		end
+
+		def change_email user, password, new_email, new_email_confirm, session, host=UserMgmt.external_database_URI
+			send_request :put, :change_email, { email: user, password: password, new_email: new_email, 
+										new_email_confirmation: new_email_confirm, session: session }, host
+		end
+
+		private
+
+			def send_request method, path='/', params={}, host=UserMgmt.external_database_URI
+				path = path.to_s.downcase
+				path = '/' << path unless path.start_with? '/'
+				uri = URI.parse(host)
+				http = Net::HTTP.new(uri.host, uri.port)
+
+				case method.to_s.downcase
+					when 'get'
+					request = Net::HTTP::Get.new(uri.request_uri << path, initheader = {'Content-Type' =>'application/json'})
+					when 'post'
+					request = Net::HTTP::Post.new(uri.request_uri << path, initheader = {'Content-Type' =>'application/json'})
+					when 'put'
+					request = Net::HTTP::Put.new(uri.request_uri << path, initheader = {'Content-Type' =>'application/json'})
+					when 'delete'
+					request = Net::HTTP::Delete.new(uri.request_uri << path, initheader = {'Content-Type' =>'application/json'})
+				end
+
+				request.body = params.to_json
+				response = http.request(request)
+				begin
+					r = { body: JSON.parse(response.body), status: response.code }
+					return r
+				rescue
+					r = { body: response.body, status: response.code }
+					return r
+				end
+			end
+
+	end
 end

data/app/views/layouts/user_mgmt/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>UserMgmt</title>
+  <%= stylesheet_link_tag    "user_mgmt/application", media: "all" %>
+  <%= javascript_include_tag "user_mgmt/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

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

@@ -3,6 +3,7 @@
     %h2 Sign up
     = render :partial => 'user_form'
     = submit_tag 'submit', :class => "btn btn-large btn-primary"
+    = link_to 'cancel', cancel_path, :class => "btn btn-large btn-primary"
     %ul.unstyled 
       %li 
       = link_to "Log in with Facebook", "auth/facebook" 

data/config/routes.rb

@@ -10,7 +10,7 @@ UserMgmt::Engine.routes.draw do
   post '/' => 'registrations#create', as: 'user'
 
   get 'auth/:provider/callback' => 'sessions#oauth_email', as: 'oauth_email'
-  get 'auth/failure' => 'application#main_page'
+  get 'auth/failure' => 'application#main_page', as: 'cancel'
 
 
 end

data/lib/user_mgmt/configurator.rb

@@ -0,0 +1,8 @@
+# module UserMgmt
+	
+
+# 	class Configurator
+
+# 		def
+
+# end

data/lib/user_mgmt/version.rb

@@ -1,3 +1,3 @@
 module UserMgmt
-  VERSION = "0.0.621"
+  VERSION = "0.1.0"
 end

data/test/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
+  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>