Add tokenCacheDir to the firebase options (#192)

* Add tokenCacheDir to the firebase options * Fix phpstan type issue * Added tokenCacheDir to .dist
OpenConext · Jun 13, 2024 · 89419af · 89419af
1 parent f7e787c
commit 89419af
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/ci/qa/phpstan-baseline.neon b/ci/qa/phpstan-baseline.neon
@@ -260,21 +260,6 @@ parameters:
 			count: 2
 			path: ../../src/Tiqr/Legacy/TiqrService.php
 
-		-
-			message: "#^Cannot access offset 'projectId' on mixed\\.$#"
-			count: 1
-			path: ../../src/Tiqr/TiqrConfiguration.php
-
-		-
-			message: "#^Cannot access offset 'credentialsFile' on mixed\\.$#"
-			count: 1
-			path: ../../src/Tiqr/TiqrConfiguration.php
-
-		-
-			message: "#^Cannot access offset 'cacheTokens' on mixed\\.$#"
-			count: 1
-			path: ../../src/Tiqr/TiqrConfiguration.php
-
 		-
 			message: "#^Cannot access offset 'arguments' on mixed\\.$#"
 			count: 4

diff --git a/config/openconext/parameters.yaml.dist b/config/openconext/parameters.yaml.dist
@@ -61,6 +61,7 @@ parameters:
                 projectId: 'FCM project ID'
                 credentialsFile: 'absolute path to file with service account key'
                 cacheTokens: false
+                tokenCacheDir: '/tmp'
         accountblocking:
             maxAttempts: 5
         storage:

diff --git a/src/Tiqr/TiqrConfiguration.php b/src/Tiqr/TiqrConfiguration.php
@@ -67,13 +67,15 @@ public function __construct(array $tiqrConfiguration)
             $this->options['apns.environment'] = $tiqrConfiguration['library']['apns']['environment'];
         }
 
-        if (isset($tiqrConfiguration['library']['firebase'])) {
+        if (isset($tiqrConfiguration['library']['firebase']) && is_array($tiqrConfiguration['library']['firebase'])) {
             Assertion::string($tiqrConfiguration['library']['firebase']['projectId']);
             $this->options['firebase.projectId'] = $tiqrConfiguration['library']['firebase']['projectId'];
             Assertion::string($tiqrConfiguration['library']['firebase']['credentialsFile']);
             $this->options['firebase.credentialsFile'] = $tiqrConfiguration['library']['firebase']['credentialsFile'];
             Assertion::boolean($tiqrConfiguration['library']['firebase']['cacheTokens']);
             $this->options['firebase.cacheTokens'] = $tiqrConfiguration['library']['firebase']['cacheTokens'];
+            Assertion::string($tiqrConfiguration['library']['firebase']['tokenCacheDir']);
+            $this->options['firebase.tokenCacheDir'] = $tiqrConfiguration['library']['firebase']['tokenCacheDir'];
         }
 
         if (isset($tiqrConfiguration['accountblocking'][self::MAX_ATTEMPTS])) {