Fix wiki auth

WISVCH · Aug 12, 2023 · e604e47 · e604e47
1 parent 1cd17f2
commit e604e47
Showing 1 changed file with 13 additions and 18 deletions.
diff --git a/src/plugins/authiapconnect2/auth.php b/src/plugins/authiapconnect2/auth.php
@@ -55,29 +55,24 @@ public function trustExternal($user, $pass, $sticky = false)
 			$_SERVER['REMOTE_USER'] = $_SESSION[DOKU_COOKIE]['auth']['user'];
 			return true;
 		}
-
-        if (!empty($user)) {
 
-            $token = $this->getIapToken();
-
-            try {
-                $data = validate_jwt($token, $this->getConf('iap_expected_audience'));
-                $USERINFO = [
-                    'name' => $data['gcip']['name'],
-                    'mail' => $data['gcip']['email'],
-                    'grps' => array_merge(explode(',',$data['gcip']['groups']), ['user'])
-                ];
-            } catch (Exception $e) {
-                return false;
-            }        
+        $token = $this->getIapToken();
 
+        try {
+            $data = validate_jwt($token, $this->getConf('iap_expected_audience'));
+            $USERINFO = [
+                'name' => $data['gcip']['name'],
+                'mail' => $data['gcip']['email'],
+                'grps' => array_merge(explode(',',$data['gcip']['groups']), ['user'])
+            ];
+
             $_SERVER['REMOTE_USER']                = $USERINFO['name'];
             $_SESSION[DOKU_COOKIE]['auth']['user'] = $USERINFO['name'];
             $_SESSION[DOKU_COOKIE]['auth']['info'] = $USERINFO;
-
+            
             return true;
-        }
-
-        return false;
+        } catch (Exception $e) {
+            return false;
+        }        
     }
 }