Thomas Kaul
					
					3 years ago
					
						
							committed by
							
								
								GitHub
							
						 
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 4AEE18F83AFDEB23
						
					
				
			
		
		
		
	
		
			
				 6 changed files with 
4 additions and 
14 deletions
			 
			
		 
		
			
				- 
					
					
					 
					CHANGELOG.md
				
 
			
				- 
					
					
					 
					angular.json
				
 
			
				- 
					
					
					 
					apps/client/src/app/core/auth.guard.ts
				
 
			
				- 
					
					
					 
					apps/client/src/app/pages/auth/auth-page.component.ts
				
 
			
				- 
					
					
					 
					apps/client/src/app/services/token-storage.service.ts
				
 
			
				- 
					
					
					 
					package.json
				
 
			
		
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
					@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | 
					 | 
					 | 
					The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | 
					 | 
					 | 
					and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					## 1.179.2 - 13.08.2022 | 
					 | 
					 | 
					## 1.179.3 - 13.08.2022 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					### Added | 
					 | 
					 | 
					### Added | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  | 
				
			
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
					@ -87,11 +87,11 @@ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                "input": "", | 
					 | 
					 | 
					                "input": "", | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                "output": "./../assets" | 
					 | 
					 | 
					                "output": "./../assets" | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					              }, | 
					 | 
					 | 
					              }, | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					              /*{ | 
					 | 
					 | 
					              { | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					                "glob": "index.html", | 
					 | 
					 | 
					                "glob": "index.html", | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                "input": "apps/client/src/assets", | 
					 | 
					 | 
					                "input": "apps/client/src/assets", | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                "output": "./../" | 
					 | 
					 | 
					                "output": "./../" | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					              },*/ | 
					 | 
					 | 
					              }, | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					              { | 
					 | 
					 | 
					              { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                "glob": "LICENSE", | 
					 | 
					 | 
					                "glob": "LICENSE", | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                "input": "", | 
					 | 
					 | 
					                "input": "", | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  | 
				
			
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
					@ -48,8 +48,6 @@ export class AuthGuard implements CanActivate { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        .get() | 
					 | 
					 | 
					        .get() | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        .pipe( | 
					 | 
					 | 
					        .pipe( | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					          catchError(() => { | 
					 | 
					 | 
					          catchError(() => { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            console.log(`TODO: canActivate error (${state.url})`); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            if (utmSource === 'ios') { | 
					 | 
					 | 
					            if (utmSource === 'ios') { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					              this.router.navigate(['/demo']); | 
					 | 
					 | 
					              this.router.navigate(['/demo']); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					              resolve(false); | 
					 | 
					 | 
					              resolve(false); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -74,8 +72,6 @@ export class AuthGuard implements CanActivate { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					          }) | 
					 | 
					 | 
					          }) | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        ) | 
					 | 
					 | 
					        ) | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        .subscribe((user) => { | 
					 | 
					 | 
					        .subscribe((user) => { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					          console.log(`TODO: canActivate`, user); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					          if ( | 
					 | 
					 | 
					          if ( | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            state.url.startsWith('/home') && | 
					 | 
					 | 
					            state.url.startsWith('/home') && | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            user.settings.viewMode === ViewMode.ZEN | 
					 | 
					 | 
					            user.settings.viewMode === ViewMode.ZEN | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  | 
				
			
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
					@ -24,15 +24,11 @@ export class AuthPageComponent implements OnDestroy, OnInit { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					  ) {} | 
					 | 
					 | 
					  ) {} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					  public ngOnInit() { | 
					 | 
					 | 
					  public ngOnInit() { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    console.log('TODO: Init AuthPageComponent'); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    this.route.params | 
					 | 
					 | 
					    this.route.params | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					      .pipe(takeUntil(this.unsubscribeSubject)) | 
					 | 
					 | 
					      .pipe(takeUntil(this.unsubscribeSubject)) | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					      .subscribe((params) => { | 
					 | 
					 | 
					      .subscribe((params) => { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        const jwt = params['jwt']; | 
					 | 
					 | 
					        const jwt = params['jwt']; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        console.log(`TODO: ${jwt}`); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        this.tokenStorageService.saveToken( | 
					 | 
					 | 
					        this.tokenStorageService.saveToken( | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					          jwt, | 
					 | 
					 | 
					          jwt, | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					          this.settingsStorageService.getSetting(STAY_SIGNED_IN) === 'true' | 
					 | 
					 | 
					          this.settingsStorageService.getSetting(STAY_SIGNED_IN) === 'true' | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  | 
				
			
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
					@ -22,8 +22,6 @@ export class TokenStorageService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					  } | 
					 | 
					 | 
					  } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					  public saveToken(token: string, staySignedIn = false): void { | 
					 | 
					 | 
					  public saveToken(token: string, staySignedIn = false): void { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    console.log('TODO: saveToken', token); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    if (staySignedIn) { | 
					 | 
					 | 
					    if (staySignedIn) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					      window.localStorage.setItem(TOKEN_KEY, token); | 
					 | 
					 | 
					      window.localStorage.setItem(TOKEN_KEY, token); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  | 
				
			
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
		
			
				
					| 
						
						
						
					 | 
					@ -1,6 +1,6 @@ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					{ | 
					 | 
					 | 
					{ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					  "name": "ghostfolio", | 
					 | 
					 | 
					  "name": "ghostfolio", | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					  "version": "1.179.2", | 
					 | 
					 | 
					  "version": "1.179.3", | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					  "homepage": "https://ghostfol.io", | 
					 | 
					 | 
					  "homepage": "https://ghostfol.io", | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					  "license": "AGPL-3.0", | 
					 | 
					 | 
					  "license": "AGPL-3.0", | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					  "scripts": { | 
					 | 
					 | 
					  "scripts": { | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |