fix: fix missing parameters when signup (#533 )

fix: add ie support (ie >= 9) (#538 )
* fix: add ie support (ie > 9) * fix: add support for IE11 * fix: small fix * fix: fix
2025-07-26 01:20:29 +08:00 · 2022-03-05 16:47:08 +08:00 · 2022-03-05 16:32:37 +08:00 · 2022-03-05 00:53:59 +08:00
14 changed files with 60 additions and 13 deletions
--- a/web/package.json
+++ b/web/package.json
@@ -29,7 +29,9 @@
    "react-i18next": "^11.8.7",
    "react-router-dom": "^5.2.0",
    "react-scripts": "4.0.3",
-    "react-social-login-buttons": "^3.4.0"
+    "react-social-login-buttons": "^3.4.0",
+    "react-app-polyfill": "^3.0.0",
+    "core-js": "^3.21.1"
  },
  "scripts": {
    "start": "cross-env PORT=7001 craco start",
@@ -46,12 +48,14 @@
    "production": [
      ">0.2%",
      "not dead",
-      "not op_mini all"
+      "not op_mini all",
+      "ie > 8"
    ],
    "development": [
      "last 1 chrome version",
      "last 1 firefox version",
-      "last 1 safari version"
+      "last 1 safari version",
+      "ie > 8"
    ]
  },
  "devDependencies": {
--- a/web/src/ApplicationEditPage.js
+++ b/web/src/ApplicationEditPage.js
@@ -166,7 +166,7 @@ class ApplicationEditPage extends React.Component {
        </Row>
        <Row style={{marginTop: '20px'}} >
          <Col style={{marginTop: '5px'}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel("general:Logo", i18next.t("general:Logo - Tooltip"))} :
+            {Setting.getLabel(i18next.t("general:Logo"), i18next.t("general:Logo - Tooltip"))} :
          </Col>
          <Col span={22} style={(Setting.isMobile()) ? {maxWidth:'100%'} :{}}>
            <Row style={{marginTop: '20px'}} >
--- a/web/src/auth/LoginPage.js
+++ b/web/src/auth/LoginPage.js
@@ -484,6 +484,7 @@ class LoginPage extends React.Component {
          <span style={{float: "right"}}>
            {i18next.t("login:No account?")}&nbsp;
            <a onClick={() => {
+              sessionStorage.setItem("loginURL", window.location.href)
              Setting.goToSignup(this, application);
            }}>
              {i18next.t("login:sign up now")}
--- a/web/src/auth/ResultPage.js
+++ b/web/src/auth/ResultPage.js
@@ -65,7 +65,12 @@ class ResultPage extends React.Component {
          subTitle={i18next.t("signup:Please click the below button to sign in")}
          extra={[
            <Button type="primary" key="login" onClick={() => {
-              Setting.goToLogin(this, application);
+              let linkInStorage = sessionStorage.getItem("loginURL")
+              if (linkInStorage != "") {
+                  Setting.goToLink(linkInStorage)
+              } else {
+                  Setting.goToLogin(this, application)
+              }
            }}>
              {i18next.t("login:Sign In")}
            </Button>
--- a/web/src/auth/SignupPage.js
+++ b/web/src/auth/SignupPage.js
@@ -557,7 +557,12 @@ class SignupPage extends React.Component {
          </Button>
          &nbsp;&nbsp;{i18next.t("signup:Have account?")}&nbsp;
          <a onClick={() => {
-            Setting.goToLogin(this, application);
+            let linkInStorage = sessionStorage.getItem("loginURL")
+            if(linkInStorage != ""){
+              Setting.goToLink(linkInStorage)
+            }else{
+              Setting.goToLogin(this, application)
+            }
          }}>
            {i18next.t("signup:sign in now")}
          </a>
--- a/web/src/index.js
+++ b/web/src/index.js
@@ -12,18 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

+import 'core-js/es';
+import 'react-app-polyfill/ie9';
+import 'react-app-polyfill/stable';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import './index.css';
 import App from './App';
 import * as serviceWorker from './serviceWorker';
-import { BrowserRouter } from 'react-router-dom';
+import {BrowserRouter} from 'react-router-dom';

 ReactDOM.render(
-  <BrowserRouter>
-    <App />
-  </BrowserRouter>,
-  document.getElementById('root')
+    <BrowserRouter>
+      <App/>
+    </BrowserRouter>,
+    document.getElementById('root')
 );

 // If you want your app to work offline and load faster, you can change
--- a/web/src/locales/de/data.json
+++ b/web/src/locales/de/data.json
@@ -126,6 +126,7 @@
    "LDAPs": "LDAPs",
    "LDAPs - Tooltip": "LDAPs - Tooltip",
    "Last name": "Last name",
+    "Logo": "Logo",
    "Logo - Tooltip": "App's image tag",
    "Master password": "Master-Passwort",
    "Master password - Tooltip": "Masterpasswort - Tooltip",
--- a/web/src/locales/en/data.json
+++ b/web/src/locales/en/data.json
@@ -126,6 +126,7 @@
    "LDAPs": "LDAPs",
    "LDAPs - Tooltip": "LDAPs - Tooltip",
    "Last name": "Last name",
+    "Logo": "Logo",
    "Logo - Tooltip": "Logo - Tooltip",
    "Master password": "Master password",
    "Master password - Tooltip": "Master password - Tooltip",
--- a/web/src/locales/fr/data.json
+++ b/web/src/locales/fr/data.json
@@ -126,6 +126,7 @@
    "LDAPs": "LDAPs",
    "LDAPs - Tooltip": "LDAPs - Infobulle",
    "Last name": "Last name",
+    "Logo": "Logo",
    "Logo - Tooltip": "App's image tag",
    "Master password": "Mot de passe maître",
    "Master password - Tooltip": "Mot de passe maître - Infobulle",
--- a/web/src/locales/ja/data.json
+++ b/web/src/locales/ja/data.json
@@ -126,6 +126,7 @@
    "LDAPs": "LDAP",
    "LDAPs - Tooltip": "LDAP - ツールチップ",
    "Last name": "Last name",
+    "Logo": "Logo",
    "Logo - Tooltip": "App's image tag",
    "Master password": "マスターパスワード",
    "Master password - Tooltip": "マスターパスワード - ツールチップ",
--- a/web/src/locales/ko/data.json
+++ b/web/src/locales/ko/data.json
@@ -126,6 +126,7 @@
    "LDAPs": "LDAPs",
    "LDAPs - Tooltip": "LDAPs - Tooltip",
    "Last name": "Last name",
+    "Logo": "Logo",
    "Logo - Tooltip": "App's image tag",
    "Master password": "Master password",
    "Master password - Tooltip": "Master password - Tooltip",
--- a/web/src/locales/ru/data.json
+++ b/web/src/locales/ru/data.json
@@ -126,6 +126,7 @@
    "LDAPs": "LDAPы",
    "LDAPs - Tooltip": "LDAPs - Подсказки",
    "Last name": "Last name",
+    "Logo": "Logo",
    "Logo - Tooltip": "App's image tag",
    "Master password": "Мастер-пароль",
    "Master password - Tooltip": "Мастер-пароль - Tooltip",
--- a/web/src/locales/zh/data.json
+++ b/web/src/locales/zh/data.json
@@ -14,7 +14,7 @@
    "Enable signup": "启用注册",
    "Enable signup - Tooltip": "是否允许用户注册",
    "File uploaded successfully": "文件上传成功",
-    "Grant types": "Grant types",
+    "Grant types": "OAuth授权类型",
    "Grant types - Tooltip": "选择允许哪些OAuth协议中的Grant types",
    "New Application": "添加应用",
    "Password ON": "开启密码",
@@ -126,6 +126,7 @@
    "LDAPs": "LDAP",
    "LDAPs - Tooltip": "LDAPs",
    "Last name": "姓氏",
+    "Logo": "Logo",
    "Logo - Tooltip": "应用程序向外展示的图标",
    "Master password": "万能密码",
    "Master password - Tooltip": "可用来登录该组织下的所有用户，方便管理员以该用户身份登录，以解决技术问题",
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -3760,6 +3760,11 @@ core-js@^2.4.0:
  resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==

+core-js@^3.19.2, core-js@^3.21.1:
+  version "3.21.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.1.tgz#f2e0ddc1fc43da6f904706e8e955bc19d06a0d94"
+  integrity sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==
+
 core-js@^3.6.5:
  version "3.9.1"
  resolved "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz#cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae"
@@ -9812,6 +9817,18 @@ react-app-polyfill@^2.0.0:
    regenerator-runtime "^0.13.7"
    whatwg-fetch "^3.4.1"

+react-app-polyfill@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz#95221e0a9bd259e5ca6b177c7bb1cb6768f68fd7"
+  integrity sha512-sZ41cxiU5llIB003yxxQBYrARBqe0repqPTTYBTmMqTz9szeBbE37BehCE891NZsmdZqqP+xWKdT3eo3vOzN8w==
+  dependencies:
+    core-js "^3.19.2"
+    object-assign "^4.1.1"
+    promise "^8.1.0"
+    raf "^3.4.1"
+    regenerator-runtime "^0.13.9"
+    whatwg-fetch "^3.6.2"
+
 react-codemirror2@^7.2.1:
  version "7.2.1"
  resolved "https://registry.npmjs.org/react-codemirror2/-/react-codemirror2-7.2.1.tgz#38dab492fcbe5fb8ebf5630e5bb7922db8d3a10c"
@@ -10158,6 +10175,11 @@ regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==

+regenerator-runtime@^0.13.9:
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
+  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
+
 regenerator-transform@^0.14.2:
  version "0.14.5"
  resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
@@ -12155,7 +12177,7 @@ whatwg-encoding@^1.0.5:
  dependencies:
    iconv-lite "0.4.24"

-whatwg-fetch@^3.4.1:
+whatwg-fetch@^3.4.1, whatwg-fetch@^3.6.2:
  version "3.6.2"
  resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
  integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==
Author	SHA1	Message	Date
Товарищ программист	ca0fa5fc40	fix: fix missing parameters when signup (#533 )	2022-03-05 16:47:08 +08:00
Nekotoxin	cfbce79e32	fix: add ie support (ie >= 9) (#538 ) * fix: add ie support (ie > 9) * fix: add support for IE11 * fix: small fix * fix: fix	2022-03-05 16:32:37 +08:00
Yang Luo	efc07f0919	Improve translation.	2022-03-05 00:53:59 +08:00