Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
158550cf
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
158550cf
编写于
6月 16, 2017
作者:
J
James Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
added service in the rest of controllers and classes
上级
bf3a3f36
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
13 addition
and
12 deletion
+13
-12
app/controllers/profiles/avatars_controller.rb
app/controllers/profiles/avatars_controller.rb
+1
-1
app/controllers/profiles/two_factor_auths_controller.rb
app/controllers/profiles/two_factor_auths_controller.rb
+3
-3
app/controllers/sessions_controller.rb
app/controllers/sessions_controller.rb
+1
-1
app/services/users/update_service.rb
app/services/users/update_service.rb
+3
-3
lib/api/internal.rb
lib/api/internal.rb
+1
-1
lib/api/users.rb
lib/api/users.rb
+2
-2
lib/gitlab/ldap/access.rb
lib/gitlab/ldap/access.rb
+2
-1
未找到文件。
app/controllers/profiles/avatars_controller.rb
浏览文件 @
158550cf
...
...
@@ -3,7 +3,7 @@ class Profiles::AvatarsController < Profiles::ApplicationController
@user
=
current_user
@user
.
remove_avatar!
@user
.
sav
e
Users
::
UpdateService
.
new
(
@user
,
@user
).
execut
e
redirect_to
profile_path
,
status:
302
end
...
...
app/controllers/profiles/two_factor_auths_controller.rb
浏览文件 @
158550cf
...
...
@@ -10,7 +10,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
current_user
.
otp_grace_period_started_at
=
Time
.
current
end
current_user
.
save!
if
current_user
.
changed?
Users
::
UpdateService
.
new
(
current_user
,
current_user
).
execute!
if
two_factor_authentication_required?
&&
!
current_user
.
two_factor_enabled?
two_factor_authentication_reason
(
...
...
@@ -43,7 +43,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
if
current_user
.
validate_and_consume_otp!
(
params
[
:pin_code
])
current_user
.
otp_required_for_login
=
true
@codes
=
current_user
.
generate_otp_backup_codes!
current_user
.
sav
e!
Users
::
UpdateService
.
new
(
current_user
,
current_user
).
execut
e!
render
'create'
else
...
...
@@ -71,7 +71,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
def
codes
@codes
=
current_user
.
generate_otp_backup_codes!
current_user
.
sav
e!
Users
::
UpdateService
.
new
(
current_user
,
current_user
).
execut
e!
end
def
destroy
...
...
app/controllers/sessions_controller.rb
浏览文件 @
158550cf
...
...
@@ -61,7 +61,7 @@ class SessionsController < Devise::SessionsController
return
unless
user
&&
user
.
require_password?
token
=
user
.
generate_reset_token
user
.
sav
e
Users
::
UpdateService
.
new
(
user
,
user
).
execut
e
redirect_to
edit_user_password_path
(
reset_password_token:
token
),
notice:
"Please create a password for your new account."
...
...
app/services/users/update_service.rb
浏览文件 @
158550cf
module
Users
# Service for
creating a new
user.
# Service for
updating a
user.
class
UpdateService
<
BaseService
def
initialize
(
current_user
,
user
,
params
=
{})
@current_user
=
current_user
...
...
@@ -7,10 +7,10 @@ module Users
@params
=
params
.
dup
end
def
execute
(
skip_authorization:
false
,
&
block
)
def
execute
(
skip_authorization:
false
,
validate:
true
,
&
block
)
assign_attributes
(
skip_authorization
,
&
block
)
if
@user
.
save
||
!
@user
.
changed?
&&
@user
.
errors
.
empty?
if
@user
.
save
(
validate:
validate
)
||
!
@user
.
changed?
&&
@user
.
errors
.
empty?
success
else
error
(
@user
.
errors
.
full_messages
.
uniq
.
join
(
'. '
))
...
...
lib/api/internal.rb
浏览文件 @
158550cf
...
...
@@ -133,7 +133,7 @@ module API
end
codes
=
user
.
generate_otp_backup_codes!
user
.
sav
e!
::
Users
::
UpdateService
.
new
(
user
,
user
).
execut
e!
{
success:
true
,
recovery_codes:
codes
}
end
...
...
lib/api/users.rb
浏览文件 @
158550cf
...
...
@@ -278,7 +278,7 @@ module API
email
.
destroy
Users
::
UpdateService
.
new
(
current_user
,
user
).
execute
do
|
user
|
::
Users
::
UpdateService
.
new
(
current_user
,
user
).
execute
do
|
user
|
user
.
update_secondary_emails!
end
end
...
...
@@ -511,7 +511,7 @@ module API
not_found!
(
'Email'
)
unless
email
email
.
destroy
Users
::
UpdateService
.
new
(
current_user
,
user
).
execute
do
|
user
|
::
Users
::
UpdateService
.
new
(
current_user
,
user
).
execute
do
|
user
|
user
.
update_secondary_emails!
end
end
...
...
lib/gitlab/ldap/access.rb
浏览文件 @
158550cf
...
...
@@ -17,7 +17,8 @@ module Gitlab
self
.
open
(
user
)
do
|
access
|
if
access
.
allowed?
user
.
last_credential_check_at
=
Time
.
now
user
.
save
Users
::
UpdateService
.
new
(
user
,
user
).
execute
true
else
false
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录