github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-21 05:43:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small user changes #865

Browse source
This commit is contained in:
Jamie.Rees 2017-05-24 16:31:36 +01:00
commit 8a98761fec
3 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ombi/wwwroot/app/app.component.ts
View file

@ -34,6 +34,8 @@ export class AppComponent implements OnInit {
this.settingsService.getCustomization().subscribe(x => this.customizationSettings = x); this.settingsService.getCustomization().subscribe(x => this.customizationSettings = x);
this.router.events.subscribe(() => { this.router.events.subscribe(() => {
this.user = this.authService.claims();
this.showNav = this.authService.loggedIn(); this.showNav = this.authService.loggedIn();
}); });

2
src/Ombi/wwwroot/app/auth/auth.service.ts
View file

@ -40,7 +40,7 @@ export class AuthService extends ServiceHelpers {
var u = { name: name, roles: [] as string[] }; var u = { name: name, roles: [] as string[] };
if (roles instanceof Array) { if (roles instanceof Array) {
u.roles.concat(roles); u.roles = roles;
} else { } else {
u.roles.push(roles); u.roles.push(roles);
} }

8
src/Ombi/wwwroot/app/login/login.component.ts
View file

@ -29,11 +29,6 @@ export class LoginComponent {
this.authService.login({ password: this.password, username: this.username }) this.authService.login({ password: this.password, username: this.username })
.subscribe(x => { .subscribe(x => {
localStorage.setItem("id_token", x.access_token); localStorage.setItem("id_token", x.access_token);
localStorage.setItem('currentUser', this.username);
this.identityService.getUser().subscribe(r => {
localStorage.setItem("roles", JSON.stringify(r.claims));
localStorage.setItem("user", JSON.stringify(r));
if (this.authService.loggedIn()) { if (this.authService.loggedIn()) {
this.router.navigate(['search']); this.router.navigate(['search']);
@ -41,10 +36,7 @@ export class LoginComponent {
this.notify.error("Could not log in", "Incorrect username or password"); this.notify.error("Could not log in", "Incorrect username or password");
} }
});
}, err => this.notify.error("Could not log in", "Incorrect username or password")); }, err => this.notify.error("Could not log in", "Incorrect username or password"));
} }
} }