Improve service request processing

Add fallback to earlier outcomes services when one fails Better handling of access tokens
celtic-project · Aug 17, 2020 · e17cbb3 · e17cbb3
1 parent 6b5a81f
commit e17cbb3
Show file tree

Hide file tree

Showing 4 changed files with 188 additions and 122 deletions.
diff --git a/src/AccessToken.php b/src/AccessToken.php
@@ -135,21 +135,26 @@ public function hasScope($scope = '')
      * Obtain a valid access token for a scope.
      *
      * @param string          $scope        Access scope
+     * @param bool            $scopeOnly    If true, a token is requested just for the specified scope
      *
      * @return AccessToken    New access token
      */
-    public function get($scope = '')
+    public function get($scope = '', $scopeOnly = false)
     {
         $url = $this->platform->accessTokenUrl;
         if (!empty($url) && !empty(Tool::$defaultTool) && !empty(Tool::$defaultTool->rsaKey)) {
-            $scopesRequested = Tool::$defaultTool->requiredScopes;
-            if (substr($scope, -9) === '.readonly') {
-                $scope2 = substr($scope, 0, -9);
+            if ($scopeOnly) {
+                $scopesRequested = array($scope);
             } else {
-                $scope2 = $scope;
-            }
-            if (!empty($scope) && !in_array($scope, $scopesRequested) && !in_array($scope2, $scopesRequested)) {
-                $scopesRequested[] = $scope;
+                $scopesRequested = Tool::$defaultTool->requiredScopes;
+                if (substr($scope, -9) === '.readonly') {
+                    $scope2 = substr($scope, 0, -9);
+                } else {
+                    $scope2 = $scope;
+                }
+                if (!empty($scope) && !in_array($scope, $scopesRequested) && !in_array($scope2, $scopesRequested)) {
+                    $scopesRequested[] = $scope;
+                }
             }
             if (!empty($scopesRequested)) {
                 $retry = false;
@@ -174,7 +179,9 @@ public function get($scope = '')
                             $this->scopes = $scopesAccepted;
                             $this->token = $http->responseJson->access_token;
                             $this->expires = time() + $http->responseJson->expires_in;
-                            $this->save();
+                            if (!$scopeOnly) {
+                                $this->save();
+                            }
                         }
                         $retry = false;
                     } elseif ($retry) {