Commit 4ae26e1d authored by cmrd Senya's avatar cmrd Senya
Browse files

Upgrade devise to 4.2

parent c1bd072e
......@@ -23,9 +23,9 @@ gem "json-schema", "2.6.2"
# Authentication
gem "devise", "3.5.6"
gem "devise", "4.2.0"
gem "devise_lastseenable", "0.0.6"
gem "devise-token_authenticatable", "0.4.6"
gem "devise-token_authenticatable", "0.5.2"
# Captcha
......
......@@ -165,15 +165,14 @@ GEM
railties (>= 3, < 5)
cucumber-wire (0.0.1)
database_cleaner (1.5.3)
devise (3.5.6)
devise (4.2.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
railties (>= 4.1.0, < 5.1)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
devise-token_authenticatable (0.4.6)
devise (>= 3.5.2, < 4.0.0)
devise-token_authenticatable (0.5.2)
devise (>= 4.0.0, < 4.3.0)
devise_lastseenable (0.0.6)
devise
rails (>= 3.0.4)
......@@ -927,8 +926,8 @@ DEPENDENCIES
cucumber-api-steps (= 0.13)
cucumber-rails (= 1.4.3)
database_cleaner (= 1.5.3)
devise (= 3.5.6)
devise-token_authenticatable (= 0.4.6)
devise (= 4.2.0)
devise-token_authenticatable (= 0.5.2)
devise_lastseenable (= 0.0.6)
diaspora-prosody-config (= 0.0.5)
diaspora_federation-rails (= 0.1.3)
......
en:
errors:
messages:
not_found: "not found"
already_confirmed: "was already confirmed"
not_locked: "was not locked"
devise:
failure:
unauthenticated: 'You need to sign in or sign up before continuing.'
unconfirmed: 'You have to confirm your account before continuing.'
locked: 'Your account is locked.'
not_found_in_database: 'Invalid email or password.'
invalid: 'Invalid username or password.'
invalid_token: 'Invalid authentication token.'
timeout: 'Your session expired, please sign in again to continue.'
inactive: 'Your account was not activated yet.'
sessions:
new:
login: 'Log in'
username: 'Username'
password: 'Password'
sign_in: 'Sign in'
remember_me: "Remember me"
modern_browsers: 'only supports modern browsers.'
signed_in: 'Signed in successfully.'
signed_out: 'Signed out successfully.'
passwords:
send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
updated: 'Your password was changed successfully. You are now signed in.'
edit:
change_password: "Change my password"
new_password: "New password"
confirm_password: "Confirm password"
new:
forgot_password: "Forgot your password?"
no_account: 'No account with this email exists'
reset_password: "Reset password"
email: "Email address"
send_password_instructions: "Send me reset password instructions"
confirmations:
send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
confirmed: 'Your account was successfully confirmed. You are now signed in.'
new:
resend_confirmation: "Resend confirmation instructions"
registrations:
signed_up: 'You have signed up successfully. If enabled, a confirmation was sent to your e-mail.'
updated: 'You updated your account successfully.'
destroyed: 'Bye! Your account was successfully deleted. We hope to see you again soon.'
unlocks:
send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
unlocked: 'Your account was successfully unlocked. You are now signed in.'
confirmed: Your email address has been successfully confirmed.
send_instructions: You will receive an email with instructions for how to confirm
your email address in a few minutes.
send_paranoid_instructions: If your email address exists in our database, you
will receive an email with instructions for how to confirm your email address
in a few minutes.
new:
resend_unlock: "Resend unlock instructions"
invitations:
send_instructions: 'Your invitation has been sent.'
invitation_token_invalid: 'Our apologies! That invitation token is not valid.'
updated: 'Your password was set successfully. You are now signed in.'
resend_confirmation: Resend confirmation instructions
failure:
already_authenticated: You are already signed in.
inactive: Your account is not activated yet.
invalid: Invalid %{authentication_keys} or password.
locked: Your account is locked.
last_attempt: You have one more attempt before your account is locked.
not_found_in_database: Invalid %{authentication_keys} or password.
timeout: Your session expired. Please sign in again to continue.
unauthenticated: You need to sign in or sign up before continuing.
unconfirmed: You have to confirm your email address before continuing.
invalid_token: Invalid authentication token.
mailer:
welcome: "Welcome %{email}!"
hello: "Hello %{email}!"
confirmation_instructions:
subject: 'Confirmation instructions'
you_can_confirm: "You can confirm your account through the link below:"
confirm: "Confirm my account"
subject: Confirmation instructions
you_can_confirm: 'You can confirm your account through the link below:'
confirm: Confirm my account
reset_password_instructions:
subject: 'Reset password instructions'
someone_requested: "Someone has requested a link to change your password. If it was you, you can do this through the link below."
change: "Change my password"
wont_change: "Your password won't change until you access the link above and create a new one."
ignore: "If you didn't request this, please ignore this email."
subject: Reset password instructions
someone_requested: Someone has requested a link to change your password. If
it was you, you can do this through the link below.
change: Change my password
wont_change: Your password won't change until you access the link above and
create a new one.
ignore: If you didn't request this, please ignore this email.
unlock_instructions:
subject: 'Unlock instructions'
account_locked: "Your account has been locked due to an excessive number of unsuccessful sign in attempts."
click_to_unlock: "Click the link below to unlock your account:"
unlock: "Unlock my account"
subject: Unlock instructions
account_locked: Your account has been locked due to an excessive number of
unsuccessful sign in attempts.
click_to_unlock: 'Click the link below to unlock your account:'
unlock: Unlock my account
password_change:
subject: Password Changed
welcome: Welcome %{email}!
hello: Hello %{email}!
inviter:
has_invited_you: "%{name}"
have_invited_you: "%{names} have invited you to join diaspora*"
accept_at: "at %{url}, you can accept it through the link below."
accept_at: at %{url}, you can accept it through the link below.
omniauth_callbacks:
failure: Could not authenticate you from %{kind} because "%{reason}".
success: Successfully authenticated from %{kind} account.
passwords:
no_token: You can't access this page without coming from a password reset email.
If you do come from a password reset email, please make sure you used the
full URL provided.
send_instructions: You will receive an email with instructions on how to reset
your password in a few minutes.
send_paranoid_instructions: If your email address exists in our database, you
will receive a password recovery link at your email address in a few minutes.
updated: Your password has been changed successfully. You are now signed in.
updated_not_active: Your password has been changed successfully.
edit:
change_password: Change my password
new_password: New password
confirm_password: Confirm password
new:
forgot_password: Forgot your password?
no_account: No account with this email exists
reset_password: Reset password
email: Email address
send_password_instructions: Send me reset password instructions
registrations:
destroyed: Bye! Your account was successfully deleted. We hope to see you again
soon.
signed_up: You have signed up successfully. If enabled, a confirmation was sent
to your e-mail.
signed_up_but_inactive: You have signed up successfully. However, we could not
sign you in because your account is not yet activated.
signed_up_but_locked: You have signed up successfully. However, we could not
sign you in because your account is locked.
signed_up_but_unconfirmed: A message with a confirmation link has been sent
to your email address. Please follow the link to activate your account.
update_needs_confirmation: You updated your account successfully, but we need
to verify your new email address. Please check your email and follow the confirm
link to confirm your new email address.
updated: Your account has been updated successfully.
sessions:
signed_in: Signed in successfully.
signed_out: Signed out successfully.
already_signed_out: Signed out successfully.
new:
login: Log in
username: Username
password: Password
sign_in: Sign in
remember_me: Remember me
modern_browsers: only supports modern browsers.
unlocks:
send_instructions: You will receive an email with instructions for how to unlock
your account in a few minutes.
send_paranoid_instructions: If your account exists, you will receive an email
with instructions for how to unlock it in a few minutes.
unlocked: Your account has been unlocked successfully. Please sign in to continue.
new:
resend_unlock: Resend unlock instructions
invitations:
send_instructions: Your invitation has been sent.
invitation_token_invalid: Our apologies! That invitation token is not valid.
updated: Your password was set successfully. You are now signed in.
shared:
links:
sign_in: 'Sign in'
sign_up: 'Create account'
sign_up_closed: 'Open signups are closed at this time.'
forgot_your_password: 'Forgot your password?'
receive_confirmation: "Didn't receive confirmation instructions?"
receive_unlock: "Didn't receive unlock instructions?"
sign_in: Sign in
sign_up: Create account
sign_up_closed: Open signups are closed at this time.
forgot_your_password: Forgot your password?
receive_confirmation: Didn't receive confirmation instructions?
receive_unlock: Didn't receive unlock instructions?
errors:
messages:
already_confirmed: was already confirmed, please try signing in
confirmation_period_expired: needs to be confirmed within %{period}, please
request a new one
expired: has expired, please request a new one
not_found: not found
not_locked: was not locked
not_saved:
one: '1 error prohibited this %{resource} from being saved:'
other: "%{count} errors prohibited this %{resource} from being saved:"
......@@ -6,7 +6,7 @@ describe Admin::PodsController, type: :controller do
@user = FactoryGirl.create :user
Role.add_admin(@user.person)
sign_in :user, @user
sign_in @user, scope: :user
end
describe "#index" do
......
......@@ -6,7 +6,7 @@ describe Admin::UsersController, :type => :controller do
@user = FactoryGirl.create :user
Role.add_admin(@user.person)
sign_in :user, @user
sign_in @user, scope: :user
end
describe '#close_account' do
......
......@@ -7,7 +7,7 @@ require 'spec_helper'
describe AdminsController, :type => :controller do
before do
@user = FactoryGirl.create :user
sign_in :user, @user
sign_in @user, scope: :user
end
describe '#user_search' do
......
......@@ -6,7 +6,7 @@ describe Api::OpenidConnect::AuthorizationsController, type: :controller do
let!(:client_with_multiple_redirects) { FactoryGirl.create(:o_auth_application_with_multiple_redirects) }
before do
sign_in :user, alice
sign_in alice, scope: :user
end
describe "#new" do
......
......@@ -5,7 +5,7 @@ describe Api::OpenidConnect::UserApplicationsController, type: :controller do
@app = FactoryGirl.create(:o_auth_application_with_xss)
@user = FactoryGirl.create :user
FactoryGirl.create :auth_with_read, user: @user, o_auth_application: @app
sign_in :user, @user
sign_in @user, scope: :user
end
context "when try to XSS" do
......
......@@ -13,7 +13,7 @@ describe AspectMembershipsController, type: :controller do
@contact = alice.contact_for(bob.person)
alice.getting_started = false
alice.save
sign_in :user, alice
sign_in alice, scope: :user
allow(@controller).to receive(:current_user).and_return(alice)
request.env["HTTP_REFERER"] = "http://" + request.host
end
......
......@@ -8,7 +8,7 @@ describe AspectsController, :type => :controller do
before do
alice.getting_started = false
alice.save
sign_in :user, alice
sign_in alice, scope: :user
@alices_aspect_1 = alice.aspects.where(:name => "generic").first
@alices_aspect_2 = alice.aspects.create(:name => "another aspect")
......
......@@ -7,7 +7,7 @@ require 'spec_helper'
describe CommentsController, :type => :controller do
before do
allow(@controller).to receive(:current_user).and_return(alice)
sign_in :user, alice
sign_in alice, scope: :user
end
describe '#create' do
......@@ -79,7 +79,7 @@ describe CommentsController, :type => :controller do
context 'your post' do
before do
allow(@controller).to receive(:current_user).and_return(bob)
sign_in :user, bob
sign_in bob, scope: :user
end
it 'lets the user delete his comment' do
......
......@@ -6,7 +6,7 @@ require 'spec_helper'
describe ContactsController, :type => :controller do
before do
sign_in :user, bob
sign_in bob, scope: :user
allow(@controller).to receive(:current_user).and_return(bob)
end
......
......@@ -7,7 +7,7 @@ require 'spec_helper'
describe ConversationVisibilitiesController, :type => :controller do
before do
@user1 = alice
sign_in :user, @user1
sign_in @user1, scope: :user
hash = {
:author => @user1.person,
......@@ -27,22 +27,22 @@ describe ConversationVisibilitiesController, :type => :controller do
it 'does not let a user destroy a visibility that is not theirs' do
user2 = eve
sign_in :user, user2
sign_in user2, scope: :user
expect {
delete :destroy, :conversation_id => @conversation.id
}.not_to change(ConversationVisibility, :count)
end
it 'returns "hidden"' do
get :destroy, :conversation_id => @conversation.id
expect(flash.notice).to include("hidden")
end
it 'returns "deleted" when last participant' do
get :destroy, :conversation_id => @conversation.id
sign_out :user
sign_in :user, bob
sign_in bob, scope: :user
get :destroy, :conversation_id => @conversation.id
expect(flash.notice).to include("deleted")
end
......
......@@ -6,7 +6,7 @@ require 'spec_helper'
describe ConversationsController, :type => :controller do
before do
sign_in :user, alice
sign_in alice, scope: :user
end
describe '#new' do
......@@ -98,7 +98,7 @@ describe ConversationsController, :type => :controller do
end
it "does not let you access conversations where you are not a recipient" do
sign_in :user, eve
sign_in eve, scope: :user
get :index, conversation_id: @conversations.first.id
expect(assigns[:conversation]).to be_nil
end
......
......@@ -14,7 +14,7 @@ describe InvitationsController, :type => :controller do
describe "#create" do
before do
sign_in :user, @user
sign_in @user, scope: :user
allow(@controller).to receive(:current_user).and_return(@user)
@referer = 'http://test.host/cats/foo'
request.env["HTTP_REFERER"] = @referer
......@@ -159,7 +159,7 @@ describe InvitationsController, :type => :controller do
describe '#new' do
it 'renders' do
sign_in :user, @user
sign_in @user, scope: :user
get :new
end
end
......
......@@ -5,7 +5,7 @@ describe AdminsController, type: :controller do
before do
@user = FactoryGirl.create :user
Role.add_admin(@user.person)
sign_in :user, @user
sign_in @user, scope: :user
end
context "jasmine fixtures" do
......
......@@ -7,7 +7,7 @@ require 'spec_helper'
describe StreamsController, :type => :controller do
describe '#aspects' do
before do
sign_in :user, alice
sign_in alice, scope: :user
@alices_aspect_2 = alice.aspects.create(:name => "another aspect")
request.env["HTTP_REFERER"] = 'http://' + request.host
......
......@@ -11,7 +11,7 @@ describe ContactsController, :type => :controller do
@aspect = bob.aspects.create(:name => "another aspect")
bob.share_with alice.person, @aspect
bob.share_with eve.person, @aspect
sign_in :user, bob
sign_in bob, scope: :user
end
it "generates the aspects_manage fixture", :fixture => true do
......
......@@ -20,7 +20,7 @@ describe ConversationsController, :type => :controller do
Message.create(:author => @person, :created_at => Time.now + 100, :text => "message", :conversation_id => @conv2.id)
.increase_unread(alice)
sign_in :user, alice
sign_in alice, scope: :user
end
it "generates a jasmine fixture", :fixture => true do
......
......@@ -3,7 +3,7 @@ require 'spec_helper'
describe NotificationsController, :type => :controller do
describe '#index' do
before do
sign_in :user, alice
sign_in alice, scope: :user
@post = FactoryGirl.create(:status_message)
FactoryGirl.create(:notification, :recipient => alice, :target => @post)
get :read_all
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment