Feature/ams w2025 66a links fix

docker-compose.yml

@@ -455,4 +455,3 @@ volumes:
   mongo_data:
 #  letsencrypt_etc:
 #  letsencrypt_html:
-

docker-compose2.yml

@@ -455,4 +455,3 @@ volumes:
   mongo_data:
 #  letsencrypt_etc:
 #  letsencrypt_html:
-

modules/invenio-oauth2server/invenio_oauth2server/templates/invenio_oauth2server/authorize.html

@@ -3,8 +3,8 @@
   This file is part of Invenio.
   Copyright (C) 2015-2018 CERN.
 
-  Invenio is free software; you can redistribute it and/or modify it
-  under the terms of the MIT License; see LICENSE file for more details.
+Invenio is free software; you can redistribute it and/or modify it
+under the terms of the MIT License; see LICENSE file for more details.
 #}
 
 {%- extends config.OAUTH2SERVER_COVER_TEMPLATE %}
@@ -13,54 +13,64 @@
 
 {% block page_body %}
 <div class="container">
-<div class="row">
-<div class="col-md-8 col-md-offset-2">
-{{ helpers.panel_start(_('Authorize application'), icon='fa fa-shield fa-fw') }}
-<h1 align="center">{{ _('Authorize application') }}</h1>
-<h3 align="center">{{ _("Application '%(client_name)s' by '%(client_user)s' wants permission to access your '%(current_user)s' account.",
-                        client_name=client.name, client_user=client.user.nickname or client.user.email, current_user=current_user.nickname or current_user.email) }}</h3>
-<hr />
-<div class="row">
-<div class="col-md-8">
-<div class="text-left">
+  <div class="row">
+    <div class="col-md-8 col-md-offset-2">
+      {{ helpers.panel_start(_('Authorize application'), icon='fa fa-shield fa-fw') }}
+      <h1 align="center">{{ _('Authorize application') }}</h1>
+      <h3 align="center">{{ _("Application '%(client_name)s' by '%(client_user)s' wants permission to access your
+        '%(current_user)s' account.",
+        client_name=client.name, client_user=client.user.nickname or client.user.email,
+        current_user=current_user.nickname or current_user.email) }}</h3>
+      <hr />
+      <div class="row">
+        <div class="col-md-8">
+          <div class="text-left">
 
-  <h4>{{ _('Review permissions') }}</h4>
-  {%- for group in scopes|groupby('group') %}
-    {%- if loop.first %}<table class="table table-striped table-bordered"><tbody>{% endif %}
-      <tr>
-        <td><strong>{{group.grouper}}</strong></td>
-        <td><ul>{% for scope in group.list %}<li>{{scope.help_text}}</li>{% endfor %}</ul></td>
-      </tr>
-    {%- if loop.last %}</tbody></table>{% endif %}
-  {%- else %}
-    <p><em>No permissions granted.</em></p>
-  {%- endfor %}
-</div>
-</div>
-<div class="col-md-4">
-  <div class="well">
-    <div class="text-left">
-    <span class="text-muted">{{ _('Application') }}</span>
-    <h4>{{client.name}}</h4>
-    {%- if client.description %}<p>{{client.description}}</p>{% endif %}
-    {%- if client.website %}<p><a href="{{client.website}}">{{ _('Visit application website') }}</a></p>{% endif %}
-    <hr />
-    <p class="text-center text-muted">
-    <i class="fa fa-users"></i> {{ client.get_users }} {{ 'user' if client.get_users == 1 else 'users' }}
-    </p>
+            <h4>{{ _('Review permissions') }}</h4>
+            {%- for group in scopes|groupby('group') %}
+            {%- if loop.first %}<table class="table table-striped table-bordered">
+              <tbody>{% endif %}
+                <tr>
+                  <td><strong>{{group.grouper}}</strong></td>
+                  <td>
+                    <ul>{% for scope in group.list %}<li>{{scope.help_text}}</li>{% endfor %}</ul>
+                  </td>
+                </tr>
+                {%- if loop.last %}
+              </tbody>
+            </table>{% endif %}
+            {%- else %}
+            <p><em>{{ _("No permissions granted.") }}</em></p>
+            {%- endfor %}
+          </div>
+        </div>
+        <div class="col-md-4">
+          <div class="well">
+            <div class="text-left">
+              <span class="text-muted">{{ _('Application') }}</span>
+              <h4>{{client.name}}</h4>
+              {%- if client.description %}<p>{{client.description}}</p>{% endif %}
+              {%- if client.website %}<p><a href="{{client.website}}">{{ _("Visit application website") }}</a></p>{%
+              endif %}
+              <hr />
+              <p class="text-center text-muted">
+                <i class="fa fa-users"></i> {{ client.get_users }} {{ 'user' if client.get_users == 1 else 'users' }}
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <hr />
+      <div align="center">
+        <form action="" method="POST">
+          <button type="submit" value="yes" name="confirm" class="btn btn-success"><i class="fa fa-check"></i> {{
+            _("Authorize application") }}</button>
+          <button type="submit" value="no" name="confirm" class="btn btn-danger"><i class="fa fa-ban"></i> {{
+            _("Reject") }}</button>
+        </form>
+      </div>
+      {{ helpers.panel_end() }}
+    </div>
   </div>
