Merge pull request #107 from snake/auth_url_fix

Fix bug with authorization URLs having a query component
packbackbooks · Oct 20, 2023 · 70b6ea4 · 70b6ea4
2 parents 65855b0 + 9cb69cd
commit 70b6ea4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/LtiOidcLogin.php b/src/LtiOidcLogin.php
@@ -90,7 +90,12 @@ public function doOidcLoginRedirect($launch_url, array $request = null)
             $auth_params['lti_message_hint'] = $request['lti_message_hint'];
         }
 
-        $auth_login_return_url = $registration->getAuthLoginUrl().'?'.http_build_query($auth_params, '', '&');
+        if (parse_url($registration->getAuthLoginUrl(), PHP_URL_QUERY)) {
+            $separator = '&';
+        } else {
+            $separator = '?';
+        }
+        $auth_login_return_url = $registration->getAuthLoginUrl().$separator.http_build_query($auth_params, '', '&');
 
         // Return auth redirect.
         return new Redirect($auth_login_return_url, http_build_query($request, '', '&'));