Merge pull request #44970 from nextcloud/dependabot/composer/php-open…

…cloud/openstack-3.10.0 chore(deps): Bump php-opencloud/openstack from 3.2.1 to 3.10.0
nextcloud · Apr 24, 2024 · c0b54c7 · c0b54c7
2 parents 8599a5e + cdb40a3
commit c0b54c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/3rdparty b/3rdparty
diff --git a/lib/private/Files/ObjectStore/SwiftV2CachingAuthService.php b/lib/private/Files/ObjectStore/SwiftV2CachingAuthService.php
@@ -25,11 +25,14 @@
  */
 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);