Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
simplesamlphp
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Perun
Perun ProxyIdP
v1
simplesamlphp
Commits
66d8bc05
Commit
66d8bc05
authored
9 years ago
by
Jaime Perez Crespo
Browse files
Options
Downloads
Patches
Plain Diff
Deprecate SimpleSAML_Default::loginCompleted() and move it to SimpleSAML_Auth_Source.
parent
d89759f4
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/simplesamlphp-upgrade-notes-1.14.txt
+1
-0
1 addition, 0 deletions
docs/simplesamlphp-upgrade-notes-1.14.txt
lib/SimpleSAML/Auth/Default.php
+1
-3
1 addition, 3 deletions
lib/SimpleSAML/Auth/Default.php
lib/SimpleSAML/Auth/Source.php
+32
-0
32 additions, 0 deletions
lib/SimpleSAML/Auth/Source.php
with
34 additions
and
3 deletions
docs/simplesamlphp-upgrade-notes-1.14.txt
+
1
−
0
View file @
66d8bc05
...
@@ -88,6 +88,7 @@ The following methods and classes have been deprecated. Refer to the code for al
...
@@ -88,6 +88,7 @@ The following methods and classes have been deprecated. Refer to the code for al
* `SimpleSAML_Auth_Default`
* `SimpleSAML_Auth_Default`
* `SimpleSAML_Auth_Default::extractPersistentAuthState()`
* `SimpleSAML_Auth_Default::extractPersistentAuthState()`
* `SimpleSAML_Auth_Default::handleUnsolicitedAuth()`
* `SimpleSAML_Auth_Default::handleUnsolicitedAuth()`
* `SimpleSAML_Auth_Default::loginCompleted()`
* `SimpleSAML_Utilities`
* `SimpleSAML_Utilities`
* `SimpleSAML_Utilities::addURLParameter()`
* `SimpleSAML_Utilities::addURLParameter()`
* `SimpleSAML_Utilities::aesDecrypt()`
* `SimpleSAML_Utilities::aesDecrypt()`
...
...
This diff is collapsed.
Click to expand it.
lib/SimpleSAML/Auth/Default.php
+
1
−
3
View file @
66d8bc05
...
@@ -87,9 +87,7 @@ class SimpleSAML_Auth_Default {
...
@@ -87,9 +87,7 @@ class SimpleSAML_Auth_Default {
/**
/**
* Called when a login operation has finished.
* @deprecated This method will be removed in SSP 2.0.
*
* @param array $state The state after the login.
*/
*/
public
static
function
loginCompleted
(
$state
)
{
public
static
function
loginCompleted
(
$state
)
{
assert
(
'is_array($state)'
);
assert
(
'is_array($state)'
);
...
...
This diff is collapsed.
Click to expand it.
lib/SimpleSAML/Auth/Source.php
+
32
−
0
View file @
66d8bc05
...
@@ -147,6 +147,38 @@ abstract class SimpleSAML_Auth_Source
...
@@ -147,6 +147,38 @@ abstract class SimpleSAML_Auth_Source
}
}
/**
* Called when a login operation has finished.
*
* This method never returns.
*
* @param array $state The state after the login has completed.
*/
protected
static
function
loginCompleted
(
$state
)
{
assert
(
'is_array($state)'
);
assert
(
'array_key_exists("SimpleSAML_Auth_Default.Return", $state)'
);
assert
(
'array_key_exists("SimpleSAML_Auth_Default.id", $state)'
);
assert
(
'array_key_exists("Attributes", $state)'
);
assert
(
'!array_key_exists("LogoutState", $state) || is_array($state["LogoutState"])'
);
$return
=
$state
[
'SimpleSAML_Auth_Default.Return'
];
// save session state
$session
=
SimpleSAML_Session
::
getSessionFromRequest
();
$authId
=
$state
[
'SimpleSAML_Auth_Default.id'
];
$state
=
SimpleSAML_Auth_State
::
extractPersistentAuthState
(
$state
);
$session
->
doLogin
(
$authId
,
$state
);
if
(
is_string
(
$return
))
{
// redirect...
\SimpleSAML\Utils\HTTP
::
redirectTrustedURL
(
$return
);
}
else
{
call_user_func
(
$return
,
$state
);
}
assert
(
'false'
);
}
/**
/**
* Log out from this authentication source.
* Log out from this authentication source.
*
*
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment