Skip to content

Commit

Permalink
client: hide email uppercase warning
Browse files Browse the repository at this point in the history
related to #6570
  • Loading branch information
kontrollanten committed Feb 1, 2025
1 parent 94a7879 commit 3d8e5d9
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 23 deletions.
10 changes: 0 additions & 10 deletions client/src/app/+login/login.component.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
<ng-template #uppercaseWarning>
<div i18n class="form-warning">
⚠️ Most email addresses do not include capital letters.
</div>
</ng-template>

<div class="margin-content">
<h1 class="title-page" i18n>Login on {{ instanceName }}</h1>

Expand Down Expand Up @@ -55,8 +49,6 @@ <h5 class="alert-heading" i18n>
</div>

<div *ngIf="formErrors.username" class="form-error" role="alert">{{ formErrors.username }}</div>

<ng-template *ngIf="hasUsernameUppercase()" [ngTemplateOutlet]="uppercaseWarning"></ng-template>
</div>

<div class="form-group">
Expand Down Expand Up @@ -145,8 +137,6 @@ <h4 i18n class="modal-title">Forgot your password</h4>
type="email" id="forgot-password-email" i18n-placeholder placeholder="Email address" required
[(ngModel)]="forgotPasswordEmail" #forgotPasswordEmailInput
>

<ng-template *ngIf="hasForgotPasswordEmailUppercase()" [ngTemplateOutlet]="uppercaseWarning"></ng-template>
</div>
</div>

Expand Down
13 changes: 0 additions & 13 deletions client/src/app/+login/login.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,19 +203,6 @@ The link will expire within 1 hour.`
this.accordion = instanceAboutAccordion.accordion
}

hasUsernameUppercase () {
const username = this.form.value['username']
if (!username) return false

return username.match(/[A-Z]/)
}

hasForgotPasswordEmailUppercase () {
if (!this.forgotPasswordEmail) return false

return this.forgotPasswordEmail.match(/[A-Z]/)
}

private loadExternalAuthToken (username: string, token: string) {
this.isAuthenticatedWithExternalAuth = true

Expand Down

0 comments on commit 3d8e5d9

Please sign in to comment.