appoxy_sessions 0.0.6 → 0.0.7

data/lib/sessions/application_controller.rb

@@ -41,7 +41,6 @@ module Appoxy
 
             protected
 
-            #
             def random_string(length=10)
                 chars = 'abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'
                 password = ''
@@ -49,6 +48,29 @@ module Appoxy
                 password
             end
 
+            def authenticate
+                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]
+                        # 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?
+
+                    end
+                    redirect_to :controller=>"users", :action=>"new", :activation_code=>params[:activation_code]
+                end
+
+                after_authenticate
+
+            end
+            def after_authenticate
+
+            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.name + " included in " + base.name
             end
 
 
@@ -50,7 +50,6 @@ module Appoxy
             def activate!
                 self.activation_code=nil
                 self.status = "active"
-                self.save(:dirty=>true)
             end
 
 

data/lib/sessions/users_controller.rb

@@ -64,10 +64,10 @@ module Appoxy
                     self.current_user = @user
                     flash[:success] = "Your account was created successfully."
                     after_save_in_create
+                    after_create
                 else
                     render :action => "new"
                 end
-                after_create
 
             end
 
@@ -91,12 +91,11 @@ module Appoxy
             # 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?
+                @user = User.find_by_activation_code(params[:activation_code]) unless params[:activation_code].blank?
                 case
-                    when params[:activation_code].present? && @user && !@user.is_active?
+                    when (!params[:activation_code].blank?) && @user && !@user.is_active?
+                        flash[:info] = "Account activated. please login."
                         @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."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appoxy_sessions
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Travis Reeder
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -08:00
+date: 2010-02-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency