Browse Source

Clean up

pull/1147/head
Thomas 3 years ago
parent
commit
030a3a1f11
  1. 4
      angular.json
  2. 4
      apps/client/src/app/core/auth.guard.ts
  3. 4
      apps/client/src/app/pages/auth/auth-page.component.ts
  4. 2
      apps/client/src/app/services/token-storage.service.ts

4
angular.json

@ -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": "",

4
apps/client/src/app/core/auth.guard.ts

@ -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

4
apps/client/src/app/pages/auth/auth-page.component.ts

@ -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'

2
apps/client/src/app/services/token-storage.service.ts

@ -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);
} }

Loading…
Cancel
Save