admin/Studio-42-elFinder
1
0
Fork 0
mirror of https://github.com/Studio-42/elFinder synced 2026-06-08 12:37:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[VD] fix error handling when authentication fails

Browse Source
This commit is contained in:
nao-pon
2020-01-10 01:23:56 +09:00
parent 927e8e62f6
commit bea656f8ec
4 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeOneDrive.class.php
+16 -10
View File
@@ -963,6 +963,17 @@ class elFinderVolumeOneDrive extends elFinderVolumeDriver
$error = false;
try {
$this->token = json_decode($this->options['accessToken']);
if (!is_object($this->token)) {
throw new Exception('Required option `accessToken` is invalid JSON.');
}
// make net mount key
if (empty($this->options['netkey'])) {
$this->netMountKey = $this->_od_getInitialToken();
} else {
$this->netMountKey = $this->options['netkey'];
}
if ($this->aTokenFile = $this->_od_getATokenFile()) {
if (empty($this->options['netkey'])) {
if ($this->aTokenFile) {
@@ -979,25 +990,20 @@ class elFinderVolumeOneDrive extends elFinderVolumeDriver
}
$this->_od_refreshToken();
$this->expires = empty($this->token->data->refresh_token) ? (int)$this->token->expires : 0;
} catch (Exception $e) {
$this->token = null;
$error = true;
$this->setError($e->getMessage());
}
$this->expires = empty($this->token->data->refresh_token) ? (int)$this->token->expires : 0;
if (empty($this->options['netkey'])) {
// make net mount key
$this->netMountKey = $this->_od_getInitialToken();
} else {
$this->netMountKey = $this->options['netkey'];
if ($this->netMountKey) {
$this->tmbPrefix = 'onedrive' . base_convert($this->netMountKey, 10, 32);
}
$this->tmbPrefix = 'onedrive' . base_convert($this->netMountKey, 10, 32);
if ($error) {
if (empty($this->options['netkey'])) {
if (empty($this->options['netkey']) && $this->tmbPrefix) {
// for delete thumbnail
$this->netunmount();
}