Move things around between users and sessions

30 files changed, 32 insertions, 19 deletions

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 2f72bf7..7df8a9a 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -69,6 +69,6 @@ class SessionsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def session_params
-      params.require(:session).permit(:user_id)
+      params.require(:session).permit(:user_id, :token)
     end
 end
diff --git a/app/views/sessions/_form.html.erb b/app/views/sessions/_form.html.erb
index 1b94e77..90ad0ad 100644
--- a/app/views/sessions/_form.html.erb
+++ b/app/views/sessions/_form.html.erb
@@ -15,6 +15,10 @@
     <%= f.label :user_id %><br>
     <%= f.text_field :user_id %>
   </div>
+  <div class="field">
+    <%= f.label :token %><br>
+    <%= f.text_field :token %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>
diff --git a/app/views/sessions/index.html.erb b/app/views/sessions/index.html.erb
index 707a47d..43a7e1f 100644
--- a/app/views/sessions/index.html.erb
+++ b/app/views/sessions/index.html.erb
@@ -4,6 +4,7 @@
   <thead>
     <tr>
       <th>User</th>
+      <th>Token</th>
       <th></th>
       <th></th>
       <th></th>
@@ -14,6 +15,7 @@
     <% @sessions.each do |session| %>
       <tr>
         <td><%= session.user %></td>
+        <td><%= session.token %></td>
         <td><%= link_to 'Show', session %></td>
         <td><%= link_to 'Edit', edit_session_path(session) %></td>
         <td><%= link_to 'Destroy', session, method: :delete, data: { confirm: 'Are you sure?' } %></td>
diff --git a/app/views/sessions/index.json.jbuilder b/app/views/sessions/index.json.jbuilder
index 18fd4fa..5205ede 100644
--- a/app/views/sessions/index.json.jbuilder
+++ b/app/views/sessions/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@sessions) do |session|
-  json.extract! session, :id, :user_id
+  json.extract! session, :id, :user_id, :token
   json.url session_url(session, format: :json)
 end
diff --git a/app/views/sessions/show.html.erb b/app/views/sessions/show.html.erb
index 5176869..230e6bd 100644
--- a/app/views/sessions/show.html.erb
+++ b/app/views/sessions/show.html.erb
@@ -5,5 +5,10 @@
   <%= @session.user %>
 </p>
 
+<p>
+  <strong>Token:</strong>
+  <%= @session.token %>
+</p>
+
 <%= link_to 'Edit', edit_session_path(@session) %> |
 <%= link_to 'Back', sessions_path %>
diff --git a/app/views/sessions/show.json.jbuilder b/app/views/sessions/show.json.jbuilder
index 4ebf936..c9efd3b 100644
--- a/app/views/sessions/show.json.jbuilder
+++ b/app/views/sessions/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @session, :id, :user_id, :created_at, :updated_at
+json.extract! @session, :id, :user_id, :token, :created_at, :updated_at
diff --git a/db/migrate/20140402152924_add_hidden_attrs_to_user.rb b/db/migrate/20140402152924_add_hidden_attrs_to_user.rb
deleted file mode 100644
index 2f1b0b2..0000000
--- a/db/migrate/20140402152924_add_hidden_attrs_to_user.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class AddHiddenAttrsToUser < ActiveRecord::Migration
-  def change
-    add_column :users, :password_digest, :string
-    add_column :users, :remember_token, :string
-    add_index :users, :remember_token, unique: true
-    add_column :users, :groups, :integer
-  end
-end
diff --git a/db/migrate/20140402152830_create_servers.rb b/db/migrate/20140403151738_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140402152830_create_servers.rb
+++ b/db/migrate/20140403151738_create_servers.rb
diff --git a/db/migrate/20140402152832_create_matches.rb b/db/migrate/20140403151741_create_matches.rb
index 31eea12..31eea12 100644
--- a/db/migrate/20140402152832_create_matches.rb
+++ b/db/migrate/20140403151741_create_matches.rb
diff --git a/db/migrate/20140402152835_create_teams.rb b/db/migrate/20140403151743_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140402152835_create_teams.rb
+++ b/db/migrate/20140403151743_create_teams.rb
diff --git a/db/migrate/20140402152837_create_alerts.rb b/db/migrate/20140403151746_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140402152837_create_alerts.rb
+++ b/db/migrate/20140403151746_create_alerts.rb
diff --git a/db/migrate/20140402152840_create_pms.rb b/db/migrate/20140403151749_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140402152840_create_pms.rb
+++ b/db/migrate/20140403151749_create_pms.rb
diff --git a/db/migrate/20140402152842_create_tournaments.rb b/db/migrate/20140403151751_create_tournaments.rb
index c0d8929..c0d8929 100644
--- a/db/migrate/20140402152842_create_tournaments.rb
+++ b/db/migrate/20140403151751_create_tournaments.rb
diff --git a/db/migrate/20140402152845_create_games.rb b/db/migrate/20140403151753_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140402152845_create_games.rb
+++ b/db/migrate/20140403151753_create_games.rb
diff --git a/db/migrate/20140402152847_create_users.rb b/db/migrate/20140403151756_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140402152847_create_users.rb
+++ b/db/migrate/20140403151756_create_users.rb
diff --git a/db/migrate/20140402152850_create_sessions.rb b/db/migrate/20140403151758_create_sessions.rb
index fe25bf2..f667f1e 100644
--- a/db/migrate/20140402152850_create_sessions.rb
+++ b/db/migrate/20140403151758_create_sessions.rb
@@ -2,8 +2,10 @@ class CreateSessions < ActiveRecord::Migration
   def change
     create_table :sessions do |t|
       t.references :user, index: true
+      t.string :token
 
       t.timestamps
     end
