fix: concatChar assignment logic (casdoor#595)

Signed-off-by: Yixiang Zhao <[email protected]>
gduxj · Mar 20, 2022 · 86b5d72 · 86b5d72
1 parent 6bc4e64
commit 86b5d72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/web/src/auth/AuthCallback.js b/web/src/auth/AuthCallback.js
@@ -106,7 +106,7 @@ class AuthCallback extends React.Component {
       method: method,
     };
     const oAuthParams = Util.getOAuthGetParameters(innerParams);
-    const concatChar = oAuthParams?.redirectUri?.indexOf('?') === -1 ? '?' : '&';
+    const concatChar = oAuthParams?.redirectUri?.includes('?') ? '&' : '?';
     AuthBackend.login(body, oAuthParams)
       .then((res) => {
         if (res.status === 'ok') {

diff --git a/web/src/auth/LoginPage.js b/web/src/auth/LoginPage.js
@@ -138,7 +138,7 @@ class LoginPage extends React.Component {
             Setting.goToLink(link);
           } else if (responseType === "code") {
             const code = res.data;
-            const concatChar = oAuthParams?.redirectUri?.indexOf('?') === -1 ? '?' : '&';
+            const concatChar = oAuthParams?.redirectUri?.includes('?') ? '&' : '?';
 
             if (Setting.hasPromptPage(application)) {
               AuthBackend.getAccount("")