Merge pull request #14175 from skydiablo/master

MorrisJobke · web-flow · commit debd32b461c8 · 2019-03-05T18:59:45.000+01:00
Fix ObjectStorage expired token (v3)
diff --git a/lib/private/Files/ObjectStore/SwiftFactory.php b/lib/private/Files/ObjectStore/SwiftFactory.php
@@ -174,6 +174,7 @@ private function auth($authService, string $cacheKey) {
 		}
 
 		if (!$hasValidCachedToken) {
+			unset($this->params['cachedToken']);
 			try {
 				list($token, $serviceUrl) = $authService->authenticate($this->params);
 				$this->cacheToken($token, $serviceUrl, $cacheKey);

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,7 @@ private function auth($authService, string $cacheKey) {`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`if (!$hasValidCachedToken) {`
	`177`	`+ unset($this->params['cachedToken']);`
`177`	`178`	`try {`
`178`	`179`	`list($token, $serviceUrl) = $authService->authenticate($this->params);`
`179`	`180`	`$this->cacheToken($token, $serviceUrl, $cacheKey);`