get userid from oidc data

Signed-off-by: Maxence Lange <[email protected]>
nextcloud · Jan 13, 2025 · e610a3a · e610a3a
1 parent ea74e6d
commit e610a3a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/UserDiscoveryModules/ManualUserMapping.php b/lib/UserDiscoveryModules/ManualUserMapping.php
@@ -56,8 +56,8 @@ public function __construct(
 	public function getLocation(array $data): string {
 		$location = '';
 		$dictionary = $this->getDictionary();
-		$key = $this->getKey($data);
 
+		$key = $this->getKey($data['saml'] ?? $data['oidc']);
 		$this->logger->debug('Lookup key is: "' . $key . '"');
 
 		// regular lookup
@@ -112,8 +112,12 @@ private function getDictionary() {
 	 */
 	private function getKey($data) {
 		$key = '';
-		if (!empty($this->idpParameter) && isset($data['saml'][$this->idpParameter][0])) {
-			$key = $data['saml'][$this->idpParameter][0];
+		if (!empty($this->idpParameter) && array_key_exists($this->idpParameter, $data)) {
+			$keys = $data[$this->idpParameter];
+			if (!is_array($keys)) {
+				$keys = [$keys];
+			}
+			$key = $keys[0];
 			$this->logger->debug('Found idpPrameter ' . $this->idpParameter . ' with value "' . $key . '"');
 		} else {
 			$this->logger->debug('Could not find idpParamter: ' . $this->idpParameter);