Browse Source

Merge pull request #44970 from nextcloud/dependabot/composer/php-opencloud/openstack-3.10.0

chore(deps): Bump php-opencloud/openstack from 3.2.1 to 3.10.0
forbid-moving-subfolder
Joas Schilling 1 week ago
parent
commit
c0b54c7577
No account linked to committer's email address
2 changed files with 5 additions and 2 deletions
  1. 1
    1
      3rdparty
  2. 4
    1
      lib/private/Files/ObjectStore/SwiftV2CachingAuthService.php

+ 1
- 1
3rdparty

@@ -1 +1 @@
Subproject commit 87b53659c4a128ce87aa0ffb8c0d830c62655034
Subproject commit 96117a5a80146c10442c0d7a43ad356b254523d2

+ 4
- 1
lib/private/Files/ObjectStore/SwiftV2CachingAuthService.php View File

@@ -25,11 +25,14 @@ declare(strict_types=1);
*/
namespace OC\Files\ObjectStore;

use OpenStack\Common\Auth\Token;
use OpenStack\Identity\v2\Service;

class SwiftV2CachingAuthService extends Service {
public function authenticate(array $options = []): array {
if (!empty($options['v2cachedToken'])) {
if (isset($options['v2cachedToken'], $options['v2serviceUrl'])
&& $options['v2cachedToken'] instanceof Token
&& is_string($options['v2serviceUrl'])) {
return [$options['v2cachedToken'], $options['v2serviceUrl']];
} else {
return parent::authenticate($options);

Loading…
Cancel
Save