Merge pull request primefaces#274 from Nanitor/dev-fix-nondomain-signin

Fix non-domain sign in.
Nanitor · Jul 31, 2019 · 3627921 · 3627921
2 parents 9ab120a + 057a4e9
commit 3627921
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/account/signin.component.ts b/src/account/signin.component.ts
@@ -53,7 +53,13 @@ export class SigninComponent {
 
     signin(event) {
         event.preventDefault();
-        let r = this.accountService.signin(this.model.email, this.model.password, this.signinDomain, this.model.account_name);
+
+        let r = null;
+        if (this.isLocalAuth()) {
+            r = this.accountService.signin(this.model.email, this.model.password, "", "");
+        } else {
+            r = this.accountService.signin("", this.model.password, this.signinDomain, this.model.account_name);
+        }
         r.subscribe(
             (data: SigninResponse)  => {
                 let obj: SigninResponse = data;
@@ -77,7 +83,7 @@ export class SigninComponent {
     }
 
     isLocalAuth(): boolean {
-        if (this.signinDomain && this.signinDomain.length > 0) {
+        if (this.domainAuthenticationEnabled && this.signinDomain && this.signinDomain.length > 0) {
             return false;
         }
         return true;