appoxy_sessions 0.0.13 → 0.0.14

data/lib/sessions/application_controller.rb

@@ -52,15 +52,16 @@ module Appoxy
                 if !logged_in?
                     flash[:warning] = "You need to login to access this page."
                     session[:return_to] = request.request_uri # return to after logging in
-                    puts "ac=" + params[:activation_code].inspect
-                    if params[:uid] && params[:activation_code]
+                    puts "ac=" + params[:ac].inspect
+                    if params[:user_id] && params[:ac]
                         # then from an invite
-                        user = User.find(params[:uid])
-                        # this the best way to decide of user has not logged in? Could also check status.
-                        redirect_to :controller=>"users", :action=>"new", :email=>user.email, :activation_code=>params[:activation_code] and return if user.password.blank?
-
+                        user = ::User.find(params[:user_id])
+                        if user && user.password.blank? # this the best way to decide of user has not logged in? Could also check status.
+                            redirect_to :controller=>"users", :action=>"new", :email=>user.email, :ac=>params[:ac]
+                            return
+                        end
                     end
-                    redirect_to :controller=>"sessions", :action=>"new", :activation_code=>params[:activation_code]
+                    redirect_to :controller=>"sessions", :action=>"new", :ac=>params[:ac]
                 end
 
                 after_authenticate

data/lib/sessions/sessions_controller.rb

@@ -3,6 +3,10 @@ module Appoxy
     module Sessions
         module SessionsController
 
+            def new
+                
+            end
+
             def create
                 before_create
 

data/lib/sessions/users_controller.rb

@@ -27,10 +27,22 @@ module Appoxy
 
                 @user = ::User.new(params[:user])
 
+                if @user.password != params[:password_confirmation]
+                    flash[:error] = "Confirmation password does not match. Please try again."
+                    render :action=>"new"
+                    return
+                end
+
+                if params[:user][:password].length < 6
+                    flash[:error] = "Password can not be less than 6 characters."
+                    render :action=>"new"
+                    return
+                end
+
                 existing_user = ::User.find_by_email(@user.email)
 
                 if existing_user
-                    if params[:activation_code].present?
+                    if @user.activation_code.present?
                         # hasn't logged in yet, probably invited, need to check access key
                         if existing_user.activation_code == @user.activation_code
                             existing_user.activate!
@@ -42,23 +54,10 @@ module Appoxy
                         render :action=>"new"
                         return
                     end
-
-                end
-
-                if @user.password != params[:password_confirmation]
-                    flash[:error] = "Confirmation password does not match. Please try again."
-                    render :action=>"new"
-                    return
-                end
-
-                if params[:user][:password].length < 6
-                    flash[:error] = "Password can not be less than 6 characters."
-                    render :action=>"new"
-                    return
+                else
+                    @user.status = "active"
                 end
 
-                @user.status = "active"
-
                 before_save_in_create
                 if @user.save
                     self.current_user = @user
@@ -91,13 +90,13 @@ module Appoxy
             # Usually a user gets here via an activation link in email.
             def activate
                 logout_keeping_session!
-                @user = User.find_by_activation_code(params[:activation_code]) unless params[:activation_code].blank?
+                @user = User.find_by_activation_code(params[:ac]) unless params[:ac].blank?
                 case
-                    when (!params[:activation_code].blank?) && @user && !@user.is_active?
+                    when (!params[:ac].blank?) && @user && !@user.is_active?
                         flash[:info] = "Account activated. please login."
                         @user.activate!
                         redirect_to login_url
-                    when params[:activation_code].blank?
+                    when params[:ac].blank?
                         flash[:error] = "The activation code was missing.  Please follow the URL from your email."
                         redirect_to(root_url)
                     else

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Travis Reeder