-  </div>
-</div>
-</div>
-<hr />
-<div align="center">
-  <form action="" method="POST">
-    <button type="submit" value="yes" name="confirm" class="btn btn-success"><i class="fa fa-check"></i> {{ _('Authorize application') }}</button>
-    <button type="submit" value="no" name="confirm" class="btn btn-danger"><i class="fa fa-ban"></i> {{ _('Reject') }}</button>
-  </form>
-</div>
-{{ helpers.panel_end() }}
-</div>
-</div>
 </div>
 {% endblock %}

modules/invenio-oauth2server/invenio_oauth2server/templates/invenio_oauth2server/errors.html

@@ -3,8 +3,8 @@
   This file is part of Invenio.
   Copyright (C) 2015-2018 CERN.
 
-  Invenio is free software; you can redistribute it and/or modify it
-  under the terms of the MIT License; see LICENSE file for more details.
+Invenio is free software; you can redistribute it and/or modify it
+under the terms of the MIT License; see LICENSE file for more details.
 #}
 
 {%- extends config.OAUTH2SERVER_COVER_TEMPLATE %}
@@ -14,24 +14,36 @@
 {%- block page_body %}
 <div class="row">
   <div class="col-md-8 col-md-offset-2">
-  {{ helpers.panel_start(
+    {{ helpers.panel_start(
     _('Invalid authorization request'),
     icon='fa fa-warning fa-fw'
-  ) }}
-
-  {{ _('Invalid authorization request') }}
-
-  {{ _('The service that redirected your here made an invalid authorization request (error code: %(x_error)s).',
-       x_error=error.error) }}
-
-  <div class="row">
-    <hr />
-    <div align="center">
-      <a href="/" class="btn btn-info">
-        {{ _('Get me out of here!') }}
-      </a>
+    ) }}
+
+    <p>
+      {{ _('You cannot access the service because there is an error in the authentication request.') }}
+      {% if error.error == unsupported_response_type %}
+      ({{ _('unsupported_response_type') }})
+      {% elif error.error == 'invalid_request' %}
+      {% if error.description is string and 'client_id' in error.description %}
+      ({{ _('invalid_client_id') }})
+      {% else %}
+      ({{ _('invalid_request') }})
+      {% endif %}
+      {% elif error.error == 'invalid_scope' %}
+      ({{ _('invalid_scope')}})
+      {% elif error.error == 'access_denied' %}
+      ({{ _('access_denied') }})
+      {% endif %}
+    </p>
+
+    <div class="row">
+      <hr />
+      <div align="center">
+        <a href="/" class="btn btn-info">
+          {{ _('Get me out of here!') }}
+        </a>
+      </div>
+      {{ helpers.panel_end() }}
     </div>
-    {{ helpers.panel_end() }}
   </div>
-</div>
-{%- endblock %}
+  {%- endblock %}

modules/invenio-oauth2server/invenio_oauth2server/translations/en/LC_MESSAGES/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: invenio-oauth2server 1.0.0\n"
 "Report-Msgid-Bugs-To: info@inveniosoftware.org\n"
-"POT-Creation-Date: 2025-10-03 14:53+0900\n"
+"POT-Creation-Date: 2025-12-17 12:38+0900\n"
 "PO-Revision-Date: 2025-05-07 18:18+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -112,50 +112,73 @@ msgstr ""
 
 #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:18
 #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:19
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:58
-#: invenio_oauth2server/views/server.py:69
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:67
+#: invenio_oauth2server/views/server.py:71
 msgid "Authorize application"
 msgstr ""
 
 #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:20
 #, python-format
 msgid ""
 "Application '%(client_name)s' by '%(client_user)s' wants permission to "
