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:Box,OneDrive] correction of handling of refrash_token

Browse Source
This commit is contained in:
nao-pon
2020-01-02 23:18:49 +09:00
parent 1e7f675356
commit 82aff964a0
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeBox.class.php
+13 -9
View File
@@ -213,13 +213,6 @@ class elFinderVolumeBox extends elFinderVolumeDriver
protected function _bd_refreshToken()
{
if (!property_exists($this->token, 'expires') || $this->token->expires < time()) {
if (empty($this->token->data->refresh_token)) {
throw new \Exception(elFinder::ERROR_REAUTH_REQUIRE);
} else {
$refresh_token = $this->token->data->refresh_token;
$initialToken = empty($this->token->initialToken)? $refresh_token : $this->token->initialToken;
}
if (!$this->options['client_id']) {
$this->options['client_id'] = ELFINDER_BOX_CLIENTID;
}
@@ -228,6 +221,13 @@ class elFinderVolumeBox extends elFinderVolumeDriver
$this->options['client_secret'] = ELFINDER_BOX_CLIENTSECRET;
}
if (empty($this->token->data->refresh_token)) {
throw new \Exception(elFinder::ERROR_REAUTH_REQUIRE);
} else {
$refresh_token = $this->token->data->refresh_token;
$initialToken = empty($this->token->initialToken)? md5($this->options['client_id'] . $refresh_token) : $this->token->initialToken;
}
$url = self::TOKEN_URL;
$curl = curl_init();
@@ -591,7 +591,7 @@ class elFinderVolumeBox extends elFinderVolumeDriver
$this->tmp = $tmp;
}
if ($tmp) {
$aTokenFile = $tmp . DIRECTORY_SEPARATOR . md5($this->options['client_id'] . (empty($this->token->initialToken)? $this->token->data->refresh_token : $this->token->initialToken)) . '.btoken';
$aTokenFile = $tmp . DIRECTORY_SEPARATOR . (empty($this->token->initialToken)? md5($this->options['client_id'] . $this->token->data->refresh_token) : $this->token->initialToken) . '.btoken';
}
return $aTokenFile;
}
@@ -836,14 +836,18 @@ class elFinderVolumeBox extends elFinderVolumeDriver
try {
$this->token = json_decode($this->options['accessToken']);
$this->aTokenFile = $this->_bd_getATokenFile();
if (empty($this->options['netkey'])) {
if ($this->aTokenFile = $this->_bd_getATokenFile()) {
if ($this->aTokenFile) {
if (is_file($this->aTokenFile)) {
$this->token = json_decode(file_get_contents($this->aTokenFile));
} else {
file_put_contents($this->aTokenFile, $this->token);
}
}
} else if (is_file($this->aTokenFile)) {
// If the refresh token is the same as the permanent volume
$this->token = json_decode(file_get_contents($this->aTokenFile));
}
$this->_bd_refreshToken();