From 3b2ff3e6e8eda4362022231a288e4faf47a8eba9 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Thu, 9 Jan 2020 22:46:51 +0300 Subject: [PATCH] fix(account): fix enableLocalLogin definition --- .../auth-wrapper/auth-wrapper.component.html | 2 +- .../auth-wrapper/auth-wrapper.component.ts | 27 ++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.html b/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.html index 531c598a5e..145935f7c5 100644 --- a/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.html +++ b/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.html @@ -6,7 +6,7 @@
diff --git a/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.ts b/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.ts index aadbbfa656..0552d88f26 100644 --- a/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.ts +++ b/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.ts @@ -1,6 +1,6 @@ -import { Component, Input, TemplateRef } from '@angular/core'; +import { Component, Input, TemplateRef, OnInit, OnDestroy } from '@angular/core'; import { Account } from '../../models/account'; -import { Select } from '@ngxs/store'; +import { Select, Store } from '@ngxs/store'; import { ConfigState } from '@abp/ng.core'; import { Observable } from 'rxjs'; @@ -10,13 +10,28 @@ import { Observable } from 'rxjs'; exportAs: 'abpAuthWrapper', }) export class AuthWrapperComponent - implements Account.AuthWrapperComponentInputs, Account.AuthWrapperComponentOutputs { - @Select(ConfigState.getSetting('Abp.Account.EnableLocalLogin')) - enableLocalLogin$: Observable<'True' | 'False'>; - + implements + Account.AuthWrapperComponentInputs, + Account.AuthWrapperComponentOutputs, + OnInit, + OnDestroy { @Input() readonly mainContentRef: TemplateRef; @Input() readonly cancelContentRef: TemplateRef; + + enableLocalLogin = true; + + constructor(private store: Store) {} + + ngOnInit() { + this.store.select(ConfigState.getSetting('Abp.Account.EnableLocalLogin')).subscribe(value => { + if (value) { + this.enableLocalLogin = value.toLowerCase() !== 'false'; + } + }); + } + + ngOnDestroy() {} }