-"access your '%(current_user)s' account."
+"access your\n"
+"        '%(current_user)s' account."
 msgstr ""
 
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:27
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:29
 #: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:29
 msgid "Review permissions"
 msgstr ""
 
 #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:43
+msgid "No permissions granted."
+msgstr ""
+
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:50
 #: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:43
 msgid "Application"
 msgstr ""
 
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:46
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:53
 #: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:46
 msgid "Visit application website"
 msgstr ""
 
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:59
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:69
 msgid "Reject"
 msgstr ""
 
 #: invenio_oauth2server/templates/invenio_oauth2server/errors.html:18
-#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:22
 msgid "Invalid authorization request"
 msgstr ""
 
-#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:24
-#, python-format
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:23
 msgid ""
-"The service that redirected your here made an invalid authorization "
-"request (error code: %(x_error)s)."
+"You cannot access the service because there is an error in the "
+"authentication request."
 msgstr ""
 
-#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:31
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:25
+msgid "unsupported_response_type"
+msgstr "error: This response type is not supported."
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:28
+msgid "invalid_client_id"
+msgstr "error: The client ID is incorrect."
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:30
+msgid "invalid_request"
+msgstr "error: The request is invalid."
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:33
+msgid "invalid_scope"
+msgstr "error: The scope is incorrect."
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:35
+msgid "access_denied"
+msgstr "error: Access has been denied."
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:43
 msgid "Get me out of here!"
 msgstr ""
 

modules/invenio-oauth2server/invenio_oauth2server/translations/ja/LC_MESSAGES/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: invenio-oauth2server 1.0.0\n"
 "Report-Msgid-Bugs-To: info@inveniosoftware.org\n"
-"POT-Creation-Date: 2025-10-03 14:53+0900\n"
+"POT-Creation-Date: 2025-12-17 12:38+0900\n"
 "PO-Revision-Date: 2025-05-07 18:18+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: ja\n"
@@ -112,50 +112,73 @@ msgstr ""
 
 #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:18
 #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:19
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:58
-#: invenio_oauth2server/views/server.py:69
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:67
+#: invenio_oauth2server/views/server.py:71
 msgid "Authorize application"
-msgstr ""
+msgstr "アプリの使用を承諾する"
 
 #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:20
 #, python-format
 msgid ""
 "Application '%(client_name)s' by '%(client_user)s' wants permission to "
-"access your '%(current_user)s' account."
-msgstr ""
+"access your\n"
+"        '%(current_user)s' account."
+msgstr "「%(client_user)s」による「%(client_name)s」アプリケーションがあなたのアカウントへのアクセス許可を求めています。"
 
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:27
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:29
 #: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:29
 msgid "Review permissions"
-msgstr ""
+msgstr "権限を確認"
 
 #: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:43
+msgid "No permissions granted."
+msgstr "権限が付与されていません。"
+
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:50
 #: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:43
 msgid "Application"
-msgstr ""
+msgstr "アプリケーション"
 
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:46
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:53
 #: invenio_oauth2server/templates/invenio_oauth2server/settings/token_permission_view.html:46
 msgid "Visit application website"
-msgstr ""
+msgstr "アプリケーションのウェブサイト閲覧"
 
-#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:59
+#: invenio_oauth2server/templates/invenio_oauth2server/authorize.html:69
 msgid "Reject"
-msgstr ""
+msgstr "拒否"
 
 #: invenio_oauth2server/templates/invenio_oauth2server/errors.html:18
-#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:22
 msgid "Invalid authorization request"
-msgstr ""
+msgstr "無効な認証リクエスト"
 
-#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:24
-#, python-format
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:23
 msgid ""
-"The service that redirected your here made an invalid authorization "
-"request (error code: %(x_error)s)."
-msgstr ""
+"You cannot access the service because there is an error in the "
+"authentication request."
+msgstr "認証リクエストに誤りがあるため、アクセスできません。"
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:25
+msgid "unsupported_response_type"
+msgstr "エラー: このレスポンスタイプはサポートされていません。"
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:28
+msgid "invalid_client_id"
+msgstr "エラー: クライアントIDに誤りがあります。"
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:30
+msgid "invalid_request"
+msgstr "エラー: 無効なリクエストです。"
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:33
+msgid "invalid_scope"
+msgstr "エラー: スコープに誤りがあります。"
+
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:35
+msgid "access_denied"
+msgstr "エラー: アクセスが拒否されました。"
 
-#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:31
+#: invenio_oauth2server/templates/invenio_oauth2server/errors.html:43
 msgid "Get me out of here!"
 msgstr ""