Merge branch 'master' of bitbucket.org:jamkazam/jam-web

app/assets/javascripts/jamkazam.js

@@ -65,7 +65,7 @@
         function loggedIn(header, payload) {
             app.clientId = payload.client_id;
             $.cookie('client_id', payload.client_id);
-            $.cookie('remember_token', payload.token);
+            // $.cookie('remember_token', payload.token); // removed per vrfs-273/403
 
             var heartbeatMS = payload.heartbeat_interval * 1000;
             logger.debug("jamkazam.js.loggedIn(): clientId now " + app.clientId + "; Setting up heartbeat every " + heartbeatMS + " MS");

app/controllers/sessions_controller.rb

@@ -13,6 +13,7 @@ class SessionsController < ApplicationController
       @login_error = true
       render 'new', :layout => "landing"
     else
+      @session_only_cookie = !jkclient_agent? && !params[:user].nil? && 0 == params[:user][:remember_me].to_i
       complete_sign_in user
     end
   end

app/helpers/sessions_helper.rb

@@ -6,7 +6,15 @@ module SessionsHelper
   end
 
   def set_remember_token(user)
-    cookies.permanent[:remember_token] = user.remember_token
+    if @session_only_cookie
+      cookies.delete(:remember_token)
+      cookies[:remember_token] = user.remember_token
+    else
+      cookies[:remember_token] = {
+        :value => user.remember_token,
+        :expires => 20.years.from_now.utc
+      }
+    end
   end
 
   def signed_in?
@@ -52,4 +60,9 @@ module SessionsHelper
   def store_location
     session[:return_to] = request.url
   end
+
+  def jkclient_agent?
+    request.env['HTTP_USER_AGENT'] =~ /JamKazam/
+  end
+
 end

app/views/sessions/new.html.erb

@@ -39,7 +39,8 @@
                 <fieldset name="signin-options">
                     <script type="text/javascript">
                       if(window.jamClient === undefined) {
-                          document.write('<small><input type="checkbox" class="keep-logged-in"> Keep me logged in</small>');
+		          document.write('<input name="user[remember_me]" type="hidden" value="0">');
+                          document.write('<small><input type="checkbox" class="keep-logged-in" value="1" name="user[remember_me]" id="user_remember_me" checked> Keep me logged in</small>');
                       }
                     </script>
                  </fieldset>