Replaced broken session with working cookies

app/assets/javascripts/app/app.js

@@ -20,9 +20,11 @@
       ws.init();
       user.showFromSession(function(currentUser) {
         joined(currentUser, true);
-      }, function() {
+      }, function(preventApply) {
         vm.isReady = true;
-        $scope.$apply();
+        if (!preventApply) {
+          $scope.$apply();
+        }
       });
     }
     function currentMessageInit() {

app/assets/javascripts/app/app.module.js

@@ -2,6 +2,7 @@
   'use strict';
 
   module.exports = require('angular').module('app', [
+    require('angular-cookies'),
     require('./services/_index')
   ])
   .controller('AppController', require('./app'))

app/assets/javascripts/app/services/user.service.js

@@ -4,7 +4,7 @@
   module.exports = userService;
 
   /* @ngInject */
-  function userService(ws) {
+  function userService($cookies, ws) {
     // Values
 
     // Service
@@ -16,10 +16,21 @@
 
     // Functions
     function showFromSession(success, failure) {
-      return ws.trigger('users.show_from_session', {}, success, failure);
+      var currentUserId = $cookies.get('current_user_id');
+      if (currentUserId !== undefined) {
+        return ws.trigger('users.show', { id: currentUserId }, function(currentUser) {
+          $cookies.put('current_user_id', JSON.parse(currentUser).id);
+          success(currentUser);
+        }, failure);
+      } else {
+        return failure(true);
+      }
     }
     function showOrCreate(name, success, failure) {
-      return ws.trigger('users.show_or_create', { name: name }, success, failure);
+      return ws.trigger('users.show_or_create', { name: name }, function(currentUser) {
+        $cookies.put('current_user_id', JSON.parse(currentUser).id);
+        success(currentUser);
+      }, failure);
     }
   }
 })();

app/controllers/users_controller.rb

@@ -2,9 +2,9 @@ class UsersController < WebsocketRails::BaseController
   def initialize_session
   end
 
-  def show_from_session
-    if session.include?(:current_user_id) and User.exists?(session[:current_user_id])
-      trigger_success User.find(session[:current_user_id]).to_json
+  def show
+    if User.exists?(message[:id])
+      trigger_success User.find(message[:id]).to_json
     else
       trigger_failure
     end

config/events.rb

@@ -5,7 +5,7 @@
   end
 
   namespace :users do
-    subscribe :show_from_session, to: UsersController, with_method: :show_from_session
+    subscribe :show, to: UsersController, with_method: :show
     subscribe :show_or_create, to: UsersController, with_method: :show_or_create
   end
 end

package.json

@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "angular": "^1.4.7",
+    "angular-cookies": "^1.4.7",
     "browserify": "^11.2.0",
     "browserify-incremental": "^3.0.1",
     "browserify-ngannotate": "^1.0.1",