kete_browserid 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/config/locales/en.yml

@@ -20,6 +20,7 @@ en:
     login_via_browserid:
       logged_in: "{{t.account_controller.login.logged_in}}"
       no_account_matches: "We don't have an account matching your {{t.base.browserid}} login yet. Please sign up."
+      not_yet_activated: "This {{t.base.account}} has not been {{t.base.activated}} yet. You should receive an {{t.base.email}} when it has been. After that you will be able to {{t.base.login}}."
     signup_as_browserid:
       signed_up_login_with_browserid: "{{t.base.thank_you}}! Now that your signup is complete, you may now {{t.base.login}}."
   application_helper:

data/kete_browserid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kete_browserid}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Walter McGinnis"]
-  s.date = %q{2012-06-13}
+  s.date = %q{2012-06-20}
   s.description = %q{An add-on for Kete (http://kete.net.nz) that replaces normal login with a browserid based login.}
   s.email = %q{walter@katipo.co.nz}
   s.extra_rdoc_files = [

data/lib/kete_browserid/extensions/controllers/account_controller.rb

@@ -25,13 +25,23 @@ AccountController.class_eval do
     @user = User.find_by_email(browserid_email)
 
     if @user
-      self.current_user = @user
-      move_session_searches_to_current_user
-      flash[:notice] = t('account_controller.login_via_browserid.logged_in')
-      redirect_back_or_default({ :locale => current_user.locale,
-                                 :urlified_name => @site_basket.urlified_name,
-                                 :controller => 'account',
-                                 :action => 'index' }, current_user.locale)
+      # make sure the user has been activated before logging them in
+      if @user.activated_at.blank?
+        flash[:notice] = t('account_controller.login_via_browserid.not_yet_activated')
+        redirect_back_or_default({ :locale => I18n.locale,
+                                   :urlified_name => @current_basket.urlified_name,
+                                   :controller => 'account',
+                                   :action => 'index' }, I18n.locale)
+        
+      else
+        self.current_user = @user
+        move_session_searches_to_current_user
+        flash[:notice] = t('account_controller.login_via_browserid.logged_in')
+        redirect_back_or_default({ :locale => current_user.locale,
+                                   :urlified_name => @current_basket.urlified_name,
+                                   :controller => 'account',
+                                   :action => 'index' }, current_user.locale)
+      end
     else
       flash[:notice] = t('account_controller.login_via_browserid.no_account_matches')
       redirect_to :action => :signup_as_browserid, :email => browserid_email
@@ -86,7 +96,7 @@ AccountController.class_eval do
     flash[:notice] = t('account_controller.signup_as_browserid.signed_up_login_with_browserid')
     
     redirect_back_or_default({ :locale => params[:user][:locale],
-                               :urlified_name => @site_basket.urlified_name,
+                               :urlified_name => @current_basket.urlified_name,
                                :controller => 'account',
                                :action => 'index' })
   rescue ActiveRecord::RecordInvalid

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kete_browserid
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Walter McGinnis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-13 00:00:00 +12:00
+date: 2012-06-20 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency