DataTransferPublicPagesRest: don't show access token in login form. L…

…ogin fixed.
micromata · Feb 12, 2025 · cc0eb7b · cc0eb7b
1 parent 74c7e4d
commit cc0eb7b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/...ain/kotlin/org/projectforge/plugins/datatransfer/restPublic/DataTransferPublicPageRest.kt b/...ain/kotlin/org/projectforge/plugins/datatransfer/restPublic/DataTransferPublicPageRest.kt
@@ -194,14 +194,6 @@ class DataTransferPublicPageRest : AbstractDynamicPageRest() {
     }
 
     formCol
-      .add(
-        UIInput(
-          "externalAccessToken",
-          required = true,
-          label = "plugins.datatransfer.external.accessToken",
-          autoComplete = UIInput.AutoCompleteType.USERNAME
-        )
-      )
       .add(
         UIInput(
           "externalPassword",

diff --git a/projectforge-webapp/src/actions/authentication.js b/projectforge-webapp/src/actions/authentication.js
@@ -48,7 +48,11 @@ export const loadUserStatus = () => (dispatch) => {
             ));
         })
         .catch(() => {
-            if (!window.location.href.endsWith('/react/public/login')) {
+            const { href } = window.location;
+            if (!href.endsWith('/react/public/login')
+                // /react/public/datatransfer/ is a special case where the user is not logged in.
+                // Login form is returned by data transfer.
+                && href.indexOf('/react/public/datatransfer/') < 0) {
                 window.location.href = '/react/public/login';
             }