Convert file indentation to spaces
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
class AdminController < ApplicationController
|
||||
|
||||
before_filter :administrative, :if => :admin_param
|
||||
skip_before_filter :has_info
|
||||
|
||||
@@ -67,5 +66,4 @@ class AdminController < ApplicationController
|
||||
def admin_param
|
||||
params[:admin_id] != '1'
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
class Api::V1::MobileController < ApplicationController
|
||||
|
||||
skip_before_filter :authenticated
|
||||
before_filter :mobile_request?
|
||||
|
||||
@@ -30,5 +29,4 @@ class Api::V1::MobileController < ApplicationController
|
||||
request.user_agent =~ /ios|android/i
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -1,57 +1,54 @@
|
||||
class Api::V1::UsersController < ApplicationController
|
||||
skip_before_filter :authenticated
|
||||
before_filter :valid_api_token
|
||||
before_filter :extrapolate_user
|
||||
|
||||
skip_before_filter :authenticated
|
||||
before_filter :valid_api_token
|
||||
before_filter :extrapolate_user
|
||||
respond_to :json
|
||||
|
||||
respond_to :json
|
||||
def index
|
||||
# We removed the .as_json code from the model, just seemed like extra work.
|
||||
# dunno, maybe useful at a later time?
|
||||
#respond_with @user.admin ? User.all.as_json : @user.as_json
|
||||
respond_with @user.admin ? User.all : @user
|
||||
end
|
||||
|
||||
def index
|
||||
# We removed the .as_json code from the model, just seemed like extra work.
|
||||
# dunno, maybe useful at a later time?
|
||||
#respond_with @user.admin ? User.all.as_json : @user.as_json
|
||||
def show
|
||||
respond_with @user.as_json
|
||||
end
|
||||
|
||||
respond_with @user.admin ? User.all : @user
|
||||
end
|
||||
private
|
||||
|
||||
def show
|
||||
respond_with @user.as_json
|
||||
end
|
||||
def valid_api_token
|
||||
authenticate_or_request_with_http_token do |token, options|
|
||||
# TODO :add some functionality to check if the HTTP Header is valid
|
||||
identify_user(token)
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
def identify_user(token="")
|
||||
# We've had issues with URL encoding, etc. causing issues so just to be safe
|
||||
# we will go ahead and unescape the user's token
|
||||
unescape_token(token)
|
||||
@clean_token =~ /(.*?)-(.*)/
|
||||
id = $1
|
||||
hash = $2
|
||||
(id && hash) ? true : false
|
||||
check_hash(id, hash) ? true : false
|
||||
end
|
||||
|
||||
def valid_api_token
|
||||
authenticate_or_request_with_http_token do |token, options|
|
||||
# TODO :add some functionality to check if the HTTP Header is valid
|
||||
identify_user(token)
|
||||
end
|
||||
end
|
||||
def check_hash(id, hash)
|
||||
digest = OpenSSL::Digest::SHA1.hexdigest("#{ACCESS_TOKEN_SALT}:#{id}")
|
||||
hash == digest
|
||||
end
|
||||
|
||||
def identify_user(token="")
|
||||
# We've had issues with URL encoding, etc. causing issues so just to be safe
|
||||
# we will go ahead and unescape the user's token
|
||||
unescape_token(token)
|
||||
@clean_token =~ /(.*?)-(.*)/
|
||||
id = $1
|
||||
hash = $2
|
||||
(id && hash) ? true : false
|
||||
check_hash(id, hash) ? true : false
|
||||
end
|
||||
|
||||
def check_hash(id, hash)
|
||||
digest = OpenSSL::Digest::SHA1.hexdigest("#{ACCESS_TOKEN_SALT}:#{id}")
|
||||
hash == digest
|
||||
end
|
||||
|
||||
# We had some issues with the token and url encoding...
|
||||
# this is an attempt to normalize the data.
|
||||
def unescape_token(token="")
|
||||
@clean_token = CGI::unescape(token)
|
||||
end
|
||||
|
||||
# Added a method to make it easy to figure out who the user is.
|
||||
def extrapolate_user
|
||||
@user = User.find_by_id(@clean_token.split("-").first)
|
||||
end
|
||||
# We had some issues with the token and url encoding...
|
||||
# this is an attempt to normalize the data.
|
||||
def unescape_token(token="")
|
||||
@clean_token = CGI::unescape(token)
|
||||
end
|
||||
|
||||
# Added a method to make it easy to figure out who the user is.
|
||||
def extrapolate_user
|
||||
@user = User.find_by_id(@clean_token.split("-").first)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
class ApplicationController < ActionController::Base
|
||||
|
||||
before_filter :authenticated, :has_info, :create_analytic
|
||||
helper_method :current_user, :is_admin?, :sanitize_font
|
||||
|
||||
@@ -53,5 +52,4 @@ class ApplicationController < ActionController::Base
|
||||
css
|
||||
# css if css.match(/\A[0-9]+([\%]|pt)\z/)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -4,7 +4,6 @@ class BenefitFormsController < ApplicationController
|
||||
@benefits = Benefits.new
|
||||
end
|
||||
|
||||
|
||||
def download
|
||||
begin
|
||||
path = params[:name]
|
||||
@@ -26,7 +25,6 @@ class BenefitFormsController < ApplicationController
|
||||
redirect_to user_benefit_forms_path(:user_id => current_user.user_id)
|
||||
end
|
||||
|
||||
|
||||
=begin
|
||||
# More secure version
|
||||
def download
|
||||
@@ -47,6 +45,4 @@ class BenefitFormsController < ApplicationController
|
||||
end
|
||||
end
|
||||
=end
|
||||
|
||||
|
||||
end
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
class DashboardController < ApplicationController
|
||||
|
||||
skip_before_filter :has_info
|
||||
|
||||
def home
|
||||
@@ -10,5 +9,4 @@ class DashboardController < ApplicationController
|
||||
cookies[:font] = params[:font]
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -33,5 +33,4 @@ class MessagesController < ApplicationController
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
@@ -1,7 +1,6 @@
|
||||
class PasswordResetsController < ApplicationController
|
||||
skip_before_filter :authenticated
|
||||
|
||||
|
||||
def reset_password
|
||||
user = Marshal.load(Base64.decode64(params[:user])) unless params[:user].nil?
|
||||
|
||||
|
||||
@@ -39,5 +39,4 @@ class PayController < ApplicationController
|
||||
format.json {render :json => {:account_num => decrypted || "No Data" }}
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -3,5 +3,4 @@ class PerformanceController < ApplicationController
|
||||
def index
|
||||
@perf = current_user.performance
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -3,5 +3,4 @@ class RetirementController < ApplicationController
|
||||
def index
|
||||
@info = current_user.retirement
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
class ScheduleController < ApplicationController
|
||||
|
||||
def create
|
||||
message = false
|
||||
|
||||
@@ -55,5 +56,4 @@ class ScheduleController < ApplicationController
|
||||
end
|
||||
return vals
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -1,35 +1,34 @@
|
||||
class SessionsController < ApplicationController
|
||||
|
||||
skip_before_filter :has_info
|
||||
skip_before_filter :authenticated, :only => [:new, :create]
|
||||
|
||||
def new
|
||||
@url = params[:url]
|
||||
redirect_to home_dashboard_index_path if current_user
|
||||
@url = params[:url]
|
||||
redirect_to home_dashboard_index_path if current_user
|
||||
end
|
||||
|
||||
def create
|
||||
path = params[:url].present? ? params[:url] : home_dashboard_index_path
|
||||
begin
|
||||
# Normalize the email address, why not
|
||||
user = User.authenticate(params[:email].to_s.downcase, params[:password])
|
||||
# @url = params[:url]
|
||||
path = params[:url].present? ? params[:url] : home_dashboard_index_path
|
||||
begin
|
||||
# Normalize the email address, why not
|
||||
user = User.authenticate(params[:email].to_s.downcase, params[:password])
|
||||
# @url = params[:url]
|
||||
rescue Exception => e
|
||||
end
|
||||
end
|
||||
|
||||
if user
|
||||
if params[:remember_me]
|
||||
cookies.permanent[:auth_token] = user.auth_token if User.where(:user_id => user.user_id).exists?
|
||||
else
|
||||
session[:user_id] = user.user_id if User.where(:user_id => user.user_id).exists?
|
||||
end
|
||||
redirect_to path
|
||||
if user
|
||||
if params[:remember_me]
|
||||
cookies.permanent[:auth_token] = user.auth_token if User.where(:user_id => user.user_id).exists?
|
||||
else
|
||||
# Removed this code, just doesn't seem specific enough!
|
||||
# flash[:error] = "Either your username and password is incorrect"
|
||||
flash[:error] = e.message
|
||||
render "new"
|
||||
session[:user_id] = user.user_id if User.where(:user_id => user.user_id).exists?
|
||||
end
|
||||
redirect_to path
|
||||
else
|
||||
# Removed this code, just doesn't seem specific enough!
|
||||
# flash[:error] = "Either your username and password is incorrect"
|
||||
flash[:error] = e.message
|
||||
render "new"
|
||||
end
|
||||
end
|
||||
|
||||
def destroy
|
||||
@@ -37,5 +36,4 @@ class SessionsController < ApplicationController
|
||||
reset_session
|
||||
redirect_to root_path
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
class TutorialsController < ApplicationController
|
||||
|
||||
skip_before_filter :has_info
|
||||
skip_before_filter :authenticated
|
||||
|
||||
@@ -18,16 +17,16 @@ class TutorialsController < ApplicationController
|
||||
end
|
||||
|
||||
def xss
|
||||
@code = %{
|
||||
<li style="color: #FFFFFF">
|
||||
<!--
|
||||
I'm going to use HTML safe because we had some weird stuff
|
||||
going on with funny chars and jquery, plus it says safe so I'm guessing
|
||||
nothing bad will happen
|
||||
-->
|
||||
Welcome, <%= current_user.first_name.html_safe %>
|
||||
</li>
|
||||
}
|
||||
@code = %{
|
||||
<li style="color: #FFFFFF">
|
||||
<!--
|
||||
I'm going to use HTML safe because we had some weird stuff
|
||||
going on with funny chars and jquery, plus it says safe so I'm guessing
|
||||
nothing bad will happen
|
||||
-->
|
||||
Welcome, <%= current_user.first_name.html_safe %>
|
||||
</li>
|
||||
}
|
||||
end
|
||||
|
||||
def broken_auth
|
||||
@@ -45,15 +44,15 @@ class TutorialsController < ApplicationController
|
||||
event.preventDefault();
|
||||
$.ajax(\{
|
||||
url: "/example",
|
||||
data: valuesToSubmit,
|
||||
type: "POST",
|
||||
success: function(response) \{
|
||||
alert('success!');
|
||||
},
|
||||
error: function(event) \{
|
||||
alert('failure!');
|
||||
\}
|
||||
\});
|
||||
data: valuesToSubmit,
|
||||
type: "POST",
|
||||
success: function(response) \{
|
||||
alert('success!');
|
||||
},
|
||||
error: function(event) \{
|
||||
alert('failure!');
|
||||
\}
|
||||
\});
|
||||
\});
|
||||
|
||||
\} }
|
||||
@@ -95,5 +94,4 @@ class TutorialsController < ApplicationController
|
||||
|
||||
def metaprogramming
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
class UsersController < ApplicationController
|
||||
|
||||
skip_before_filter :has_info
|
||||
skip_before_filter :authenticated, :only => [:new, :create]
|
||||
|
||||
|
||||
def new
|
||||
@user = User.new
|
||||
end
|
||||
@@ -52,5 +50,4 @@ class UsersController < ApplicationController
|
||||
redirect_to user_account_settings_path(:user_id => current_user.user_id)
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
class WorkInfoController < ApplicationController
|
||||
|
||||
def index
|
||||
@user = User.find_by_user_id(params[:user_id])
|
||||
if !(@user) || @user.admin
|
||||
@@ -18,5 +17,4 @@ class WorkInfoController < ApplicationController
|
||||
end
|
||||
end
|
||||
=end
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user