Skip to content

Commit

Permalink
Merge pull request #701 from numerique-gouv/ds-feedback
Browse files Browse the repository at this point in the history 
Ds feedback
  • Loading branch information
@rdubigny
rdubigny authored Sep 24, 2024
2 parents 6a9da94 + c08b44a commit 006d532
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 85 deletions.
2 changes: 1 addition & 1 deletion cypress/e2e/activate_totp/index.cy.ts
View file
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
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
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

0 comments on commit 006d532

Please sign in to comment.