kaori 4 лет назад
Родитель
Сommit
82c0e54516

+ 1 - 1
src/server/middlewares/password-reset.js

@@ -11,7 +11,7 @@ module.exports = (crowi, app) => {
     const passwordResetOrder = await PasswordResetOrder.findOne({ token });
     // check the oneTimeToken is valid
     if (passwordResetOrder == null || passwordResetOrder.isExpired()) {
-      return res.redirect('/login/error/password-reset-order');
+      return res.redirect('/reset-password/error/password-reset-order');
     }
 
     req.DataFromPasswordResetOrderMiddleware = passwordResetOrder;

+ 1 - 0
src/server/routes/index.js

@@ -180,6 +180,7 @@ module.exports = function(crowi, app) {
   app.get('/forgot-password', forgotPassword.forgotPassword);
   app.post('/_api/forgot-password', forgotPassword.api.post);
   app.get('/forgot-password/:token'      , passwordReset, forgotPassword.resetPassword);
+  app.get('/reset-password/error/:reason'      , applicationInstalled, login.error);
 
   app.get('/share/:linkId', page.showSharedPage);
 

+ 62 - 0
src/server/views/reset-password/error.html

@@ -0,0 +1,62 @@
+{% extends '../layout/layout.html' %}
+
+{% block html_base_css %}error nologin{% endblock %}
+
+{% block html_title %}{{ customizeService.generateCustomTitleForFixedPageName(t('login.Setup')) }}{% endblock %}
+
+
+
+{#
+ # Remove default contents
+ #}
+{% block html_head_loading_legacy %}
+{% endblock %}
+{% block html_head_loading_app %}
+{% endblock %}
+{% block layout_head_nav %}
+{% endblock %}
+{% block sidebar %}
+{% endblock %}
+{% block head_warn_alert_siteurl_undefined %}
+{% endblock %}
+
+
+
+{% block layout_main %}
+
+<div class="main container-fluid">
+
+  <div class="row">
+
+    <div class="login-header offset-sm-4 col-sm-4">
+      <div class="logo">{% include '../widget/logo.html' %}</div>
+      <h1>GROWI</h1>
+
+      <div class="mb-4 login-form-errors text-center">
+        {% if reason === 'registered'%}
+        <div class="alert alert-success">
+          <h2>{{ t('login.Registration successful') }}</h2>
+        </div>
+        {% elseif reason === 'password-reset-order' %}
+        <div class="alert alert-warning mb-3">
+          <h2>{{ t('forgot_password.incorrect_token_or_expired_url') }}</h2>
+        </div>
+          <a href="/forgot-password" class="link-switch">
+            <i class="icon-key"></i> {{ t('forgot_password.forgot_password') }}
+          </a>
+        {% else %}
+        <div class="alert alert-warning">
+            <h2>{{ t('login.Sign in error') }}</h2>
+        </div>
+        {% endif %}
+      </div>
+
+      <p>{{ reasonMessage }}</p>
+    </div>
+
+
+  </div>{# /.row #}
+
+</div>{# /.main #}
+
+{% endblock %}