Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
dd09a19a
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,发现更多精彩内容 >>
提交
dd09a19a
编写于
4月 23, 2018
作者:
J
James Edwards-Jones
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Auth::User classes refactor adds should_save?
上级
795cd7f9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
18 deletion
+10
-18
lib/gitlab/auth/ldap/user.rb
lib/gitlab/auth/ldap/user.rb
+2
-6
lib/gitlab/auth/o_auth/user.rb
lib/gitlab/auth/o_auth/user.rb
+2
-2
lib/gitlab/auth/saml/user.rb
lib/gitlab/auth/saml/user.rb
+2
-6
spec/lib/gitlab/auth/ldap/user_spec.rb
spec/lib/gitlab/auth/ldap/user_spec.rb
+4
-4
未找到文件。
lib/gitlab/auth/ldap/user.rb
浏览文件 @
dd09a19a
...
...
@@ -31,15 +31,11 @@ module Gitlab
self
.
class
.
find_by_uid_and_provider
(
auth_hash
.
uid
,
auth_hash
.
provider
)
end
def
changed?
override
:should_save?
def
should_save?
gl_user
.
changed?
||
gl_user
.
identities
.
any?
(
&
:changed?
)
end
override
:omniauth_should_save?
def
omniauth_should_save?
changed?
&&
super
end
def
block_after_signup?
ldap_config
.
block_auto_created_users
end
...
...
lib/gitlab/auth/o_auth/user.rb
浏览文件 @
dd09a19a
...
...
@@ -69,14 +69,14 @@ module Gitlab
end
def
find_and_update!
save
if
omniauth_
should_save?
save
if
should_save?
gl_user
end
protected
def
omniauth_
should_save?
def
should_save?
true
end
...
...
lib/gitlab/auth/saml/user.rb
浏览文件 @
dd09a19a
...
...
@@ -29,17 +29,13 @@ module Gitlab
user
end
def
changed?
override
:should_save?
def
should_save?
return
true
unless
gl_user
gl_user
.
changed?
||
gl_user
.
identities
.
any?
(
&
:changed?
)
end
override
:omniauth_should_save?
def
omniauth_should_save?
changed?
&&
super
end
protected
def
saml_config
...
...
spec/lib/gitlab/auth/ldap/user_spec.rb
浏览文件 @
dd09a19a
...
...
@@ -25,20 +25,20 @@ describe Gitlab::Auth::LDAP::User do
OmniAuth
::
AuthHash
.
new
(
uid:
'uid=John Smith,ou=People,dc=example,dc=com'
,
provider:
'ldapmain'
,
info:
info_upper_case
)
end
describe
'#
changed
?'
do
describe
'#
should_save
?'
do
it
"marks existing ldap user as changed"
do
create
(
:omniauth_user
,
extern_uid:
'uid=John Smith,ou=People,dc=example,dc=com'
,
provider:
'ldapmain'
)
expect
(
ldap_user
.
changed
?
).
to
be_truthy
expect
(
ldap_user
.
should_save
?
).
to
be_truthy
end
it
"marks existing non-ldap user if the email matches as changed"
do
create
(
:user
,
email:
'john@example.com'
)
expect
(
ldap_user
.
changed
?
).
to
be_truthy
expect
(
ldap_user
.
should_save
?
).
to
be_truthy
end
it
"does not mark existing ldap user as changed"
do
create
(
:omniauth_user
,
email:
'john@example.com'
,
extern_uid:
'uid=john smith,ou=people,dc=example,dc=com'
,
provider:
'ldapmain'
)
expect
(
ldap_user
.
changed
?
).
to
be_falsey
expect
(
ldap_user
.
should_save
?
).
to
be_falsey
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录