team-alpha/railsgoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

assigned a user id, does not "appear" to have screwed anything up

Browse Source
This commit is contained in:
Ken Johnson
2013-05-24 15:25:06 -04:00
parent 383835d57d
commit 0d841124f5
13 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin_controller.rb
+1 -1
View File
@@ -31,7 +31,7 @@ class AdminController < ApplicationController
def delete_user
user = User.find_by_id(params[:admin_id])
if user && !(current_user.id == user.id)
if user && !(current_user.user_id == user.user_id)
user.delete
message = true
end
app/controllers/application_controller.rb
+1 -1
View File
@@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base
private
def current_user
@current_user ||= User.find_by_id(session[:id].to_s)
@current_user ||= User.find_by_user_id(session[:user_id].to_s)
end
def authenticated
app/controllers/sessions_controller.rb
+1 -1
View File
@@ -15,7 +15,7 @@ class SessionsController < ApplicationController
end
if user
session[:id] = user.id if User.where(:id => user.id).exists?
session[:user_id] = user.user_id if User.where(:user_id => user.user_id).exists?
redirect_to home_dashboard_index_path
else
# Removed this code, just doesn't seem specific enough!
app/controllers/users_controller.rb
+3 -2
View File
@@ -9,7 +9,7 @@ class UsersController < ApplicationController
def create
user = User.new(params[:user])
if user.save
session[:id] = user.id
session[:user_id] = user.user_id
redirect_to home_dashboard_index_path
else
@user = user
@@ -22,11 +22,12 @@ class UsersController < ApplicationController
end
def update
current_user.skip_user_id_assign = true
current_user.update_attributes(params[:user].reject { |k| k == ("password" || "password_confirmation") })
pass = params[:user][:password]
current_user.password = pass if !(pass.blank?)
current_user.save!
redirect_to user_account_settings_path(:user_id => current_user.id)
redirect_to user_account_settings_path(:user_id => current_user.user_id)
end
end
app/models/user.rb
+11
View File
@@ -8,6 +8,9 @@ class User < ActiveRecord::Base
validates_presence_of :email
validates_uniqueness_of :email
validates_format_of :email, :with => /.+@.+\..+/i
attr_accessor :skip_user_id_assign
before_save :assign_user_id, :on => :create
def self.authenticate(email, password)
@@ -26,4 +29,12 @@ class User < ActiveRecord::Base
return auth
end
def assign_user_id
unless @skip_user_id_assign.present?
user = User.order("user_id").last
uid = user.user_id.to_i + 1 if user && user.user_id && !(User.exists?(:user_id => "#{user.user_id.to_i + 1}"))
self.user_id = uid.to_s if uid
end
end
end
app/views/admin/dashboard.html.erb
+1 -1
View File
@@ -59,7 +59,7 @@ function makeActive(){
};
function loadTable(){
$("#userDataTable").load("/admin/"+ <%=current_user.id %> + "/get_all_users")
$("#userDataTable").load("/admin/"+ <%=current_user.user_id %> + "/get_all_users")
};
$(document).ready(
app/views/layouts/admin/_get_user.html.erb
+2 -2
View File
@@ -65,7 +65,7 @@ $('#submit_button').click(function() {
$("#editAcct").modal('hide');
$.ajax({
url: "/admin/" + <%= @user.id %> + "/update_user.json",
url: "/admin/" + <%= @user.user_id %> + "/update_user.json",
data: valuesToSubmit,
type: "POST",
success: function(response) {
@@ -83,7 +83,7 @@ $('#delete_button').click(function() {
$("#editAcct").modal('hide');
$.ajax({
url: "/admin/" + <%= @user.id %> + "/delete_user.json",
url: "/admin/" + <%= @user.user_id %> + "/delete_user.json",
type: "POST",
success: function(response) {
$('#success').show(500).delay(1500).fadeOut();
app/views/layouts/shared/_header.html.erb
+1 -1
View File
@@ -11,7 +11,7 @@
<span class="caret"></span>
<ul class="dropdown-menu pull-right">
<li>
<%= link_to "account settings", user_account_settings_path(:user_id => current_user.id) %>
<%= link_to "account settings", user_account_settings_path(:user_id => current_user.user_id) %>
</li>
<li>
<%= link_to "logout", logout_path %>
app/views/layouts/shared/_sidebar.html.erb
+1 -1
View File
@@ -10,7 +10,7 @@
</li>
<% if is_admin? %>
<li id='admin'>
<%= link_to admin_dashboard_path(:admin_id => current_user.id) do %>
<%= link_to admin_dashboard_path(:admin_id => current_user.user_id) do %>
<div class="icon">
<span class="fs1" aria-hidden="true" data-icon="&#xe1c8;"></span>
</div>
app/views/layouts/tutorial/broken_auth_sess/_user_pass_enum.html.erb
+2 -2
View File
@@ -64,7 +64,7 @@
end
if user
session[:id] = user.id if User.where(:id => user.id).exists?
session[:user_id] = user.user_id if User.where(:user_id => user.user_id).exists?
redirect_to home_dashboard_index_path
else
flash[:error] = e.message
@@ -103,7 +103,7 @@
end
if user
session[:id] = user.id if User.where(:id => user.id).exists?
session[:user_id] = user.user_id if User.where(:user_id => user.user_id).exists?
redirect_to home_dashboard_index_path
else
flash[:error] = "Either your username and password is incorrect" #e.message
db/migrate/20130424220355_create_users.rb
+1
View File
@@ -6,6 +6,7 @@ class CreateUsers < ActiveRecord::Migration
t.boolean :admin
t.string :first_name
t.string :last_name
t.string :user_id
t.timestamps
end
db/schema.rb
+1
View File
@@ -19,6 +19,7 @@ ActiveRecord::Schema.define(:version => 20130424220355) do
t.boolean "admin"
t.string "first_name"
t.string "last_name"
t.string "user_id"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end
db/seeds.rb
+5 -5
View File
@@ -4,11 +4,11 @@
users = [
{:email => "admin@metacorp.com", :admin => true, :password => "admin1234", :first_name => "Admin", :last_name => ""},
{:email => "jack@metacorp.com", :admin => false, :password => "yankeessuck", :first_name => "Jack", :last_name => "Mannino"},
{:email => "jim@metacorp.com", :admin => false, :password => "alohaowasp", :first_name => "Jim", :last_name => "Manico"},
{:email => "mike@metacorp.com", :admin => false, :password => "motorcross1445", :first_name => "Mike", :last_name => "McCabe"},
{:email => "ken@metacorp.com", :admin => false, :password => "citrusblend", :first_name => "Ken", :last_name => "Johnson"}
{:email => "admin@metacorp.com", :admin => true, :password => "admin1234", :first_name => "Admin", :last_name => "", :user_id =>1 },
{:email => "jack@metacorp.com", :admin => false, :password => "yankeessuck", :first_name => "Jack", :last_name => "Mannino", :user_id => 2},
{:email => "jim@metacorp.com", :admin => false, :password => "alohaowasp", :first_name => "Jim", :last_name => "Manico", :user_id =>3 },
{:email => "mike@metacorp.com", :admin => false, :password => "motorcross1445", :first_name => "Mike", :last_name => "McCabe", :user_id =>4 },
{:email => "ken@metacorp.com", :admin => false, :password => "citrusblend", :first_name => "Ken", :last_name => "Johnson", :user_id =>5 }
]