Browse Source

re-set state service on log in

pull/33/head
Kyle Spearrin 7 years ago
parent
commit
173129014a
  1. 2
      jslib
  2. 13
      package-lock.json
  3. 6
      src/app/accounts/login.component.ts
  4. 8
      src/app/accounts/two-factor.component.ts

2
jslib

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit 24ffb55ce0e781fb06cd04d318e9f70afe80d734
Subproject commit 2aa71f98a1f623470b3bd71306e0ef8a1ba97758

13
package-lock.json generated

@ -2597,7 +2597,8 @@ @@ -2597,7 +2597,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
@ -3012,7 +3013,8 @@ @@ -3012,7 +3013,8 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
@ -3068,6 +3070,7 @@ @@ -3068,6 +3070,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@ -3111,12 +3114,14 @@ @@ -3111,12 +3114,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},

6
src/app/accounts/login.component.ts

@ -11,6 +11,7 @@ import { EnvironmentComponent } from './environment.component'; @@ -11,6 +11,7 @@ import { EnvironmentComponent } from './environment.component';
import { AuthService } from 'jslib/abstractions/auth.service';
import { I18nService } from 'jslib/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service';
import { LoginComponent as BaseLoginComponent } from 'jslib/angular/components/login.component';
@ -25,8 +26,9 @@ export class LoginComponent extends BaseLoginComponent { @@ -25,8 +26,9 @@ export class LoginComponent extends BaseLoginComponent {
constructor(authService: AuthService, router: Router,
i18nService: I18nService, private componentFactoryResolver: ComponentFactoryResolver,
storageService: StorageService, platformUtilsService: PlatformUtilsService) {
super(authService, router, platformUtilsService, i18nService, storageService);
storageService: StorageService, platformUtilsService: PlatformUtilsService,
stateService: StateService) {
super(authService, router, platformUtilsService, i18nService, storageService, stateService);
super.successRoute = '/tabs/dashboard';
}

8
src/app/accounts/two-factor.component.ts

@ -16,6 +16,8 @@ import { AuthService } from 'jslib/abstractions/auth.service'; @@ -16,6 +16,8 @@ import { AuthService } from 'jslib/abstractions/auth.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service';
import { ModalComponent } from 'jslib/angular/components/modal.component';
import { TwoFactorComponent as BaseTwoFactorComponent } from 'jslib/angular/components/two-factor.component';
@ -30,8 +32,10 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { @@ -30,8 +32,10 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
constructor(authService: AuthService, router: Router,
i18nService: I18nService, apiService: ApiService,
platformUtilsService: PlatformUtilsService, environmentService: EnvironmentService,
private componentFactoryResolver: ComponentFactoryResolver) {
super(authService, router, i18nService, apiService, platformUtilsService, window, environmentService);
private componentFactoryResolver: ComponentFactoryResolver, stateService: StateService,
storageService: StorageService) {
super(authService, router, i18nService, apiService, platformUtilsService, window, environmentService,
stateService, storageService);
super.successRoute = '/tabs/dashboard';
}

Loading…
Cancel
Save