Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ds feedback #701

Merged
merged 2 commits into from
Sep 24, 2024
Merged

Ds feedback #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08c8b14
feat: switch webauthn & totp sections
rdubigny Sep 23, 2024
c08b44a
feat: a user is wondering if this implementation is compatible with o…
rdubigny Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cypress/e2e/activate_totp/index.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ describe("add 2fa authentication", () => {

cy.login("[email protected]");

cy.contains("Application FreeOTP Authenticator");
cy.contains("Application Authenticator");

cy.contains("Configurer une application d’authentification").click();

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/delete_totp/index.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe("delete TOTP connexion", () => {

cy.mfaLogin("[email protected]");

cy.contains("Application FreeOTP Authenticator");
cy.contains("Application Authenticator");

cy.contains("Supprimer l’application d’authentification").click();

Expand Down
166 changes: 83 additions & 83 deletions src/views/connection-and-account.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,89 @@
</form>
</section>

<section class="fr-mb-6w">
<h3>Application Authenticator</h3>
<p>
Recevez un code de validation via une appli d’authentification, même si votre téléphone est hors
connexion.
</p>
<p>
Téléchargez d’abord FreeOTP Authenticator sur le
<a
class="fr-link" target="_blank" rel="noopener noreferrer"
href="https://play.google.com/store/apps/details?id=org.fedorahosted.freeotp&pcampaignid=web_share"
>Google Play Store</a>
ou l’
<a
class="fr-link" target="_blank" rel="noopener noreferrer"
href="https://apps.apple.com/us/app/freeotp-authenticator/id872559395"
>App Store iOS</a> ou un équivalent.
</p>

<% if (isAuthenticatorConfigured) { %>
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col-12">
<div class="fr-tile fr-tile--horizontal">
<div class="fr-tile__body">
<h4 class="fr-tile__title">Votre méthode d’authentification</h4>
<p class="fr-tile__desc fr-pb-0">FreeOTP Authenticator</p>
<p class="fr-tile__desc">Ajout : <%= totpKeyVerifiedAt; %></p>
<div class="card-button-container">
<a
class="fr-btn fr-btn--secondary fr-btn--sm"
href="/authenticator-app-configuration"
type="submit"
>
Changer d’application d’authentification
</a>
<form action="/delete-authenticator-app-configuration" method="post">
<input
type="hidden"
name="_csrf"
value="<%= csrfToken; %>"
autocomplete="off"
>
<button
class="fr-btn fr-btn--secondary fr-btn--sm js-confirm"
data-confirm="Cette action est irreversible."
type="submit"
>
Supprimer l’application d’authentification
</button>
</form>
</div>
</div>
<div class="fr-tile__header">
<div class="fr-tile__pictogram">
<svg
aria-hidden="true"
class="fr-artwork"
viewBox="0 0 80 80"
width="80px"
height="80px"
>
<use
class="fr-artwork-decorative"
href="/dist/application.svg#artwork-decorative"
></use>
<use class="fr-artwork-minor" href="/dist/application.svg#artwork-minor"></use>
<use class="fr-artwork-major" href="/dist/application.svg#artwork-major"></use>
</svg>
</div>
</div>
</div>
</div>
</div>
<% } else { %>
<a
class="fr-btn fr-btn--secondary fr-btn--icon-left fr-icon-add-line"
href="/authenticator-app-configuration"
>
Configurer une application d’authentification
</a>
<% } %>
</section>

<section class="fr-mb-6w">
<h3>Clés d’accès</h3>
<div class="fr-alert fr-alert--error fr-mb-1w" id="webauthn-alert-error" hidden></div>
Expand Down Expand Up @@ -132,89 +215,6 @@
<script type="module" src="<%= js('webauthn-registration.js') %>"></script>
</section>

<section class="fr-mb-6w">
<h3>Application FreeOTP Authenticator</h3>
<p>
Recevez un code de validation via une appli d’authentification, même si votre téléphone est hors
connexion.
</p>
<p>
Téléchargez d’abord FreeOTP Authenticator sur le
<a
class="fr-link" target="_blank" rel="noopener noreferrer"
href="https://play.google.com/store/apps/details?id=org.fedorahosted.freeotp&pcampaignid=web_share"
>Google Play Store</a>
ou l’
<a
class="fr-link" target="_blank" rel="noopener noreferrer"
href="https://apps.apple.com/us/app/freeotp-authenticator/id872559395"
>App Store iOS</a>.
</p>

<% if (isAuthenticatorConfigured) { %>
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col-12">
<div class="fr-tile fr-tile--horizontal">
<div class="fr-tile__body">
<h4 class="fr-tile__title">Votre méthode d’authentification</h4>
<p class="fr-tile__desc fr-pb-0">FreeOTP Authenticator</p>
<p class="fr-tile__desc">Ajout : <%= totpKeyVerifiedAt; %></p>
<div class="card-button-container">
<a
class="fr-btn fr-btn--secondary fr-btn--sm"
href="/authenticator-app-configuration"
type="submit"
>
Changer d’application d’authentification
</a>
<form action="/delete-authenticator-app-configuration" method="post">
<input
type="hidden"
name="_csrf"
value="<%= csrfToken; %>"
autocomplete="off"
>
<button
class="fr-btn fr-btn--secondary fr-btn--sm js-confirm"
data-confirm="Cette action est irreversible."
type="submit"
>
Supprimer l’application d’authentification
</button>
</form>
</div>
</div>
<div class="fr-tile__header">
<div class="fr-tile__pictogram">
<svg
aria-hidden="true"
class="fr-artwork"
viewBox="0 0 80 80"
width="80px"
height="80px"
>
<use
class="fr-artwork-decorative"
href="/dist/application.svg#artwork-decorative"
></use>
<use class="fr-artwork-minor" href="/dist/application.svg#artwork-minor"></use>
<use class="fr-artwork-major" href="/dist/application.svg#artwork-major"></use>
</svg>
</div>
</div>
</div>
</div>
</div>
<% } else { %>
<a
class="fr-btn fr-btn--secondary fr-btn--icon-left fr-icon-add-line"
href="/authenticator-app-configuration"
>
Configurer une application d’authentification
</a>
<% } %>
</section>

<% if (locals.is2faCapable) { %>
<section class="fr-mb-6w">
<h3>Validation en deux étapes</h3>
Expand Down