Merge pull request INTER-Mediator#1866 from msyk/master

INTERMediator\\DB\\Proxy::saveChallenge()'s parameter can be null.
msyk · Feb 22, 2024 · 63ec5dd · 63ec5dd
2 parents dc7b049 + 0374027
commit 63ec5dd
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/src/php/DB/Auth_Interface_Communication.php b/src/php/DB/Auth_Interface_Communication.php
@@ -18,7 +18,7 @@
 interface Auth_Interface_Communication
 {
     // The followings are used in Proxy::processingRequest.
-    public function saveChallenge(string $username, string $challenge, string $clientId): ?string;
+    public function saveChallenge(?string $username, string $challenge, string $clientId): ?string;
 
     public function checkAuthorization(string $username, bool $isSAML = false): bool;
 

diff --git a/src/php/DB/Proxy.php b/src/php/DB/Proxy.php
@@ -1473,7 +1473,7 @@ function authSupportGetSalt(string $username): ?string
      * @param string $clientId
      * @return string
      */
-    function saveChallenge(string $username, string $challenge, string $clientId): ?string
+    function saveChallenge(?string $username, string $challenge, string $clientId): ?string
     {
         $this->logger->setDebugMessage(
             "[saveChallenge]user={$username}, challenge={$challenge}, clientid={$clientId}", 2);

diff --git a/src/php/DB/Support/Auth_Interface_DB.php b/src/php/DB/Support/Auth_Interface_DB.php
@@ -37,7 +37,7 @@ public function authSupportCheckMediaPrivilege(string $tableName, string $target
 
     public function authSupportGetUserIdFromEmail(string $email): ?string;                            // authuser
 
-    public function authSupportGetUserIdFromUsername(string $username): ?string;                    // authuser
+    public function authSupportGetUserIdFromUsername(?string $username): ?string;                    // authuser
 
     public function authSupportGetUsernameFromUserId(string $userid): ?string;                        // authuser
 

diff --git a/src/php/DB/Support/DB_Auth_Handler_FileMaker_DataAPI.php b/src/php/DB/Support/DB_Auth_Handler_FileMaker_DataAPI.php
@@ -444,7 +444,7 @@ public function authSupportChangePassword(string $username, string $hashednewpas
      * @param string $username
      * @return string|null
      */
-    public function authSupportGetUserIdFromUsername(string $username): ?string
+    public function authSupportGetUserIdFromUsername(?string $username): ?string
     {
         $userTable = $this->dbSettings->getUserTable();
         if ($userTable == null || !$username) {

diff --git a/src/php/DB/Support/DB_Auth_Handler_FileMaker_FX.php b/src/php/DB/Support/DB_Auth_Handler_FileMaker_FX.php
@@ -313,7 +313,7 @@ public function authSupportChangePassword(string $username, string $hashednewpas
      * @return string|null
      * @throws Exception
      */
-    public function authSupportGetUserIdFromUsername(string $username): ?string
+    public function authSupportGetUserIdFromUsername(?string $username): ?string
     {
         $userTable = $this->dbSettings->getUserTable();
         if (!$userTable || !$username) {

diff --git a/src/php/DB/Support/DB_Auth_Handler_PDO.php b/src/php/DB/Support/DB_Auth_Handler_PDO.php
@@ -460,7 +460,7 @@ public function authTableGetUserIdFromUsername(string $username): string
      * @param string $username
      * @return string
      */
-    public function authSupportGetUserIdFromUsername(string $username): ?string
+    public function authSupportGetUserIdFromUsername(?string $username): ?string
     {
         return $this->privateGetUserIdFromUsername($username, true);
     }