Seperate internal and public user service.

2 files changed, 16 insertions, 16 deletions

diff --git a/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.spec.ts b/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.spec.ts
index d24c0cd2..dd7af6ca 100644
--- a/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.spec.ts
+++ b/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.spec.ts
@@ -4,9 +4,9 @@ import { By } from '@angular/platform-browser';
 import { of } from 'rxjs';
 import { delay } from 'rxjs/operators';
 
-import { UserInfo } from '../user-info';
+import { UserInfo } from '../entities';
 import { UserDialogComponent } from './user-dialog.component';
-import { UserService, UserLoginState } from '../user-service/user.service';
+import { InternalUserService, UserLoginState } from '../internal-user-service/internal-user.service';
 import { LoginEvent } from '../user-login/user-login.component';
 
 @Component({
@@ -38,7 +38,7 @@ class UserLoginSuccessStubComponent { }
 describe('UserDialogComponent', () => {
   let component: UserDialogComponent;
   let fixture: ComponentFixture<UserDialogComponent>;
-  let mockUserService: jasmine.SpyObj<UserService>;
+  let mockUserService: jasmine.SpyObj<InternalUserService>;
 
   beforeEach(async(() => {
     mockUserService = jasmine.createSpyObj('UserService', ['validateUserLoginState', 'tryLogin']);
@@ -46,7 +46,7 @@ describe('UserDialogComponent', () => {
     TestBed.configureTestingModule({
       declarations: [UserDialogComponent, MatProgressSpinnerStubComponent,
         UserLoginStubComponent, UserLoginSuccessStubComponent],
-      providers: [{ provide: UserService, useValue: mockUserService }]
+      providers: [{ provide: InternalUserService, useValue: mockUserService }]
     })
       .compileComponents();
   }));
@@ -57,7 +57,7 @@ describe('UserDialogComponent', () => {
   });
 
   it('progress spinner should work well', fakeAsync(() => {
-    mockUserService.validateUserLoginState.and.returnValue(of(<UserLoginState>{ state: 'nologin' }).pipe(delay(10)));
+    mockUserService.refreshAndGetUserState.and.returnValue(of(<UserLoginState>{ state: 'nologin' }).pipe(delay(10)));
     fixture.detectChanges();
     expect(fixture.debugElement.query(By.css('mat-progress-spinner'))).toBeTruthy();
     tick(10);
@@ -66,30 +66,30 @@ describe('UserDialogComponent', () => {
   }));
 
   it('nologin should work well', () => {
-    mockUserService.validateUserLoginState.and.returnValue(of(<UserLoginState>{ state: 'nologin' }));
+    mockUserService.refreshAndGetUserState.and.returnValue(of(<UserLoginState>{ state: 'nologin' }));
 
     fixture.detectChanges();
 
-    expect(mockUserService.validateUserLoginState).toHaveBeenCalled();
+    expect(mockUserService.refreshAndGetUserState).toHaveBeenCalled();
     expect(fixture.debugElement.query(By.css('app-user-login'))).toBeTruthy();
     expect(fixture.debugElement.query(By.css('app-user-login-success'))).toBeFalsy();
   });
 
   it('success should work well', () => {
-    mockUserService.validateUserLoginState.and.returnValue(of(<UserLoginState>{ state: 'success', userInfo: {} }));
+    mockUserService.refreshAndGetUserState.and.returnValue(of(<UserLoginState>{ state: 'success', userInfo: {} }));
 
     fixture.detectChanges();
 
-    expect(mockUserService.validateUserLoginState).toHaveBeenCalled();
+    expect(mockUserService.refreshAndGetUserState).toHaveBeenCalled();
     expect(fixture.debugElement.query(By.css('app-user-login'))).toBeFalsy();
     expect(fixture.debugElement.query(By.css('app-user-login-success'))).toBeTruthy();
   });
 
   it('login should work well', () => {
-    mockUserService.validateUserLoginState.and.returnValue(of(<UserLoginState>{ state: 'nologin' }));
+    mockUserService.refreshAndGetUserState.and.returnValue(of(<UserLoginState>{ state: 'nologin' }));
 
     fixture.detectChanges();
-    expect(mockUserService.validateUserLoginState).toHaveBeenCalled();
+    expect(mockUserService.refreshAndGetUserState).toHaveBeenCalled();
     expect(fixture.debugElement.query(By.css('app-user-login'))).toBeTruthy();
     expect(fixture.debugElement.query(By.css('app-user-login-success'))).toBeFalsy();
 
diff --git a/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.ts b/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.ts
index 0edde924..498ffaa1 100644
--- a/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.ts
+++ b/Timeline/ClientApp/src/app/user/user-dialog/user-dialog.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
-import { UserService } from '../user-service/user.service';
+import { InternalUserService } from '../internal-user-service/internal-user.service';
 import { RouterOutlet, Router, ActivationStart } from '@angular/router';
 
 @Component({
@@ -9,7 +9,7 @@ import { RouterOutlet, Router, ActivationStart } from '@angular/router';
 })
 export class UserDialogComponent implements OnInit, OnDestroy {
 
-  constructor(private userService: UserService, private router: Router) { }
+  constructor(private userService: InternalUserService, private router: Router) { }
 
   @ViewChild(RouterOutlet) outlet: RouterOutlet;
 
@@ -24,12 +24,12 @@ export class UserDialogComponent implements OnInit, OnDestroy {
     });
 
 
-    this.userService.validateUserLoginState().subscribe(result => {
+    this.userService.refreshAndGetUserState().subscribe(result => {
       this.isLoading = false;
-      if (result.state === 'success') {
+      if (result === 'success') {
         this.userService.userRouteNavigate(['success', { reason: 'already' }]);
       } else {
-        this.userService.userRouteNavigate(['login', { reason: result.state }]);
+        this.userService.userRouteNavigate(['login', { reason: result }]);
       }
     });
   }