Merge pull request #326 from scouttyg/kandan-270

Fixed current user list not being updated when user logs in

app/models/user.rb

@@ -9,6 +9,8 @@ class User < ActiveRecord::Base
 
   has_many :activities
   before_save :ensure_gravatar_hash
+  before_save :ensure_authentication_token
+
   before_create :mark_registration_status_depending_on_app_settings
 
   after_create :ensure_at_least_one_admin
@@ -41,6 +43,12 @@ def ensure_gravatar_hash
     self.gravatar_hash = Digest::MD5.hexdigest self.email
   end
 
+  def ensure_authentication_token
+    if self.authentication_token.blank?
+      self.authentication_token = generate_authentication_token
+    end
+  end
+
   # We never want an app without an admin so let's ensure there is at least one user
   def ensure_at_least_one_admin
     if User.count == 1
@@ -120,4 +128,12 @@ def check_external_avatar
     end
   end
 
+  private
+    def generate_authentication_token
+      loop do
+        token = Devise.friendly_token
+        break token unless User.where(authentication_token: token).first
+      end
+    end
+
 end

db/migrate/20140409193213_fix_authentication_tokens.rb

@@ -0,0 +1,7 @@
+class FixAuthenticationTokens < ActiveRecord::Migration
+  def change
+    User.all.each do |user|
+      user.save!
+    end
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130623202749) do
+ActiveRecord::Schema.define(:version => 20140409193213) do
 
   create_table "activities", :force => true do |t|
     t.text     "content"