Fix #260 issues with privacy policy (#261)

* <fixed privacy policy workflow>

* <fixed privacy policy workflow>

* <changed rspec tests to handle new privacy flow>

* <changed rspec tests to handle new privacy flow>

* <deleted previous term validation due to changed workflow>

* <fixed code style>

* <reverted configuration settings>

* <Updated terms and conditions for existing users (not omniauth)>

* <Fix code style>

* <Fixed privacy policy for omniauth>

* <Fixed Travis C.I test>

* <Minor code changes>

* <Undo routes.rb change>

* <reconfigured routes.rb>
This commit is contained in:
John Ma
2018-09-14 14:33:58 -04:00
committed by Jesus Federico
parent 4fb1a008ca
commit d83ec1a027
10 changed files with 50 additions and 14 deletions

View File

@ -97,13 +97,11 @@ class UsersController < ApplicationController
redirect_to root_path
end
# GET /u/terms
# GET /terms
def terms
redirect_to root_path unless current_user
if params[:accept] == "true"
current_user.update_attribute(accepted_terms: true)
redirect_to current_user.main_room
current_user.update_attributes(accepted_terms: true)
redirect_to current_user.main_room if current_user
end
end
@ -118,6 +116,7 @@ class UsersController < ApplicationController
end
def user_params
params.require(:user).permit(:name, :email, :image, :password, :password_confirmation, :new_password, :provider)
params.require(:user).permit(:name, :email, :image, :password, :password_confirmation,
:new_password, :provider, :accepted_terms)
end
end