appoxy_sessions 0.0.5 → 0.0.6

data/lib/appoxy_sessions.rb

@@ -2,4 +2,5 @@ require 'simple_record'
 require File.join(File.dirname(__FILE__), "sessions", "user")
 require File.join(File.dirname(__FILE__), "sessions", "application_controller")
 require File.join(File.dirname(__FILE__), "sessions", "sessions_controller")
+require File.join(File.dirname(__FILE__), "sessions", "users_controller")
 

data/lib/sessions/application_controller.rb

@@ -9,11 +9,6 @@ module Appoxy
                 session[:user_id] = nil # keeps the session but kill our variable
             end
 
-            def logout
-                @current_user = nil 
-                reset_session
-            end
-
 
             def logged_in?
                 #puts 'logged_in??'

data/lib/sessions/sessions_controller.rb

@@ -47,6 +47,7 @@ module Appoxy
 
 
             def reset_password
+                before_reset_password
 
                 unless verify_recaptcha
                     flash[:error] = "You are not human! Please try again."
@@ -61,31 +62,45 @@ module Appoxy
                     return
                 end
 
-                @user = User.find_by_email(@email)
+                @user = ::User.find_by_email(@email)
                 unless @user
                     flash[:error] = "Email not found."
                     render :action=>"forgot_password"
                     return
                 end
 
-                newpass = random_string(8)
+                @newpass = random_string(8)
 
-                @user.password = newpass
+                @user.password = @newpass
                 @user.save(:dirty=>true)
 
-                Mailer.deliver_reset_password(@user, newpass)
-
                 flash[:success] = "Password reset. You should receive an email shortly with a new password."
                 redirect_to :action=>"new"
 
+                after_reset_password
+            end
+
+            def before_reset_password
+
+            end
+
+            # This is a great spot to send an email with the new password (the only spot actually).
+            def after_reset_password
+
             end
 
             def destroy
                 logout
+            end
+
+            def logout
+                @current_user = nil
+                reset_session
                 flash[:info] = "You have been logged out."
                 redirect_to('/')
             end
 
+
         end
     end
 end

data/lib/sessions/user.rb

@@ -5,7 +5,7 @@ module Appoxy
         class User < SimpleRecord::Base
 
             def self.included(base)
-                puts self.class.name + " included in " + base.class.name
+#                puts self.class.name + " included in " + base.class.name
             end
 
 
@@ -37,19 +37,29 @@ module Appoxy
 
 
             def is_active?
-                true#activation_code == nil
+                status == "active"
             end
 
 
+
+            def set_activation_code
+                self.activation_code=Digest::SHA1.hexdigest(email.to_s+Time.now.to_s)
+            end
+
+
+            def activate!
+                self.activation_code=nil
+                self.status = "active"
+                self.save(:dirty=>true)
+            end
+
+
+
             def authenticate(password)
-                #RAILS_DEFAULT_LOGGER.info "-------authenticating password------"
 
-#                u = self.find :first, :conditions => ["email = ?", email]
-#                return nil unless u
-                return nil unless is_active?
-                return nil if attributes["password"].nil? # if the user has no password (will this happen?  maybe for invites...)
+                return nil if attributes["password"].blank? # if the user has no password (will this happen?  maybe for invites...)
 
-                # This is a normal unencrypted password
+                # This is a normal unencrypted password, temporary
                 if attributes["password"][0].length < 100
                     self.password = attributes["password"][0]
                     self.save

data/lib/sessions/users_controller.rb

@@ -1,19 +1,115 @@
 module Appoxy
 
     module Sessions
-        module SessionsController
+        module UsersController
 
 
             def new
-
+                before_new
+                puts 'NEW YO'
                 @user = User.new
                 @user.email = params[:email] if params[:email]
                 @user.activation_code = params[:ac]
+                after_new
+            end
+
+            def before_new
+
+            end
+
+            def after_new
+
+            end
+
+            def create
+
+                before_create
+
+                @user = ::User.new(params[:user])
+
+                existing_user = ::User.find_by_email(@user.email)
+
+                if existing_user
+                    if params[: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!
+                            existing_user.password = @user.password
+                            @user = existing_user
+                        end
+                    else
+                        flash[:error] = "The email you entered already exists in our system. You might want to try logging in if you already have an account."
+                        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
+                end
+
+                @user.status = "active"
+
+                before_save_in_create
+                if @user.save
+                    self.current_user = @user
+                    flash[:success] = "Your account was created successfully."
+                    after_save_in_create
+                else
+                    render :action => "new"
+                end
+                after_create
 
             end
 
+            def before_create
+
+            end
+
+            def before_save_in_create
+
+            end
+
+            def after_save_in_create
+
+            end
+
+            def after_create
+
+            end
+
+
+            # Usually a user gets here via an activation link in email.
+            def activate
+                logout_keeping_session!
+                # todo: find by email or user_id AND activation code
+                @user = ::User.find_by_activation_code(params[:activation_code]) unless params[:activation_code].blank?
+                case
+                    when params[:activation_code].present? && @user && !@user.is_active?
+                        @user.activate!
+                        flash[:success] = "Account activated. please login."
+                        redirect_to login_url
+                    when params[:activation_code].blank?
+                        flash[:error] = "The activation code was missing.  Please follow the URL from your email."
+                        redirect_to(root_url)
+                    else
+                        flash[:error] = "We couldn't find a user with that activation code -- check your email? Or maybe you've already activated -- try signing in."
+                        redirect_to(root_url)
+                end
+            end
+
         end
 
+
     end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appoxy_sessions
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Travis Reeder