From 80f8684a5d3dba1c11dc0af0cebe385805b3568e Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Wed, 13 Jan 2021 11:59:01 +0100
Subject: [PATCH] Changing autocomplete attributes

---
 .../ldap-security/ldap-security.component.html            | 4 ++--
 .../manage-users-add/manage-users-add.component.html      | 8 ++++----
 .../manage-users-edit/manage-users-edit.component.html    | 2 +-
 .../main/archiva-web/src/app/services/toast.service.ts    | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/security-configuration/ldap-security/ldap-security.component.html b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/security-configuration/ldap-security/ldap-security.component.html
index b4f55f5a6..d4a8bdd86 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/security-configuration/ldap-security/ldap-security.component.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/security-configuration/ldap-security/ldap-security.component.html
@@ -16,7 +16,7 @@
   ~ under the License.
   -->
 
-<form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()" autocomplete="new-password">
+<form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()" autocomplete="off">
     <p class="row col-md-10">{{'security.config.ldap.explain'|translate}}</p>
     <div class="form-group row col-md-10"
          *ngFor="let attName of ['host_name','port','base_dn','groups_base_dn','bind_dn','bind_password']">
@@ -29,7 +29,7 @@
             <input [attr.type]="attName=='bind_password'?'password':'text'" formControlName="{{attName}}"
                    id="{{attName}}"
                    [ngClass]="getInputClasses(attName)"
-                   autocomplete="new-password"
+                   [attr.autocomplete]="attName=='bind_password'?'new-password':'off'"
             >
         </div>
     </div>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-add/manage-users-add.component.html b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-add/manage-users-add.component.html
index c04ee50c6..22f251608 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-add/manage-users-add.component.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-add/manage-users-add.component.html
@@ -16,7 +16,7 @@
   ~ under the License.
   -->
 
-<form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()">
+<form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()" autocomplete="off">
     <div class="form-group col-md-8">
         <label for="user_id">{{'users.attributes.user_id' |translate}}</label>
         <input type="text" class="form-control" formControlName="user_id" id="user_id"
@@ -47,13 +47,13 @@
         <label for="email">{{'users.attributes.email' |translate}}</label>
         <input type="text" class="form-control" formControlName="email" id="email"
                [ngClass]="valid('email')"
-               placeholder="{{'users.input.email'|translate}}">
+               placeholder="{{'users.input.email'|translate}}" autocomplete="off">
     </div>
     <div class="form-group col-md-8">
         <label for="password">{{'users.attributes.password' |translate}}</label>
         <input type="password" class="form-control" formControlName="password" id="password"
                [ngClass]="valid('password')"
-               placeholder="{{'users.input.password'|translate}}">
+               placeholder="{{'users.input.password'|translate}}" autocomplete="new-password">
         <div *ngFor="let error of getErrorsFor('password')" class="invalid-feedback">
             {{error}}
         </div>
@@ -62,7 +62,7 @@
         <label for="confirm_password">{{'users.attributes.confirm_password' |translate}}</label>
         <input type="password" class="form-control" formControlName="confirm_password" id="confirm_password"
                [ngClass]="valid('confirm_password')"
-               placeholder="{{'users.input.confirm_password'|translate}}">
+               placeholder="{{'users.input.confirm_password'|translate}}" autocomplete="new-password">
     </div>
     <div class="form-group col-md-8">
         <div class="form-check">
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-edit/manage-users-edit.component.html b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-edit/manage-users-edit.component.html
index 8f12e3bf7..37bf41eed 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-edit/manage-users-edit.component.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-edit/manage-users-edit.component.html
@@ -16,7 +16,7 @@
   ~ under the License.
   -->
 
-<form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()">
+<form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()" autocomplete="off">
     <div class="form-group row col-md-8" *ngIf="!editUser.permanent">
         <div class="col-md-1">{{'form.edit' |translate}} <span class="fas fa-edit"></span></div>
         <div class="col-md-6">
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/toast.service.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/toast.service.ts
index 2d515f849..f4955ef1f 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/toast.service.ts
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/toast.service.ts
@@ -87,7 +87,7 @@ export class ToastService {
     options.classname=['alert','alert-info']
     options.type='success'
     if (!options.delay) {
-      options.delay=80000
+      options.delay=8000
     }
     this.show(origin,textOrTpl,options)
   }
-- 
2.39.5