Merge pull request #23 from bwaidelich/feature/22-token-default-lifetime

FEATURE: Token default lifetime

Author: robertlemke

Classes/OAuthClient.php

@@ -75,6 +75,12 @@ abstract class OAuthClient
      */
     protected $garbageCollectionProbability;
 
+    /**
+     * @Flow\InjectConfiguration(path="token.defaultLifetime", package="Flownative.OAuth2.Client")
+     * @var int|null
+     */
+    protected $defaultTokenLifetime;
+
     /**
      * @var Client
      */
@@ -261,6 +267,10 @@ public function startAuthorization(string $clientId, string $clientSecret, UriIn
     {
         $authorizationId = Authorization::generateAuthorizationIdForAuthorizationCodeGrant($this->getServiceType(), $this->getServiceName(), $clientId);
         $authorization = new Authorization($authorizationId, $this->getServiceType(), $clientId, Authorization::GRANT_AUTHORIZATION_CODE, $scope);
+        if ($this->defaultTokenLifetime !== null) {
+            $authorization->setExpires(new \DateTimeImmutable('+ ' . $this->defaultTokenLifetime . ' seconds'));
+        }
+
         $this->logger->info(sprintf('OAuth (%s): Starting authorization %s using client id "%s", a %s bytes long secret and scope "%s".', $this->getServiceType(), $authorization->getAuthorizationId(), $clientId, strlen($clientSecret), $scope));
 
         try {

Configuration/Settings.yaml

@@ -13,6 +13,10 @@ Flownative:
       services: []
 #        - name: 'flownative-beach'
 #          className: 'Flownative\Beach\BeachClient'
+      token:
+
+        # default lifetime of new tokens in seconds
+        defaultLifetime: ~
       encryption:
 
         # A base64-encoded random key, for example generated with ./flow oauth:generateencryptionkey