Force OAuth RedirectURL to always be backend URL. Otherwise it may get generated...

diff --git a/ext/oauth-client/CRM/OAuth/BAO/OAuthClient.php b/ext/oauth-client/CRM/OAuth/BAO/OAuthClient.php
index e7a0f537fc9390f832544f6a7b895480ed0c9445..6590fe5bf412915665d0b9e1140fb96eadc02269 100644 (file)
--- a/ext/oauth-client/CRM/OAuth/BAO/OAuthClient.php
+++ b/ext/oauth-client/CRM/OAuth/BAO/OAuthClient.php
@@ -67,7 +67,7 @@ class CRM_OAuth_BAO_OAuthClient extends CRM_OAuth_DAO_OAuthClient {
    */
   public static function getRedirectUri() {
     return \Civi::settings()->get('oauthClientRedirectUrl') ?:
-      \CRM_Utils_System::url('civicrm/oauth-client/return', NULL, TRUE, NULL, FALSE);
+      \CRM_Utils_System::url('civicrm/oauth-client/return', NULL, TRUE, NULL, FALSE, FALSE, TRUE);
   }
 
 }