Skip to content

Commit

Permalink
MDL-68406 tool_mobile: Allow users to log-out from the app
Browse files Browse the repository at this point in the history
In this commit, we also reorganised how the Mobile box is displayed in the user profile.
We are allowing now site admins to see the user last access time.
  • Loading branch information
jleyva committed Oct 9, 2020
1 parent 5ecd01f commit 328396c
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 5 deletions.
1 change: 1 addition & 0 deletions admin/tool/mobile/lang/en/tool_mobile.php
Expand Up @@ -83,6 +83,7 @@
$string['loginintheapp'] = 'Via the app';
$string['logininthebrowser'] = 'Via a browser window (for SSO plugins)';
$string['loginintheembeddedbrowser'] = 'Via an embedded browser (for SSO plugins)';
$string['logoutconfirmation'] = 'Are you sure you want to log out from the mobile app on your mobile devices? By logging out, you will then need to re-enter your username and password in the mobile app on all devices where you have the app installed.';
$string['mainmenu'] = 'Main menu';
$string['managefiletypes'] = 'Manage file types';
$string['minimumversion'] = 'If an app version is specified (3.8.0 or higher), any users using an older app version will be prompted to upgrade their app before being allowed access to the site.';
Expand Down
13 changes: 8 additions & 5 deletions admin/tool/mobile/lib.php
Expand Up @@ -134,15 +134,11 @@ function tool_mobile_myprofile_navigation(\core_user\output\myprofile\tree $tree
return;
}

if (!$iscurrentuser) {
return;
}

$newnodes = [];
$mobilesettings = get_config('tool_mobile');

// Check if we should display a QR code.
if (!empty($mobilesettings->qrcodetype)) {
if ($iscurrentuser && !empty($mobilesettings->qrcodetype)) {
$mobileqr = null;
$qrcodeforappstr = get_string('qrcodeformobileappaccess', 'tool_mobile');

Expand Down Expand Up @@ -182,6 +178,13 @@ function tool_mobile_myprofile_navigation(\core_user\output\myprofile\tree $tree
$mobilestrconnected = get_string('lastsiteaccess');
if ($usertoken->lastaccess) {
$mobilelastaccess = userdate($usertoken->lastaccess) . "  (" . format_time(time() - $usertoken->lastaccess) . ")";
// Logout link.
$validtoken = empty($usertoken->validuntil) || time() < $usertoken->validuntil;
if ($iscurrentuser && $validtoken) {
$url = new moodle_url('/'.$CFG->admin.'/tool/mobile/logout.php', ['sesskey' => sesskey()]);
$logoutlink = html_writer::link($url, get_string('logout'));
$mobilelastaccess .= "&nbsp; ($logoutlink)";
}
} else {
// We should not reach this point.
$mobilelastaccess = get_string("never");
Expand Down
70 changes: 70 additions & 0 deletions admin/tool/mobile/logout.php
@@ -0,0 +1,70 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.

/**
* Log out a user from his external mobile devices (phones, tables, Moodle Desktop app, etc..)
*
* @package tool_mobile
* @copyright 2020 Juan Leyva <juan@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

require(__DIR__ . '/../../../config.php');
require_once($CFG->dirroot . '/admin/tool/mobile/lib.php');
require_once($CFG->dirroot . '/webservice/lib.php');

if (!$CFG->enablemobilewebservice) {
print_error('enablewsdescription', 'webservice');
}

require_login(null, false);

// Require an active user: not guest, not suspended.
core_user::require_active_user($USER);

$redirecturl = new \moodle_url('/user/profile.php');

if (optional_param('confirm', 0, PARAM_INT) && data_submitted()) {
require_sesskey();

// Get the mobile service token to be deleted.
$token = tool_mobile_get_token($USER->id);

if ($token) {
$webservicemanager = new webservice();
$webservicemanager->delete_user_ws_token($token->id);
}
redirect($redirecturl);
}

// Page settings.
$title = get_string('logout');
$context = context_system::instance();
$PAGE->set_url(new \moodle_url('/'.$CFG->admin.'/tool/mobile/logout.php'));
$PAGE->navbar->add($title);
$PAGE->set_context($context);
$PAGE->set_title($SITE->fullname. ': ' . $title);

// Display the page.
echo $OUTPUT->header();

$message = get_string('logoutconfirmation', 'tool_mobile');
$confirmurl = new \moodle_url('logout.php', ['confirm' => 1]);
$yesbutton = new single_button($confirmurl, get_string('yes'), 'post');
$nobutton = new single_button($redirecturl, get_string('no'));
echo $OUTPUT->confirm($message, $yesbutton, $nobutton);

echo $OUTPUT->footer();

0 comments on commit 328396c

Please sign in to comment.