Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
f9249849
Commit
f9249849
authored
Jan 01, 2014
by
Klimov Paul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SREG and AX param merging order at OpenId::buildAuthUrl() changed.
parent
df8d79ee
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
OpenId.php
extensions/yii/authclient/OpenId.php
+4
-4
No files found.
extensions/yii/authclient/OpenId.php
View file @
f9249849
...
@@ -691,13 +691,13 @@ class OpenId extends BaseClient implements ClientInterface
...
@@ -691,13 +691,13 @@ class OpenId extends BaseClient implements ClientInterface
}
}
$params
=
array_merge
(
$params
=
array_merge
(
$this
->
buildSregParams
(),
[
[
'openid.return_to'
=>
$returnUrl
,
'openid.return_to'
=>
$returnUrl
,
'openid.mode'
=>
'checkid_setup'
,
'openid.mode'
=>
'checkid_setup'
,
'openid.identity'
=>
$serverInfo
[
'identity'
],
'openid.identity'
=>
$serverInfo
[
'identity'
],
'openid.trust_root'
=>
$this
->
trustRoot
,
'openid.trust_root'
=>
$this
->
trustRoot
,
]
],
$this
->
buildSregParams
()
);
);
return
$this
->
buildUrl
(
$serverInfo
[
'url'
],
[
'query'
=>
http_build_query
(
$params
,
''
,
'&'
)]);
return
$this
->
buildUrl
(
$serverInfo
[
'url'
],
[
'query'
=>
http_build_query
(
$params
,
''
,
'&'
)]);
...
@@ -717,10 +717,10 @@ class OpenId extends BaseClient implements ClientInterface
...
@@ -717,10 +717,10 @@ class OpenId extends BaseClient implements ClientInterface
'openid.realm'
=>
$this
->
getTrustRoot
(),
'openid.realm'
=>
$this
->
getTrustRoot
(),
];
];
if
(
$serverInfo
[
'ax'
])
{
if
(
$serverInfo
[
'ax'
])
{
$params
=
array_merge
(
$
this
->
buildAxParams
(),
$params
);
$params
=
array_merge
(
$
params
,
$this
->
buildAxParams
()
);
}
}
if
(
$serverInfo
[
'sreg'
])
{
if
(
$serverInfo
[
'sreg'
])
{
$params
=
array_merge
(
$
this
->
buildSregParams
(),
$params
);
$params
=
array_merge
(
$
params
,
$this
->
buildSregParams
()
);
}
}
if
(
!
$serverInfo
[
'ax'
]
&&
!
$serverInfo
[
'sreg'
])
{
if
(
!
$serverInfo
[
'ax'
]
&&
!
$serverInfo
[
'sreg'
])
{
// If OP doesn't advertise either SREG, nor AX, let's send them both in worst case we don't get anything in return.
// If OP doesn't advertise either SREG, nor AX, let's send them both in worst case we don't get anything in return.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment