pierre/BasicOIDC
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated all dependencies

Browse Source
This commit is contained in:
Pierre HUBERT
2024-02-19 18:42:19 +01:00
parent 36399604fc
commit 75b70008e3
17 changed files with 545 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/login/base_login_page.html
View File

@ -8,7 +8,7 @@
<!-- No indexing -->
<meta name="robots" content="noindex, nofollow">
<title>{{ _p.app_name }} - {{ _p.page_title }}</title>
<title>{{ p.app_name }} - {{ p.page_title }}</title>
<!-- Bootstrap core CSS -->
<link href="/assets/css/bootstrap.css" rel="stylesheet" crossorigin="anonymous"/>
@ -43,15 +43,15 @@
<main class="form-signin">
<h1 class="h3 mb-3 fw-normal" style="margin-bottom: 2rem !important;">{{ _p.page_title }}</h1>
<h1 class="h3 mb-3 fw-normal" style="margin-bottom: 2rem !important;">{{ p.page_title }}</h1>
{% if let Some(danger) = _p.danger %}
{% if let Some(danger) = p.danger %}
<div class="alert alert-danger" role="alert">
{{ danger }}
</div>
{% endif %}
{% if let Some(success) = _p.success %}
{% if let Some(success) = p.success %}
<div class="alert alert-success" role="alert">
{{ success }}
</div>

2
templates/login/choose_second_factor.html
View File

@ -5,7 +5,7 @@
<p>You need to validate a second factor to complete your login.</p>
{% for factor in user.get_distinct_factors_types() %}
<a class="btn btn-primary btn-lg" href="{{ factor.login_url(_p.redirect_uri) }}" style="width: 100%; display: flex;">
<a class="btn btn-primary btn-lg" href="{{ factor.login_url(p.redirect_uri) }}" style="width: 100%; display: flex;">
<img src="{{ factor.type_image() }}" alt="Factor icon" style="margin-right: 1em;" />
<div style="text-align: left;">
{{ factor.type_str() }} <br/>

4
templates/login/login.html
View File

@ -18,7 +18,7 @@
</style>
<form action="/login?redirect={{ _p.redirect_uri.get_encoded() }}" method="post">
<form action="/login?redirect={{ p.redirect_uri.get_encoded() }}" method="post">
<div>
<div class="form-floating">
<input name="login" type="text" required class="form-control" id="floatingName" placeholder="unsername"
@ -41,7 +41,7 @@
{% if !providers.is_empty() %}
<div id="providers">
{% for prov in providers %}
<a class="btn btn-secondary btn-lg provider-button" href="{{ prov.login_url(_p.redirect_uri) }}">
<a class="btn btn-secondary btn-lg provider-button" href="{{ prov.login_url(p.redirect_uri) }}">
<img src="{{ prov.logo_url() }}" alt="Provider icon"/>
<div style="text-align: left;">
Login using {{ prov.name }} <br/>

2
templates/login/otp_input.html
View File

@ -28,7 +28,7 @@
<div style="margin-top: 10px;">
<a href="/2fa_auth?force_display=true&redirect={{ _p.redirect_uri.get_encoded() }}">Sign in using another factor</a><br/>
<a href="/2fa_auth?force_display=true&redirect={{ p.redirect_uri.get_encoded() }}">Sign in using another factor</a><br/>
<a href="/logout">Sign out</a>
</div>

2
templates/login/password_reset.html
View File

@ -1,6 +1,6 @@
{% extends "base_login_page.html" %}
{% block content %}
<form action="/reset_password?redirect={{ _p.redirect_uri.get_encoded() }}" method="post" id="reset_password_form">
<form action="/reset_password?redirect={{ p.redirect_uri.get_encoded() }}" method="post" id="reset_password_form">
<div>
<p>You need to configure a new password:</p>

2
templates/login/prov_login_error.html
View File

@ -7,7 +7,7 @@
<p style="margin-top: 10px; text-align: justify;">{{ message }}</p>
</div>
<a href="/login?redirect={{ _p.redirect_uri.get_encoded() }}">Go back to login</a>
<a href="/login?redirect={{ p.redirect_uri.get_encoded() }}">Go back to login</a>
{% endblock content %}

4
templates/login/webauthn_input.html
View File

@ -12,13 +12,13 @@
</div>
<div style="margin-top: 10px;">
<a href="/2fa_auth?force_display=true&redirect={{ _p.redirect_uri.get_encoded() }}">Sign in using another factor</a><br/>
<a href="/2fa_auth?force_display=true&redirect={{ p.redirect_uri.get_encoded() }}">Sign in using another factor</a><br/>
<a href="/logout">Sign out</a>
</div>
<script src="/assets/js/base64_lib.js"></script>
<script>
const REDIRECT_URI = decodeURIComponent("{{ _p.redirect_uri.get_encoded() }}");
const REDIRECT_URI = decodeURIComponent("{{ p.redirect_uri.get_encoded() }}");
const OPAQUE_STATE = "{{ opaque_state }}";
const AUTH_CHALLENGE = JSON.parse(decodeURIComponent("{{ challenge_json }}"));
// Decode data

