Move import export back to setting (#2063)
* replace black by ruff * move alias import/export to settings * fix html closing tag * add rate limit for alias import & export --------- Co-authored-by: Son NK <son@simplelogin.io>
This commit is contained in:
parent
74b811dd35
commit
f5babd9c81
|
@ -151,10 +151,10 @@ Here are the small sum-ups of the directory structures and their roles:
|
|||
|
||||
## Pull request
|
||||
|
||||
The code is formatted using https://github.com/psf/black, to format the code, simply run
|
||||
The code is formatted using [ruff](https://github.com/astral-sh/ruff), to format the code, simply run
|
||||
|
||||
```
|
||||
poetry run black .
|
||||
poetry run ruff format .
|
||||
```
|
||||
|
||||
The code is also checked with `flake8`, make sure to run `flake8` before creating the pull request by
|
||||
|
|
|
@ -2,10 +2,12 @@ from app.dashboard.base import dashboard_bp
|
|||
from flask_login import login_required, current_user
|
||||
from app.alias_utils import alias_export_csv
|
||||
from app.dashboard.views.enter_sudo import sudo_required
|
||||
from app.extensions import limiter
|
||||
|
||||
|
||||
@dashboard_bp.route("/alias_export", methods=["GET"])
|
||||
@login_required
|
||||
@sudo_required
|
||||
@limiter.limit("2/minute")
|
||||
def alias_export_route():
|
||||
return alias_export_csv(current_user)
|
||||
|
|
|
@ -7,6 +7,7 @@ from app.config import JOB_BATCH_IMPORT
|
|||
from app.dashboard.base import dashboard_bp
|
||||
from app.dashboard.views.enter_sudo import sudo_required
|
||||
from app.db import Session
|
||||
from app.extensions import limiter
|
||||
from app.log import LOG
|
||||
from app.models import File, BatchImport, Job
|
||||
from app.utils import random_string, CSRFValidationForm
|
||||
|
@ -15,6 +16,7 @@ from app.utils import random_string, CSRFValidationForm
|
|||
@dashboard_bp.route("/batch_import", methods=["GET", "POST"])
|
||||
@login_required
|
||||
@sudo_required
|
||||
@limiter.limit("10/minute", methods=["POST"])
|
||||
def batch_import_route():
|
||||
# only for users who have custom domains
|
||||
if not current_user.verified_custom_domains():
|
||||
|
@ -39,7 +41,7 @@ def batch_import_route():
|
|||
return redirect(request.url)
|
||||
if len(batch_imports) > 10:
|
||||
flash(
|
||||
"You have too many imports already. Wait until some get cleaned up",
|
||||
"You have too many imports already. Please wait until some get cleaned up",
|
||||
"error",
|
||||
)
|
||||
return render_template(
|
||||
|
|
|
@ -120,21 +120,6 @@
|
|||
</div>
|
||||
</div>
|
||||
<!-- END WebAuthn -->
|
||||
<!-- Alias import/export -->
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="card-title">Alias import/export</div>
|
||||
<div class="mb-3">
|
||||
You can import your aliases created on other platforms into SimpleLogin.
|
||||
You can also export your aliases to a readable csv format for a future batch import.
|
||||
</div>
|
||||
<a href="{{ url_for('dashboard.batch_import_route') }}"
|
||||
class="btn btn-outline-primary">Batch Import</a>
|
||||
<a href="{{ url_for('dashboard.alias_export_route') }}"
|
||||
class="btn btn-outline-secondary">Export Aliases</a>
|
||||
</div>
|
||||
</div>
|
||||
<!-- END Alias import/export -->
|
||||
<!-- data export -->
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
|
|
|
@ -559,7 +559,7 @@
|
|||
sender address.
|
||||
<br />
|
||||
If this option is enabled, the original sender addresses is stored in the email header <b>X-SimpleLogin-Envelope-From</b>
|
||||
and the original From header is stored in <b>X-SimpleLogin-Original-From<b>.
|
||||
and the original From header is stored in <b>X-SimpleLogin-Original-From</b>.
|
||||
You can choose to display this header in your email client.
|
||||
<br />
|
||||
As email headers aren't encrypted, your mailbox service can know the sender address via this header.
|
||||
|
@ -583,6 +583,23 @@
|
|||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Alias import/export -->
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="card-title">
|
||||
Alias import/export
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
You can import your aliases created on other platforms into SimpleLogin.
|
||||
You can also export your aliases to a readable csv format for a future batch import.
|
||||
</div>
|
||||
<a href="{{ url_for('dashboard.batch_import_route') }}"
|
||||
class="btn btn-outline-primary">Batch Import</a>
|
||||
<a href="{{ url_for('dashboard.alias_export_route') }}"
|
||||
class="btn btn-outline-secondary">Export Aliases</a>
|
||||
</div>
|
||||
</div>
|
||||
<!-- END Alias import/export -->
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% block script %}
|
||||
|
|
Loading…
Reference in New Issue