Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): Bump php-opencloud/openstack from 3.2.1 to 3.10.0 #44970

Merged
merged 2 commits into from
Apr 24, 2024
Merged

chore(deps): Bump php-opencloud/openstack from 3.2.1 to 3.10.0 #44970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
144936a
chore(deps): Bump php-opencloud/openstack from 3.2.1 to 3.10.0
nickvergessen Apr 22, 2024
cdb40a3
fix(openstack): Fix psalm issue with updated openstack version
nickvergessen Apr 23, 2024
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
2 changes: 1 addition & 1 deletion 3rdparty
Open in desktop
Submodule 3rdparty updated 115 files
5 changes: 4 additions & 1 deletion lib/private/Files/ObjectStore/SwiftV2CachingAuthService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading