Skip to content
Snippets Groups Projects
Unverified Commit 092448d8 authored by Henning Hollermann's avatar Henning Hollermann Committed by GitHub
Browse files

Merge pull request #117 from privacyidea/move_privacyidea_privacyidea_authenticationMethod

move authenticationMethod to main process function
parents 2347e1c0 6a40cfc2
Branches
Tags
No related merge requests found
...@@ -45,6 +45,9 @@ class sspmod_privacyidea_Auth_Process_privacyidea extends SimpleSAML_Auth_Proces ...@@ -45,6 +45,9 @@ class sspmod_privacyidea_Auth_Process_privacyidea extends SimpleSAML_Auth_Proces
SimpleSAML_Logger::info("privacyIDEA Auth Proc Filter: Entering process function"); SimpleSAML_Logger::info("privacyIDEA Auth Proc Filter: Entering process function");
// set authenticationMethod
$state['privacyidea:privacyidea:authenticationMethod'] = "authprocess";
$this->serverconfig = sspmod_privacyidea_Auth_utils::buildServerconfig( $this->serverconfig = sspmod_privacyidea_Auth_utils::buildServerconfig(
$state['privacyidea:serverconfig'], $state['privacyidea:serverconfig'],
$this->serverconfig, $this->serverconfig,
...@@ -89,8 +92,6 @@ class sspmod_privacyidea_Auth_Process_privacyidea extends SimpleSAML_Auth_Proces ...@@ -89,8 +92,6 @@ class sspmod_privacyidea_Auth_Process_privacyidea extends SimpleSAML_Auth_Proces
return false; return false;
} }
$state['privacyidea:privacyidea:authenticationMethod'] = "authprocess";
try { try {
sspmod_privacyidea_Auth_utils::authenticate( sspmod_privacyidea_Auth_utils::authenticate(
$state, $state,
...@@ -128,7 +129,6 @@ class sspmod_privacyidea_Auth_Process_privacyidea extends SimpleSAML_Auth_Proces ...@@ -128,7 +129,6 @@ class sspmod_privacyidea_Auth_Process_privacyidea extends SimpleSAML_Auth_Proces
assert('array' === gettype($state)); assert('array' === gettype($state));
SimpleSAML_Logger::debug("privacyIDEA: privacyIDEA is enabled, so we use 2FA"); SimpleSAML_Logger::debug("privacyIDEA: privacyIDEA is enabled, so we use 2FA");
$state['privacyidea:privacyidea:authenticationMethod'] = "authprocess";
$id = SimpleSAML_Auth_State::saveState($state, 'privacyidea:privacyidea:init'); $id = SimpleSAML_Auth_State::saveState($state, 'privacyidea:privacyidea:init');
$url = SimpleSAML_Module::getModuleURL('privacyidea/otpform.php'); $url = SimpleSAML_Module::getModuleURL('privacyidea/otpform.php');
SimpleSAML_Utilities::redirectTrustedURL($url, array('StateId' => $id)); SimpleSAML_Utilities::redirectTrustedURL($url, array('StateId' => $id));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment