Feature/account popup null (#14)

tuxtux59 · web-flow · commit bbab55b90bf1 · 2021-02-15T09:58:02.000+01:00
* remove useless console

* close account popup if defined and not nul

* follow codacy feedback

* lint

* use typeof undefined instead of match&amp;
diff --git a/projects/cryptr/cryptr-angular/src/lib/account-access-button/account-access-button.component.ts b/projects/cryptr/cryptr-angular/src/lib/account-access-button/account-access-button.component.ts
@@ -56,7 +56,7 @@ export class AccountAccessButtonComponent implements OnChanges {
   errorBtnClass = ERROR_BTN_CLASS;
 
   closeAccountPopup(): void {
-    if (this.accountPopup !== undefined) {
+    if (typeof this.accountPopup !== 'undefined' && this.accountPopup !== null) {
       this.accountPopup.close();
     }
   }
@@ -168,14 +168,14 @@ export class AccountAccessButtonComponent implements OnChanges {
   }
 
   initials(): any {
-    if (!this.isAuthenticated() || this.user() === undefined || this.fullName() === undefined) {
+    if (!this.isAuthenticated() || typeof this.user() === 'undefined' || typeof this.fullName() === 'undefined') {
       return;
     }
     return this.fullName().match(/\b(\w)/g).join('');
   }
 
   fullName(): any {
-    if (!this.isAuthenticated() || this.user() === undefined || this.email() === undefined) {
+    if (!this.isAuthenticated() || typeof this.user() === 'undefined' || typeof this.email() === 'undefined') {
       return;
     }
     const emailName = this.email().split('@')[0];
diff --git a/projects/playground/src/app/components/nav/nav.component.ts b/projects/playground/src/app/components/nav/nav.component.ts
@@ -27,7 +27,6 @@ export class NavComponent implements OnInit {
   ngOnInit(): void {
     this.cryptrListeners();
     this.auth.currentAuthenticationObservable().subscribe((isAuthenticated: boolean) => {
-      console.log(isAuthenticated);
       this.authenticated = isAuthenticated;
     });
     this.auth.getObservableUser().subscribe((user) => {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ export class AccountAccessButtonComponent implements OnChanges {`
`56`	`56`	`errorBtnClass = ERROR_BTN_CLASS;`
`57`	`57`
`58`	`58`	`closeAccountPopup(): void {`
`59`		`- if (this.accountPopup !== undefined) {`
	`59`	`+ if (typeof this.accountPopup !== 'undefined' && this.accountPopup !== null) {`
`60`	`60`	`this.accountPopup.close();`
`61`	`61`	`}`
`62`	`62`	`}`
`@@ -168,14 +168,14 @@ export class AccountAccessButtonComponent implements OnChanges {`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`initials(): any {`
`171`		`- if (!this.isAuthenticated() \|\| this.user() === undefined \|\| this.fullName() === undefined) {`
	`171`	`+ if (!this.isAuthenticated() \|\| typeof this.user() === 'undefined' \|\| typeof this.fullName() === 'undefined') {`
`172`	`172`	`return;`
`173`	`173`	`}`
`174`	`174`	`return this.fullName().match(/\b(\w)/g).join('');`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`fullName(): any {`
`178`		`- if (!this.isAuthenticated() \|\| this.user() === undefined \|\| this.email() === undefined) {`
	`178`	`+ if (!this.isAuthenticated() \|\| typeof this.user() === 'undefined' \|\| typeof this.email() === 'undefined') {`
`179`	`179`	`return;`
`180`	`180`	`}`
`181`	`181`	`const emailName = this.email().split('@')[0];`