12
templates/settings/account_details.html
View File

@ -5,27 +5,27 @@
<tbody>
<tr>
<th scope="row">User ID</th>
<td>{{ _p.user.uid.0 }}</td>
<td>{{ p.user.uid.0 }}</td>
</tr>
<tr>
<th scope="row">First name</th>
<td>{{ _p.user.first_name }}</td>
<td>{{ p.user.first_name }}</td>
</tr>
<tr>
<th scope="row">Last name</th>
<td>{{ _p.user.last_name }}</td>
<td>{{ p.user.last_name }}</td>
</tr>
<tr>
<th scope="row">Username</th>
<td>{{ _p.user.username }}</td>
<td>{{ p.user.username }}</td>
</tr>
<tr>
<th scope="row">Email</th>
<td>{{ _p.user.email }}</td>
<td>{{ p.user.email }}</td>
</tr>
<tr>
<th scope="row">Account type</th>
<td>{% if _p.user.admin %}Admin{% else %}Regular user{% endif %}</td>
<td>{% if p.user.admin %}Admin{% else %}Regular user{% endif %}</td>
</tr>
</tbody>
</table>

24
templates/settings/base_settings_page.html
View File

@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>{{ _p.page_title }} - {{ _p.app_name }}</title>
<title>{{ p.page_title }} - {{ p.app_name }}</title>
<!-- Bootstrap core CSS -->
<link href="/assets/css/bootstrap.css" rel="stylesheet" crossorigin="anonymous"/>
@ -12,10 +12,10 @@
<body>
<div class="d-flex flex-column flex-shrink-0 p-3 bg-light" style="width: 280px;">
<a href="/" class="d-flex align-items-center mb-3 mb-md-0 me-md-auto link-dark text-decoration-none">
<span class="fs-4">{{ _p.app_name }}</span>
<span class="fs-4">{{ p.app_name }}</span>
</a>
{% if _p.user.admin %}
<span>Version {{ _p.version }}</span>
{% if p.user.admin %}
<span>Version {{ p.version }}</span>
{% endif %}
<hr>
<ul class="nav nav-pills flex-column mb-auto">
@ -24,7 +24,7 @@
Account details
</a>
</li>
{% if _p.user.allow_local_login %}
{% if p.user.allow_local_login %}
<li>
<a href="/settings/change_password" class="nav-link link-dark">
Change password
@ -37,7 +37,7 @@
</a>
</li>
{% if _p.user.admin %}
{% if p.user.admin %}
<hr/>
<li>
<a href="/admin/clients" class="nav-link link-dark">
@ -61,7 +61,7 @@
<a href="#" class="d-flex align-items-center link-dark text-decoration-none dropdown-toggle" id="dropdownUser"
data-bs-toggle="dropdown" aria-expanded="false">
<img src="/assets/img/account.png" alt="" width="32" height="32" class="rounded-circle me-2">
<strong>{{ _p.user.username }}</strong>
<strong>{{ p.user.username }}</strong>
</a>
<ul class="dropdown-menu text-small shadow" aria-labelledby="dropdownUser">
<li><a class="dropdown-item" href="/logout">Sign out</a></li>
@ -70,14 +70,14 @@
</div>
<div class="page_body" style="flex: 1">
{% if let Some(msg) = _p.danger_message %}
{% if let Some(msg) = p.danger_message %}
<div class="alert alert-danger">{{ msg }}</div>
{% endif %}
{% if let Some(msg) = _p.success_message %}
{% if let Some(msg) = p.success_message %}
<div class="alert alert-success">{{ msg }}</div>
{% endif %}
<h2 class="bd-title mt-0" style="margin-bottom: 40px;">{{ _p.page_title }}</h2>
<h2 class="bd-title mt-0" style="margin-bottom: 40px;">{{ p.page_title }}</h2>
{% block content %}
TO_REPLACE
@ -92,8 +92,8 @@
})
</script>
{% if _p.ip_location_api.is_some() %}
<script>const IP_LOCATION_API = "{{ _p.ip_location_api.unwrap() }}"</script>
{% if p.ip_location_api.is_some() %}
<script>const IP_LOCATION_API = "{{ p.ip_location_api.unwrap() }}"</script>
{% endif %}
<script src="/assets/js/ip_location_service.js"></script>
</body>

2
templates/settings/edit_user.html
View File

@ -195,7 +195,7 @@
</div>
</fieldset>
<input type="submit" class="btn btn-primary mt-4" value="{{ _p.page_title }}">
<input type="submit" class="btn btn-primary mt-4" value="{{ p.page_title }}">
</form>
<script>