+    add_index :sessions, :token, unique: true
   end
 end
diff --git a/db/migrate/20140402152852_create_remote_usernames.rb b/db/migrate/20140403151801_create_remote_usernames.rb
index b837e53..b837e53 100644
--- a/db/migrate/20140402152852_create_remote_usernames.rb
+++ b/db/migrate/20140403151801_create_remote_usernames.rb
diff --git a/db/migrate/20140402152855_create_server_settings.rb b/db/migrate/20140403151803_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140402152855_create_server_settings.rb
+++ b/db/migrate/20140403151803_create_server_settings.rb
diff --git a/db/migrate/20140402152857_create_game_settings.rb b/db/migrate/20140403151806_create_game_settings.rb
index 0ebbf18..0ebbf18 100644
--- a/db/migrate/20140402152857_create_game_settings.rb
+++ b/db/migrate/20140403151806_create_game_settings.rb
diff --git a/db/migrate/20140402152900_create_tournament_preferences.rb b/db/migrate/20140403151808_create_tournament_preferences.rb
index 991d659..991d659 100644
--- a/db/migrate/20140402152900_create_tournament_preferences.rb
+++ b/db/migrate/20140403151808_create_tournament_preferences.rb
diff --git a/db/migrate/20140402152902_create_scores.rb b/db/migrate/20140403151811_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140402152902_create_scores.rb
+++ b/db/migrate/20140403151811_create_scores.rb
diff --git a/db/migrate/20140402152907_create_tournament_players_join_table.rb b/db/migrate/20140403151815_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140402152907_create_tournament_players_join_table.rb
+++ b/db/migrate/20140403151815_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140402152909_create_tournament_hosts_join_table.rb b/db/migrate/20140403151818_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140402152909_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140403151818_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140402152912_create_team_user_join_table.rb b/db/migrate/20140403151820_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140402152912_create_team_user_join_table.rb
+++ b/db/migrate/20140403151820_create_team_user_join_table.rb
diff --git a/db/migrate/20140402152914_create_match_team_join_table.rb b/db/migrate/20140403151823_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140402152914_create_match_team_join_table.rb
+++ b/db/migrate/20140403151823_create_match_team_join_table.rb
diff --git a/db/migrate/20140403151832_add_hidden_attrs_to_user.rb b/db/migrate/20140403151832_add_hidden_attrs_to_user.rb
new file mode 100644
index 0000000..9b5c505
--- /dev/null
+++ b/db/migrate/20140403151832_add_hidden_attrs_to_user.rb
@@ -0,0 +1,6 @@
+class AddHiddenAttrsToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :password_digest, :string
+    add_column :users, :permissions, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 846d2e6..3a87bad 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140402152924) do
+ActiveRecord::Schema.define(version: 20140403151832) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -121,10 +121,12 @@ ActiveRecord::Schema.define(version: 20140402152924) do
 
   create_table "sessions", force: true do |t|
     t.integer  "user_id"
+    t.string   "token"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  add_index "sessions", ["token"], name: "index_sessions_on_token", unique: true
   add_index "sessions", ["user_id"], name: "index_sessions_on_user_id"
 
   create_table "teams", force: true do |t|
@@ -174,12 +176,10 @@ ActiveRecord::Schema.define(version: 20140402152924) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "password_digest"
-    t.string   "remember_token"
-    t.integer  "groups"
+    t.integer  "permissions"
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["remember_token"], name: "index_users_on_remember_token", unique: true
   add_index "users", ["user_name"], name: "index_users_on_user_name", unique: true
 
 end
diff --git a/generate.sh b/generate.sh
index 8fc3368..d960a56 100755
--- a/generate.sh
+++ b/generate.sh
@@ -32,7 +32,7 @@ bundle exec rails generate scaffold game \
 	min_teams_per_match:integer max_teams_per_match:integer \
 	set_rounds:integer randomized_teams:boolean
 bundle exec rails generate scaffold user name:string email:string:uniq user_name:string:uniq
-bundle exec rails generate scaffold session user:references
+bundle exec rails generate scaffold session user:references token:string:uniq
 bundle exec rails generate scaffold remote_username game:references user:references user_name:string
 
 # Just models
@@ -56,7 +56,7 @@ bundle exec rails generate controller static $NOTEST
 # Migrations
 # By having these separate from the original 'generate', it makes it
 # not stick these in the views or anything.
-bundle exec rails generate migration AddHiddenAttrsToUser password_digest:string remember_token:string:uniq groups:integer
+bundle exec rails generate migration AddHiddenAttrsToUser password_digest:string permissions:integer
 
 #for the tournament controller to generate options
 #bundle exec rails generate scaffold
diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
index a5cc8cb..a144bf8 100644
--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -18,7 +18,7 @@ class SessionsControllerTest < ActionController::TestCase
 
   test "should create session" do
     assert_difference('Session.count') do
-      post :create, session: { user_id: @session.user_id }
+      post :create, session: { token: @session.token, user_id: @session.user_id }
     end
 
     assert_redirected_to session_path(assigns(:session))
@@ -35,7 +35,7 @@ class SessionsControllerTest < ActionController::TestCase
   end
 
   test "should update session" do
-    patch :update, id: @session, session: { user_id: @session.user_id }
+    patch :update, id: @session, session: { token: @session.token, user_id: @session.user_id }
     assert_redirected_to session_path(assigns(:session))
   end
 
diff --git a/test/fixtures/sessions.yml b/test/fixtures/sessions.yml
index d9098d9..aea4379 100644
--- a/test/fixtures/sessions.yml
+++ b/test/fixtures/sessions.yml
@@ -2,6 +2,8 @@
 
 one:
   user_id: 
+  token: MyString
 
 two:
   user_id: 
+  token: MyString