Minor refactoring for better CQ

Phauthentic · Mar 16, 2024 · e543e4c · e543e4c
1 parent 96f80f8
commit e543e4c
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/Authenticator/HttpDigestAuthenticator.php b/src/Authenticator/HttpDigestAuthenticator.php
@@ -285,6 +285,16 @@ protected function getDigestOptions(ServerRequestInterface $request): array
         ];
     }
 
+    protected function formatOptions(string $key, mixed $value): string
+    {
+        if (is_bool($value)) {
+            $value = $value ? 'true' : 'false';
+            return sprintf('%s=%s', $key, $value);
+        }
+
+        return sprintf('%s="%s"', $key, $value);
+    }
+
     /**
      * Generate the login headers
      *
@@ -300,15 +310,12 @@ protected function loginHeaders(ServerRequestInterface $request): array
             $options['stale'] = true;
         }
 
-        $opts = [];
-        foreach ($options as $k => $v) {
-            if (is_bool($v)) {
-                $v = $v ? 'true' : 'false';
-                $opts[] = sprintf('%s=%s', $k, $v);
-            }
+        $formattedOptions = [];
+        foreach ($options as $key => $value) {
+            $formattedOptions[] = $this->formatOptions($key, $value);
         }
 
-        return ['WWW-Authenticate' => 'Digest ' . implode(',', $opts)];
+        return ['WWW-Authenticate' => 'Digest ' . implode(',', $formattedOptions)];
     }
 
     /**