moodle/auth_token
0
Fork 0
Code Issues Releases Activity

Adapt authorization for the new version of the plug-in

Browse Source
This commit is contained in:
Valentin Popov
2017-12-03 21:06:04 +04:00
parent b062def50a
commit b38a8d69f3
1 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
auth.php
View File

@@ -138,27 +138,22 @@ class auth_plugin_token extends auth_plugin_base {
* This method is called from login/index.php page for all enabled auth plugins. * This method is called from login/index.php page for all enabled auth plugins.
*/ */
public function loginpage_hook() { public function loginpage_hook() {
global $USER;
if ($token = $this->definition_token()) { if ($token = $this->definition_token()) {
if ($user = $this->definition_user($token)) { if (isloggedin()) {
complete_user_login($user); tool_managertokens_perform_additional_action($token, $USER);
$this->additional_actions($token);
}
}
}
/**
* Executes additional conditions and redirects the user.
*
* @param object $token
*/
private function additional_actions($token) {
if ($token->extendedaction == "redirect") {
$this->redirect_user($token->extendedoptions);
}
$this->redirect_user(); $this->redirect_user();
} }
if ($user = tool_managertokens_definition_user($token)) {
complete_user_login($user);
tool_managertokens_perform_additional_action($token, $user);
$this->redirect_user();
}
}
}
/** /**
* Indicates the transmitted token, if any. * Indicates the transmitted token, if any.
* *
@@ -170,36 +165,18 @@ class auth_plugin_token extends auth_plugin_base {
return $token; return $token;
} }
/**
* Identifies the user who owns the token.
*
* @param object $token
* @return object
*/
private function definition_user($token) {
$user = false;
if ($token->targettype == "user") {
$user = core_user::get_user($token->targetid);
}
return $user;
}
/** /**
* Redirects the user. * Redirects the user.
* *
* @param string $url * @param string $url
*/ */
private function redirect_user($url = "") { private function redirect_user() {
global $CFG, $SESSION; global $CFG, $SESSION;
$wantsurl = optional_param("wantsurl", "", PARAM_URL); $wantsurl = optional_param("wantsurl", null, PARAM_URL);
$redirect = $CFG->wwwroot; $redirect = $CFG->wwwroot;
if (!empty($url)) { if (isset($SESSION->wantsurl)) {
$redirect = new moodle_url($url);
} else if (isset($SESSION->wantsurl)) {
$redirect = $SESSION->wantsurl; $redirect = $SESSION->wantsurl;
} else if (!empty($wantsurl)) { } else if (!empty($wantsurl)) {
$redirect = $wantsurl; $redirect = $wantsurl;