Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
d0d1684
add overflow ellipsis to session and device tokens list
ChristophWurst Jun 9, 2016
a9ea908
add tooltip to token names
ChristophWurst Jun 10, 2016
663459c
rearrange personal settings sections
ChristophWurst Jun 10, 2016
5d1ef68
Give mysql docker more time to start up
DeepDiver1975 May 9, 2016
bac96e7
Wait for port being accessible in addition to the notify socket
DeepDiver1975 May 11, 2016
a5a66f3
Fix tooltip position in token list
Jun 17, 2016
c4149c5
use token last_activity instead of session value
ChristophWurst Jun 17, 2016
0c0a216
store last check timestamp in token instead of session
ChristophWurst Jun 17, 2016
1889df5
dont create a session token for clients, validate the app password in…
ChristophWurst Jun 17, 2016
8ef5431
fix user session tests
ChristophWurst Jun 20, 2016
9d74ff0
fix nitpick
ChristophWurst Jun 20, 2016
5c68084
fix default token provider tests
ChristophWurst Jun 20, 2016
fb36fd4
fix DefaultTokenMapperTest
ChristophWurst Jun 20, 2016
56199eb
fix unit test warning/errors
ChristophWurst Jun 20, 2016
b805908
update session token password on user password change
ChristophWurst Jun 21, 2016
ca16826
Filter out group shares for owner where owner is included (#25190)
Jun 21, 2016
db11c20
pass new password instead of username
ChristophWurst Jun 21, 2016
af98e3e
Merge pull request #25042 from owncloud/session-settings-ellipsis
Jun 21, 2016
f2f1eab
fix broken unit test (#25198)
DeepDiver1975 Jun 21, 2016
1452b74
Contacts API: replace raw image data with url (#25081)
georgehrke Jun 21, 2016
195fc5b
Merge pull request #25196 from owncloud/update-session-token-password
ChristophWurst Jun 21, 2016
7f22aeb
redirect to new login route (#25099)
ChristophWurst Jun 21, 2016
755c86e
Merge pull request #24505 from owncloud/ceph-wait-for-http
Jun 21, 2016
704a993
Fix null pointer exception in user_ldap (#25062)
butonic Jun 21, 2016
31f3aaa
app passwords/device tokens wording
ChristophWurst Jun 16, 2016
2c1db51
fix tranlations
ChristophWurst Jun 16, 2016
178fa11
use theme name instead of hard-coded 'ownCloud'
ChristophWurst Jun 16, 2016
c8b7a05
Fire hooks for mkdir for folder upload
karakayasemi Jun 21, 2016
b85bccc
[tx-robot] updated from transifex
Jun 22, 2016
c49ff83
Merge pull request #25208 from owncloud/uploadfolder-firemkdirhooksfo…
Jun 22, 2016
3e763ac
Add timeouts to make the UI usable again when a remote share is unrea…
nickvergessen Jun 15, 2016
ec968a4
Increase fed share timeout from 3 to 10 + unit tests
Jun 21, 2016
854352d
occ web executor (#24957)
VicDeo Jun 22, 2016
eed1c52
Hide more default options in occ files_external:list
icewind1991 Jun 22, 2016
293ae8a
Merge pull request #25134 from owncloud/app-passwords
Jun 22, 2016
3db5de9
Merge pull request #25172 from owncloud/token-login-validation
Jun 22, 2016
fa3dc90
Rollback version must also adjust cached size
Jun 22, 2016
963d8a8
Merge pull request #25123 from owncloud/issue-23005-broken-remote-shares
Jun 22, 2016
d5f4328
Merge pull request #25223 from owncloud/external-list-default-options
Jun 22, 2016
ae50e72
Merge pull request #25225 from owncloud/enc-revertversionsize
Jun 22, 2016
4a2fb1b
Init the headers in iedavclient.js
Jun 22, 2016
d47262e
Merge pull request #25233 from owncloud/iedavclient-nullheaders
MorrisJobke Jun 22, 2016
1e1903e
[tx-robot] updated from transifex
Jun 23, 2016
508c580
Fix trashed file name corruption when rerendering trashbin list
Jun 23, 2016
97f1813
Don't reload page in case of auth errors during setup checks
Jun 23, 2016
bac1a3a
Add option to `occ files_external:list` to show all configured mounts
icewind1991 Jun 17, 2016
cc2aec1
Merge pull request #25238 from owncloud/files-trashlistnamecorruption
Jun 23, 2016
29068d3
[tx-robot] updated from transifex
Jun 24, 2016
dc78d26
Merge pull request #25239 from owncloud/setupchecks-preventreload
Jun 24, 2016
56ad4cd
Show error message when posting an invalid comment
Jun 24, 2016
04e3da0
Merge pull request #25171 from owncloud/files_external-list-all
Jun 24, 2016
bf3ee69
Fix search result link for file results outside default list
Jun 24, 2016
39b533d
Hide search results after switching directory
Jun 24, 2016
e9a0a6d
Merge pull request #25257 from owncloud/comments-showerroronsave
ChristophWurst Jun 24, 2016
c295523
Merge pull request #25259 from owncloud/search-fixsearchfromotherfile…
ChristophWurst Jun 24, 2016
3d65979
[tx-robot] updated from transifex
Jun 25, 2016
52eab2a
[tx-robot] updated from transifex
Jun 26, 2016
7a9d60d
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
LukasReschke Jun 26, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix DefaultTokenMapperTest
  • Loading branch information
ChristophWurst committed Jun 20, 2016
commit fb36fd495b2b97063a13239f214909011d0b1385
4 changes: 4 additions & 0 deletions tests/lib/Authentication/Token/DefaultTokenMapperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ private function resetDatabase() {
'token' => $qb->createNamedParameter('9c5a2e661482b65597408a6bb6c4a3d1af36337381872ac56e445a06cdb7fea2b1039db707545c11027a4966919918b19d875a8b774840b18c6cbb7ae56fe206'),
'type' => $qb->createNamedParameter(IToken::TEMPORARY_TOKEN),
'last_activity' => $qb->createNamedParameter($this->time - 120, IQueryBuilder::PARAM_INT), // Two minutes ago
'last_check' => $this->time - 60 * 10, // 10mins ago
])->execute();
$qb->insert('authtoken')->values([
'uid' => $qb->createNamedParameter('user2'),
Expand All @@ -72,6 +73,7 @@ private function resetDatabase() {
'token' => $qb->createNamedParameter('1504445f1524fc801035448a95681a9378ba2e83930c814546c56e5d6ebde221198792fd900c88ed5ead0555780dad1ebce3370d7e154941cd5de87eb419899b'),
'type' => $qb->createNamedParameter(IToken::TEMPORARY_TOKEN),
'last_activity' => $qb->createNamedParameter($this->time - 60 * 60 * 24 * 3, IQueryBuilder::PARAM_INT), // Three days ago
'last_check' => $this->time - 10, // 10secs ago
])->execute();
$qb->insert('authtoken')->values([
'uid' => $qb->createNamedParameter('user1'),
Expand All @@ -81,6 +83,7 @@ private function resetDatabase() {
'token' => $qb->createNamedParameter('47af8697ba590fb82579b5f1b3b6e8066773a62100abbe0db09a289a62f5d980dc300fa3d98b01d7228468d1ab05c1aa14c8d14bd5b6eee9cdf1ac14864680c3'),
'type' => $qb->createNamedParameter(IToken::TEMPORARY_TOKEN),
'last_activity' => $qb->createNamedParameter($this->time - 120, IQueryBuilder::PARAM_INT), // Two minutes ago
'last_check' => $this->time - 60 * 10, // 10mins ago
])->execute();
}

Expand Down Expand Up @@ -127,6 +130,7 @@ public function testGetToken() {
$token->setToken('1504445f1524fc801035448a95681a9378ba2e83930c814546c56e5d6ebde221198792fd900c88ed5ead0555780dad1ebce3370d7e154941cd5de87eb419899b');
$token->setType(IToken::TEMPORARY_TOKEN);
$token->setLastActivity($this->time - 60 * 60 * 24 * 3);
$token->setLastCheck($this->time - 10);

$dbToken = $this->mapper->getToken($token->getToken());

Expand Down