add button to invalidate browser sessions/device tokens
This commit is contained in:
parent
6495534bcd
commit
74277c25be
|
@ -22,14 +22,12 @@
|
||||||
|
|
||||||
namespace OC\Authentication\Token;
|
namespace OC\Authentication\Token;
|
||||||
|
|
||||||
use JsonSerializable;
|
|
||||||
use OCP\AppFramework\Db\Entity;
|
use OCP\AppFramework\Db\Entity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @method void setId(int $id)
|
* @method void setId(int $id)
|
||||||
* @method void setUid(string $uid);
|
* @method void setUid(string $uid);
|
||||||
* @method void setPassword(string $password)
|
* @method void setPassword(string $password)
|
||||||
* @method string getPassword()
|
|
||||||
* @method void setName(string $name)
|
* @method void setName(string $name)
|
||||||
* @method string getName()
|
* @method string getName()
|
||||||
* @method void setToken(string $token)
|
* @method void setToken(string $token)
|
||||||
|
@ -39,7 +37,7 @@ use OCP\AppFramework\Db\Entity;
|
||||||
* @method void setLastActivity(int $lastActivity)
|
* @method void setLastActivity(int $lastActivity)
|
||||||
* @method int getLastActivity()
|
* @method int getLastActivity()
|
||||||
*/
|
*/
|
||||||
class DefaultToken extends Entity implements IToken, JsonSerializable {
|
class DefaultToken extends Entity implements IToken {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string user UID
|
* @var string user UID
|
||||||
|
|
|
@ -111,4 +111,17 @@ class DefaultTokenMapper extends Mapper {
|
||||||
return $entities;
|
return $entities;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param IUser $user
|
||||||
|
* @param int $id
|
||||||
|
*/
|
||||||
|
public function deleteById(IUser $user, $id) {
|
||||||
|
/* @var $qb IQueryBuilder */
|
||||||
|
$qb = $this->db->getQueryBuilder();
|
||||||
|
$qb->delete('authtoken')
|
||||||
|
->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
|
||||||
|
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())));
|
||||||
|
$qb->execute();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -150,6 +150,16 @@ class DefaultTokenProvider implements IProvider {
|
||||||
$this->mapper->invalidate($this->hashToken($token));
|
$this->mapper->invalidate($this->hashToken($token));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Invalidate (delete) the given token
|
||||||
|
*
|
||||||
|
* @param IUser $user
|
||||||
|
* @param int $id
|
||||||
|
*/
|
||||||
|
public function invalidateTokenById(IUser $user, $id) {
|
||||||
|
$this->mapper->deleteById($user, $id);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Invalidate (delete) old session tokens
|
* Invalidate (delete) old session tokens
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -47,7 +47,7 @@ interface IProvider {
|
||||||
* @return IToken
|
* @return IToken
|
||||||
*/
|
*/
|
||||||
public function getToken($tokenId) ;
|
public function getToken($tokenId) ;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $token
|
* @param string $token
|
||||||
* @throws InvalidTokenException
|
* @throws InvalidTokenException
|
||||||
|
@ -62,6 +62,14 @@ interface IProvider {
|
||||||
*/
|
*/
|
||||||
public function invalidateToken($token);
|
public function invalidateToken($token);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Invalidate (delete) the given token
|
||||||
|
*
|
||||||
|
* @param IUser $user
|
||||||
|
* @param int $id
|
||||||
|
*/
|
||||||
|
public function invalidateTokenById(IUser $user, $id);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update token activity timestamp
|
* Update token activity timestamp
|
||||||
*
|
*
|
||||||
|
|
|
@ -22,7 +22,9 @@
|
||||||
|
|
||||||
namespace OC\Authentication\Token;
|
namespace OC\Authentication\Token;
|
||||||
|
|
||||||
interface IToken {
|
use JsonSerializable;
|
||||||
|
|
||||||
|
interface IToken extends JsonSerializable {
|
||||||
|
|
||||||
const TEMPORARY_TOKEN = 0;
|
const TEMPORARY_TOKEN = 0;
|
||||||
const PERMANENT_TOKEN = 1;
|
const PERMANENT_TOKEN = 1;
|
||||||
|
@ -30,7 +32,7 @@ interface IToken {
|
||||||
/**
|
/**
|
||||||
* Get the token ID
|
* Get the token ID
|
||||||
*
|
*
|
||||||
* @return string
|
* @return int
|
||||||
*/
|
*/
|
||||||
public function getId();
|
public function getId();
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,8 @@ class AuthSettingsController extends Controller {
|
||||||
* @param ISecureRandom $random
|
* @param ISecureRandom $random
|
||||||
* @param string $uid
|
* @param string $uid
|
||||||
*/
|
*/
|
||||||
public function __construct($appName, IRequest $request, IProvider $tokenProvider, IUserManager $userManager, ISession $session, ISecureRandom $random, $uid) {
|
public function __construct($appName, IRequest $request, IProvider $tokenProvider, IUserManager $userManager,
|
||||||
|
ISession $session, ISecureRandom $random, $uid) {
|
||||||
parent::__construct($appName, $request);
|
parent::__construct($appName, $request);
|
||||||
$this->tokenProvider = $tokenProvider;
|
$this->tokenProvider = $tokenProvider;
|
||||||
$this->userManager = $userManager;
|
$this->userManager = $userManager;
|
||||||
|
@ -131,4 +132,20 @@ class AuthSettingsController extends Controller {
|
||||||
return implode('-', $groups);
|
return implode('-', $groups);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @NoAdminRequired
|
||||||
|
* @NoSubadminRequired
|
||||||
|
*
|
||||||
|
* @return JSONResponse
|
||||||
|
*/
|
||||||
|
public function destroy($id) {
|
||||||
|
$user = $this->userManager->get($this->uid);
|
||||||
|
if (is_null($user)) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->tokenProvider->invalidateTokenById($user, $id);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -114,18 +114,22 @@ table.nostyle td { padding: 0.2em 0; }
|
||||||
#sessions table td,
|
#sessions table td,
|
||||||
#devices table th,
|
#devices table th,
|
||||||
#devices table td {
|
#devices table td {
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#sessions .token-list td,
|
#sessions .token-list td,
|
||||||
#devices .token-list td {
|
#devices .token-list td {
|
||||||
border-top: 1px solid #DDD;
|
border-top: 1px solid #DDD;
|
||||||
|
}
|
||||||
|
#sessions .token-list td a.icon-delete,
|
||||||
|
#devices .token-list td a.icon-delete {
|
||||||
|
display: block;
|
||||||
|
opacity: 0.6;
|
||||||
}
|
}
|
||||||
|
|
||||||
#device-new-token {
|
#device-new-token {
|
||||||
padding: 10px;
|
width: 186px;
|
||||||
font-family: monospace;
|
font-family: monospace;
|
||||||
font-size: 1.4em;
|
|
||||||
background-color: lightyellow;
|
background-color: lightyellow;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,9 +26,25 @@
|
||||||
OC.Settings = OC.Settings || {};
|
OC.Settings = OC.Settings || {};
|
||||||
|
|
||||||
var AuthTokenCollection = Backbone.Collection.extend({
|
var AuthTokenCollection = Backbone.Collection.extend({
|
||||||
|
|
||||||
model: OC.Settings.AuthToken,
|
model: OC.Settings.AuthToken,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show recently used sessions/devices first
|
||||||
|
*
|
||||||
|
* @param {OC.Settigns.AuthToken} t1
|
||||||
|
* @param {OC.Settigns.AuthToken} t2
|
||||||
|
* @returns {Boolean}
|
||||||
|
*/
|
||||||
|
comparator: function (t1, t2) {
|
||||||
|
var ts1 = parseInt(t1.get('lastActivity'), 10);
|
||||||
|
var ts2 = parseInt(t2.get('lastActivity'), 10);
|
||||||
|
return ts1 < ts2;
|
||||||
|
},
|
||||||
|
|
||||||
tokenType: null,
|
tokenType: null,
|
||||||
url: OC.generateUrl('/settings/personal/authtokens'),
|
|
||||||
|
url: OC.generateUrl('/settings/personal/authtokens')
|
||||||
});
|
});
|
||||||
|
|
||||||
OC.Settings.AuthTokenCollection = AuthTokenCollection;
|
OC.Settings.AuthTokenCollection = AuthTokenCollection;
|
||||||
|
|
|
@ -26,62 +26,110 @@
|
||||||
OC.Settings = OC.Settings || {};
|
OC.Settings = OC.Settings || {};
|
||||||
|
|
||||||
var TEMPLATE_TOKEN =
|
var TEMPLATE_TOKEN =
|
||||||
'<tr>'
|
'<tr data-id="{{id}}">'
|
||||||
+ '<td>{{name}}</td>'
|
+ '<td>{{name}}</td>'
|
||||||
+ '<td>{{lastActivity}}</td>'
|
+ '<td><span class="last-activity" title="{{lastActivityTime}}">{{lastActivity}}</span></td>'
|
||||||
|
+ '<td><a class="icon-delete" title="' + t('core', 'Disconnect') + '"></a></td>'
|
||||||
+ '<tr>';
|
+ '<tr>';
|
||||||
|
|
||||||
var SubView = Backbone.View.extend({
|
var SubView = Backbone.View.extend({
|
||||||
collection: null,
|
collection: null,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* token type
|
||||||
|
* - 0: browser
|
||||||
|
* - 1: device
|
||||||
|
*
|
||||||
|
* @see OC\Authentication\Token\IToken
|
||||||
|
*/
|
||||||
type: 0,
|
type: 0,
|
||||||
template: Handlebars.compile(TEMPLATE_TOKEN),
|
|
||||||
|
_template: undefined,
|
||||||
|
|
||||||
|
template: function(data) {
|
||||||
|
if (_.isUndefined(this._template)) {
|
||||||
|
this._template = Handlebars.compile(TEMPLATE_TOKEN);
|
||||||
|
}
|
||||||
|
|
||||||
|
return this._template(data);
|
||||||
|
},
|
||||||
|
|
||||||
initialize: function(options) {
|
initialize: function(options) {
|
||||||
this.type = options.type;
|
this.type = options.type;
|
||||||
this.collection = options.collection;
|
this.collection = options.collection;
|
||||||
|
|
||||||
|
this.on(this.collection, 'change', this.render);
|
||||||
},
|
},
|
||||||
|
|
||||||
render: function() {
|
render: function() {
|
||||||
var _this = this;
|
var _this = this;
|
||||||
|
|
||||||
var list = this.$el.find('.token-list');
|
var list = this.$('.token-list');
|
||||||
var tokens = this.collection.filter(function(token) {
|
var tokens = this.collection.filter(function(token) {
|
||||||
return parseInt(token.get('type')) === _this.type;
|
return parseInt(token.get('type'), 10) === _this.type;
|
||||||
});
|
});
|
||||||
list.html('');
|
list.html('');
|
||||||
|
|
||||||
|
// Show header only if there are tokens to show
|
||||||
|
console.log(tokens.length > 0);
|
||||||
|
this._toggleHeader(tokens.length > 0);
|
||||||
|
|
||||||
tokens.forEach(function(token) {
|
tokens.forEach(function(token) {
|
||||||
var viewData = token.toJSON();
|
var viewData = token.toJSON();
|
||||||
viewData.lastActivity = moment(viewData.lastActivity, 'X').
|
var ts = viewData.lastActivity * 1000;
|
||||||
format('LLL');
|
viewData.lastActivity = OC.Util.relativeModifiedDate(ts);
|
||||||
|
viewData.lastActivityTime = OC.Util.formatDate(ts, 'LLL');
|
||||||
var html = _this.template(viewData);
|
var html = _this.template(viewData);
|
||||||
list.append(html);
|
var $html = $(html);
|
||||||
|
$html.find('.last-activity').tooltip();
|
||||||
|
$html.find('.icon-delete').tooltip();
|
||||||
|
list.append($html);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
toggleLoading: function(state) {
|
toggleLoading: function(state) {
|
||||||
this.$el.find('.token-list').toggleClass('icon-loading', state);
|
this.$('.token-list').toggleClass('icon-loading', state);
|
||||||
|
},
|
||||||
|
|
||||||
|
_toggleHeader: function(show) {
|
||||||
|
this.$('.hidden-when-empty').toggleClass('hidden', !show);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
var AuthTokenView = Backbone.View.extend({
|
var AuthTokenView = Backbone.View.extend({
|
||||||
collection: null,
|
collection: null,
|
||||||
|
|
||||||
_views: [],
|
_views: [],
|
||||||
|
|
||||||
_form: undefined,
|
_form: undefined,
|
||||||
|
|
||||||
_tokenName: undefined,
|
_tokenName: undefined,
|
||||||
|
|
||||||
_addTokenBtn: undefined,
|
_addTokenBtn: undefined,
|
||||||
|
|
||||||
_result: undefined,
|
_result: undefined,
|
||||||
|
|
||||||
_newToken: undefined,
|
_newToken: undefined,
|
||||||
|
|
||||||
_hideTokenBtn: undefined,
|
_hideTokenBtn: undefined,
|
||||||
|
|
||||||
_addingToken: false,
|
_addingToken: false,
|
||||||
|
|
||||||
initialize: function(options) {
|
initialize: function(options) {
|
||||||
this.collection = options.collection;
|
this.collection = options.collection;
|
||||||
|
|
||||||
var tokenTypes = [0, 1];
|
var tokenTypes = [0, 1];
|
||||||
var _this = this;
|
var _this = this;
|
||||||
_.each(tokenTypes, function(type) {
|
_.each(tokenTypes, function(type) {
|
||||||
|
var el = type === 0 ? '#sessions' : '#devices';
|
||||||
_this._views.push(new SubView({
|
_this._views.push(new SubView({
|
||||||
el: type === 0 ? '#sessions' : '#devices',
|
el: el,
|
||||||
type: type,
|
type: type,
|
||||||
collection: _this.collection
|
collection: _this.collection
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
var $el = $(el);
|
||||||
|
$el.on('click', 'a.icon-delete', _.bind(_this._onDeleteToken, _this));
|
||||||
});
|
});
|
||||||
|
|
||||||
this._form = $('#device-token-form');
|
this._form = $('#device-token-form');
|
||||||
|
@ -91,15 +139,18 @@
|
||||||
|
|
||||||
this._result = $('#device-token-result');
|
this._result = $('#device-token-result');
|
||||||
this._newToken = $('#device-new-token');
|
this._newToken = $('#device-new-token');
|
||||||
|
this._newToken.on('focus', _.bind(this._onNewTokenFocus, this));
|
||||||
this._hideTokenBtn = $('#device-token-hide');
|
this._hideTokenBtn = $('#device-token-hide');
|
||||||
this._hideTokenBtn.click(_.bind(this._hideToken, this));
|
this._hideTokenBtn.click(_.bind(this._hideToken, this));
|
||||||
},
|
},
|
||||||
|
|
||||||
render: function() {
|
render: function() {
|
||||||
_.each(this._views, function(view) {
|
_.each(this._views, function(view) {
|
||||||
view.render();
|
view.render();
|
||||||
view.toggleLoading(false);
|
view.toggleLoading(false);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
reload: function() {
|
reload: function() {
|
||||||
var _this = this;
|
var _this = this;
|
||||||
|
|
||||||
|
@ -116,6 +167,7 @@
|
||||||
OC.Notification.showTemporary(t('core', 'Error while loading browser sessions and device tokens'));
|
OC.Notification.showTemporary(t('core', 'Error while loading browser sessions and device tokens'));
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
_addDeviceToken: function() {
|
_addDeviceToken: function() {
|
||||||
var _this = this;
|
var _this = this;
|
||||||
this._toggleAddingToken(true);
|
this._toggleAddingToken(true);
|
||||||
|
@ -131,8 +183,9 @@
|
||||||
$.when(creatingToken).done(function(resp) {
|
$.when(creatingToken).done(function(resp) {
|
||||||
_this.collection.add(resp.deviceToken);
|
_this.collection.add(resp.deviceToken);
|
||||||
_this.render();
|
_this.render();
|
||||||
_this._newToken.text(resp.token);
|
_this._newToken.val(resp.token);
|
||||||
_this._toggleFormResult(false);
|
_this._toggleFormResult(false);
|
||||||
|
_this._newToken.select();
|
||||||
_this._tokenName.val('');
|
_this._tokenName.val('');
|
||||||
});
|
});
|
||||||
$.when(creatingToken).fail(function() {
|
$.when(creatingToken).fail(function() {
|
||||||
|
@ -142,13 +195,42 @@
|
||||||
_this._toggleAddingToken(false);
|
_this._toggleAddingToken(false);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
_onNewTokenFocus: function() {
|
||||||
|
this._newToken.select();
|
||||||
|
},
|
||||||
|
|
||||||
_hideToken: function() {
|
_hideToken: function() {
|
||||||
this._toggleFormResult(true);
|
this._toggleFormResult(true);
|
||||||
},
|
},
|
||||||
|
|
||||||
_toggleAddingToken: function(state) {
|
_toggleAddingToken: function(state) {
|
||||||
this._addingToken = state;
|
this._addingToken = state;
|
||||||
this._addTokenBtn.toggleClass('icon-loading-small', state);
|
this._addTokenBtn.toggleClass('icon-loading-small', state);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
_onDeleteToken: function(event) {
|
||||||
|
var $target = $(event.target);
|
||||||
|
var $row = $target.closest('tr');
|
||||||
|
var id = $row.data('id');
|
||||||
|
|
||||||
|
var token = this.collection.get(id);
|
||||||
|
if (_.isUndefined(token)) {
|
||||||
|
// Ignore event
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var destroyingToken = token.destroy();
|
||||||
|
|
||||||
|
var _this = this;
|
||||||
|
$.when(destroyingToken).fail(function() {
|
||||||
|
OC.Notification.showTemporary(t('core', 'Error while deleting the token'));
|
||||||
|
});
|
||||||
|
$.when(destroyingToken).always(function() {
|
||||||
|
_this.render();
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
_toggleFormResult: function(showForm) {
|
_toggleFormResult: function(showForm) {
|
||||||
this._form.toggleClass('hidden', !showForm);
|
this._form.toggleClass('hidden', !showForm);
|
||||||
this._result.toggleClass('hidden', showForm);
|
this._result.toggleClass('hidden', showForm);
|
||||||
|
|
|
@ -141,12 +141,12 @@ if($_['passwordChangeSupported']) {
|
||||||
|
|
||||||
<div id="sessions" class="section">
|
<div id="sessions" class="section">
|
||||||
<h2><?php p($l->t('Sessions'));?></h2>
|
<h2><?php p($l->t('Sessions'));?></h2>
|
||||||
<?php p($l->t('These are the web browsers currently logged in to your ownCloud.'));?>
|
<span class="hidden-when-empty"><?php p($l->t('These are the web browsers currently logged in to your ownCloud.'));?></span>
|
||||||
<table>
|
<table>
|
||||||
<thead>
|
<thead class="token-list-header">
|
||||||
<tr>
|
<tr>
|
||||||
<th>Browser</th>
|
<th><?php p($l->t('Browser'));?></th>
|
||||||
<th>Most recent activity</th>
|
<th><?php p($l->t('Most recent activity'));?></th>
|
||||||
<th></th>
|
<th></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
@ -157,13 +157,13 @@ if($_['passwordChangeSupported']) {
|
||||||
|
|
||||||
<div id="devices" class="section">
|
<div id="devices" class="section">
|
||||||
<h2><?php p($l->t('Devices'));?></h2>
|
<h2><?php p($l->t('Devices'));?></h2>
|
||||||
<?php p($l->t("You've linked these devices."));?>
|
<span class="hidden-when-empty"><?php p($l->t("You've linked these devices."));?></span>
|
||||||
<table>
|
<table>
|
||||||
<thead>
|
<thead class="hidden-when-empty">
|
||||||
<tr>
|
<tr>
|
||||||
<th>Name</th>
|
<th><?php p($l->t('Name'));?></th>
|
||||||
<th>Most recent activity</th>
|
<th><?php p($l->t('Most recent activity'));?></th>
|
||||||
<th><a class="icon-delete"></a></th>
|
<th></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="token-list icon-loading">
|
<tbody class="token-list icon-loading">
|
||||||
|
@ -175,7 +175,7 @@ if($_['passwordChangeSupported']) {
|
||||||
<button id="device-add-token" class="button">Create new device password</button>
|
<button id="device-add-token" class="button">Create new device password</button>
|
||||||
</div>
|
</div>
|
||||||
<div id="device-token-result" class="hidden">
|
<div id="device-token-result" class="hidden">
|
||||||
<span id="device-new-token"></span>
|
<input id="device-new-token" type="text" readonly="readonly"/>
|
||||||
<button id="device-token-hide" class="button">Done</button>
|
<button id="device-token-hide" class="button">Done</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -159,4 +159,31 @@ class DefaultTokenMapperTest extends TestCase {
|
||||||
$this->assertCount(0, $this->mapper->getTokenByUser($user));
|
$this->assertCount(0, $this->mapper->getTokenByUser($user));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testDeleteById() {
|
||||||
|
$user = $this->getMock('\OCP\IUser');
|
||||||
|
$qb = $this->dbConnection->getQueryBuilder();
|
||||||
|
$qb->select('id')
|
||||||
|
->from('authtoken')
|
||||||
|
->where($qb->expr()->eq('token', $qb->createNamedParameter('9c5a2e661482b65597408a6bb6c4a3d1af36337381872ac56e445a06cdb7fea2b1039db707545c11027a4966919918b19d875a8b774840b18c6cbb7ae56fe206')));
|
||||||
|
$result = $qb->execute();
|
||||||
|
$id = $result->fetch()['id'];
|
||||||
|
$user->expects($this->once())
|
||||||
|
->method('getUID')
|
||||||
|
->will($this->returnValue('user1'));
|
||||||
|
|
||||||
|
$this->mapper->deleteById($user, $id);
|
||||||
|
$this->assertEquals(2, $this->getNumberOfTokens());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testDeleteByIdWrongUser() {
|
||||||
|
$user = $this->getMock('\OCP\IUser');
|
||||||
|
$id = 33;
|
||||||
|
$user->expects($this->once())
|
||||||
|
->method('getUID')
|
||||||
|
->will($this->returnValue('user10000'));
|
||||||
|
|
||||||
|
$this->mapper->deleteById($user, $id);
|
||||||
|
$this->assertEquals(3, $this->getNumberOfTokens());
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -170,6 +170,17 @@ class DefaultTokenProviderTest extends TestCase {
|
||||||
$this->tokenProvider->invalidateToken('token7');
|
$this->tokenProvider->invalidateToken('token7');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testInvaildateTokenById() {
|
||||||
|
$id = 123;
|
||||||
|
$user = $this->getMock('\OCP\IUser');
|
||||||
|
|
||||||
|
$this->mapper->expects($this->once())
|
||||||
|
->method('deleteById')
|
||||||
|
->with($user, $id);
|
||||||
|
|
||||||
|
$this->tokenProvider->invalidateTokenById($user, $id);
|
||||||
|
}
|
||||||
|
|
||||||
public function testInvalidateOldTokens() {
|
public function testInvalidateOldTokens() {
|
||||||
$defaultSessionLifetime = 60 * 60 * 24;
|
$defaultSessionLifetime = 60 * 60 * 24;
|
||||||
$this->config->expects($this->once())
|
$this->config->expects($this->once())
|
||||||
|
|
|
@ -138,4 +138,19 @@ class AuthSettingsControllerTest extends TestCase {
|
||||||
$this->assertEquals($expected, $this->controller->create($name));
|
$this->assertEquals($expected, $this->controller->create($name));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testDestroy() {
|
||||||
|
$id = 123;
|
||||||
|
$user = $this->getMock('\OCP\IUser');
|
||||||
|
|
||||||
|
$this->userManager->expects($this->once())
|
||||||
|
->method('get')
|
||||||
|
->with($this->uid)
|
||||||
|
->will($this->returnValue($user));
|
||||||
|
$this->tokenProvider->expects($this->once())
|
||||||
|
->method('invalidateTokenById')
|
||||||
|
->with($user, $id);
|
||||||
|
|
||||||
|
$this->assertEquals([], $this->controller->destroy($id));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue