Skip to content
Snippets Groups Projects
Commit 3bab585b authored by James Lopez's avatar James Lopez
Browse files

update to use emails destroy service

parent ad44af2f
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -152,7 +152,7 @@ class Admin::UsersController < Admin::ApplicationController
 
def remove_email
email = user.emails.find(params[:email_id])
email.destroy
Emails::DestroyService.new(current_user, self, email: email.email).execute
 
result = Users::UpdateService.new(current_user, @user).execute do |user|
user.update_secondary_emails!
Loading
Loading
Loading
Loading
@@ -18,7 +18,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
 
def destroy
@email = current_user.emails.find(params[:id])
@email.destroy
Emails::DestroyService.new(self, self, email: @email.email).execute
 
Users::UpdateService.new(current_user, current_user).execute { |user| user.update_secondary_emails! }
 
Loading
Loading
Loading
Loading
@@ -494,7 +494,7 @@ class User < ActiveRecord::Base
def update_emails_with_primary_email
primary_email_record = emails.find_by(email: email)
if primary_email_record
primary_email_record.destroy
Emails::DestroyService.new(self, self, email: email).execute
emails.create(email: email_was)
 
update_secondary_emails!
Loading
Loading
Loading
Loading
@@ -3,7 +3,7 @@ module Emails
def execute(skip_authorization: false)
raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_manage_emails?
 
Email.find_by_email(@email).destroy!
Email.find_by_email(@email).destroy
end
end
end
Loading
Loading
@@ -276,7 +276,7 @@ module API
email = user.emails.find_by(id: params[:email_id])
not_found!('Email') unless email
 
email.destroy
Emails::DestroyService.new(current_user, self, email: email.email).execute
 
::Users::UpdateService.new(current_user, user).execute do |user|
user.update_secondary_emails!
Loading
Loading
@@ -510,7 +510,8 @@ module API
email = current_user.emails.find_by(id: params[:email_id])
not_found!('Email') unless email
 
email.destroy
Emails::DestroyService.new(current_user, self, email: email.email).execute
::Users::UpdateService.new(current_user, current_user).execute do |user|
user.update_secondary_emails!
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment