fixed merge error

Author: memurats

lib/Controller/LoginController.php

@@ -906,6 +906,16 @@ private function getBackchannelLogoutErrorResponse(
 		);
 	}
 
+	private function toCodeChallenge(string $data): string {
+		// Basically one big work around for the base64url decode being weird
+		$h = pack('H*', hash('sha256', $data));
+		$s = base64_encode($h); // Regular base64 encoder
+		$s = explode('=', $s)[0]; // Remove any trailing '='s
+		$s = str_replace('+', '-', $s); // 62nd char of encoding
+		$s = str_replace('/', '_', $s); // 63rd char of encoding
+		return $s;
+	}
+
 	private function isMobileDevice(): bool {
 		$mobileKeywords = $this->config->getSystemValue('user_oidc.mobile_keywords', ['Android', 'iPhone', 'iPad', 'iPod', 'Windows Phone', 'Mobile', 'webOS', 'BlackBerry', 'Opera Mini', 'IEMobile']);
 
@@ -921,14 +931,4 @@ private function isMobileDevice(): bool {
 
 		return false; // device is desktop
 	}
-
-	private function toCodeChallenge(string $data): string {
-		// Basically one big work around for the base64url decode being weird
-		$h = pack('H*', hash('sha256', $data));
-		$s = base64_encode($h); // Regular base64 encoder
-		$s = explode('=', $s)[0]; // Remove any trailing '='s
-		$s = str_replace('+', '-', $s); // 62nd char of encoding
-		$s = str_replace('/', '_', $s); // 63rd char of encoding
-		return $s;
-	}
 }