refactoring & debuging

src/components/contact.ts

@@ -31,16 +31,7 @@ export class Contact {
         }
 
         if (!this.user.conversation) {
-            let conversation = new Conversation();
-            let attendees = new Array<Attendee>();
-            let attendee = new Attendee();
-
-            attendee.userId = this.user.id;
-            attendees.push(attendee);
-            conversation.attendees = attendees;
-            conversation.messages = new Array<Message>();
-
-            this.user.conversation = conversation;
+            this.user.conversation = new Conversation(this.user);
         }
 
         this.service.showConversation(this.user.conversation, this.router);        

src/components/conversation-preview.ts

@@ -25,6 +25,7 @@ export class ConversationPreview {
 
     attached() {
         this.lastMessage = this.conversation.messages[0].text;
+        this.isSelected = this.conversation && this.conversation.isInitiatedByUser;
 
         this.conversationSelectedSubscription = this.ea.subscribe(ConversationSelected, e => {
             if (e.conversation.id === this.conversation.id) {

src/environment.ts

@@ -1,5 +1,5 @@
 export default {
-  debug: false,
-  testing: false,
-  apiBaseUrl: 'https://chatle-server.herokuapp.com'
+  debug: true,
+  testing: true,
+  apiBaseUrl: 'http://localhost:5000'
 };

src/model/conversation.ts

@@ -1,9 +1,23 @@
 import { Attendee } from './attendee';
 import { Message } from './message';
+import { User } from './user';
 
 export class Conversation {
     id: string;
     title: string;
     attendees: Attendee[];
-    messages: Message[]
+    messages: Message[];
+    isInitiatedByUser: boolean;
+
+    constructor(user?: User) {
+        if (!user) {
+            return;
+        }
+
+        let attendees = new Array<Attendee>();
+        attendees.push(new Attendee(user.id));
+        this.attendees = attendees;
+        this.messages = new Array<Message>();
+        this.isInitiatedByUser = true;
+    }
 }

src/model/provider.ts

@@ -0,0 +1,4 @@
+export class Provider {
+    displayName: string;
+    authenticationScheme: string;
+}

src/pages/home.ts

@@ -14,8 +14,7 @@ export class Home {
     private connectionStateSubscription: Subscription;
     private showConversationSubscription: Subscription;
 
-    constructor(public chatService: ChatService,
-        private loginService: LoginService,
+    constructor(private chatService: ChatService,
         private ea: EventAggregator) { }
 
     configureRouter(config: RouterConfiguration, router: Router) {
@@ -44,7 +43,7 @@ export class Home {
 
     private setIsDisconnected(state: ConnectionState) {
         if (state === ConnectionState.Error) {
-            this.loginService.logoff();
+            this.router.navigateToRoute('login');
         } if (state === ConnectionState.Disconnected) {
             this.isDisconnected = true;
         } else {

src/pages/login.html

@@ -27,12 +27,10 @@ <h4>Guess access.</h4>
 		<section>
 			<h4>Use another service to log in.</h4>
 			<hr>
-			<form class="form-horizontal" role="form" method="post" action.bind="externalLogin" disabled.bind="token">
+			<form class="form-horizontal" role="form" method="post" action.bind="externalLogin">
 				<div>
 					<p>
-						<button type="submit" class="btn btn-default" name="provider" value="Google" title="Log in using your Google account">Google</button>
-						<button type="submit" class="btn btn-default" name="provider" value="Twitter" title="Log in using your Twitter account">Twitter</button>
-						<button type="submit" class="btn btn-default" name="provider" value="Facebook" title="Log in using your Facebook account">Facebook</button>
+						<button type="submit" class="btn btn-default" name="provider" repeat.for="provider of providers" value.bind="provider.authenticationScheme" title="Log in using your ${provider.displayName} account">${provider.displayName}</button>
 					</p>
 				</div>
 				<input name="__RequestVerificationToken" type="hidden" value.bind="token"></form>

src/pages/login.ts

@@ -4,12 +4,14 @@ import { Router } from 'aurelia-router';
 import { LoginService } from '../services/login.service';
 import { Settings } from '../config/settings';
 import { State } from '../services/state';
+import { Provider } from '../model/provider';
 
 @autoinject
 export class Login {
     error: Error;
     externalLogin: string;
     token: string;
+    providers: Array<Provider>;
 
     constructor(private service: LoginService, private router: Router, private state: State, settings: Settings) {
         let location = window.location; 
@@ -32,8 +34,12 @@ export class Login {
     activate() {
         this.service.logoff();
         this.service.getXhrf(true)
-            .then(t => 
-                this.token = t)
+            .then(t => {
+                this.token = t;
+                this.service.getExternalLoginProviders()
+                    .then(providers => this.providers = providers)
+                    .catch(e => this.error = e);
+            })
             .catch(e => 
                 this.error = e);
     }

src/services/login.service.ts

@@ -5,6 +5,7 @@ import { Settings } from '../config/settings';
 import { ChatService } from './chat.service';
 import { Helpers } from './helpers';
 import { State } from './state';
+import { Provider } from '../model/provider'
 
 @autoinject
 export class LoginService {
@@ -95,6 +96,20 @@ export class LoginService {
         });
     }
 
+    getExternalLoginProviders(): Promise<Array<Provider>> {
+        return new Promise<Array<Provider>>((resolve, reject) => {
+            this.getXhrf()
+                .then(r => {
+                    this.http.get(this.settings.accountdAPI + "/getExternalProviders")
+                        .then(response => {
+                            resolve(response.content as Array<Provider>);
+                        })
+                        .catch(error => this.manageError(error, reject, this.helpers.getError(error)));
+                })
+                .catch(error => reject(new Error('the service is down')));
+        });
+    }
+
     private setXhrf(resolve: Function, reject: Function) {
         this.http.get('xhrf')
             .then(r => {

test/unit/pages/home.spec.ts

@@ -27,16 +27,12 @@ describe('home page specs', () => {
             }
         } as Promise<string>;
 
-        loginService = {
-            logoff: () => { }
-        } as LoginService;
-
         chatService = {
             start: () => { }
         } as ChatService;
 
         ea = new EventAggregator();
-        page = new Home(chatService, loginService, ea);
+        page = new Home(chatService, ea);
     });
 
     it('configureRouter should add conversation route in router configuration', () => {
@@ -64,7 +60,7 @@ describe('home page specs', () => {
             map: m => { }
         } as RouterConfiguration;
         let router = {
-            baseUrl: 'test'
+            baseUrl: 'test',
         } as Router;
 
         // act
@@ -80,6 +76,7 @@ describe('home page specs', () => {
         let subcription = {
             dispose: () => { }
         };
+        let router;
 
         beforeEach(() => {
             ea.subscribe = (e, c) => {
@@ -88,6 +85,11 @@ describe('home page specs', () => {
 
                 return subcription;
             };
+
+            router = {
+                navigateToRoute: name => {},
+            } as Router;
+            page.router = router;
         });
 
         it('attached should set isDisconnected to true when connaction state is Disconnected', () => {
@@ -115,13 +117,15 @@ describe('home page specs', () => {
         it('attached should logoff when connection state is Error', () => {
             // prepare
             chatService.currentState = ConnectionState.Error;
-            spyOn(loginService, 'logoff');
+
+            spyOn(router, 'navigateToRoute');
+
             // act
             page.attached();
 
             // verify
             expect(page.isDisconnected).toBe(false);
-            expect(loginService.logoff).toHaveBeenCalledTimes(1);
+            expect(router.navigateToRoute).toHaveBeenCalledWith('login');
         });
 
         it('attached should start chat when connection state is not Connected', () => {
@@ -136,7 +140,7 @@ describe('home page specs', () => {
             expect(chatService.start).toHaveBeenCalledTimes(1);
         });
 
-        it('ConnectionStateChanged subcription callback should set isDisconnected to true when connaction state is Disconnected', () => {
+        it('ConnectionStateChanged subcription callback should set isDisconnected to true when connection state is Disconnected', () => {
             // prepare
             chatService.currentState = ConnectionState.Connected;
 
@@ -163,14 +167,15 @@ describe('home page specs', () => {
         it('ConnectionStateChanged subcription callback should logoff when connection state is Error', () => {
             // prepare
             chatService.currentState = ConnectionState.Connected;
-            spyOn(loginService, 'logoff');
+
+            spyOn(router, 'navigateToRoute');
             // act
             page.attached();
             callback(new ConnectionStateChanged(ConnectionState.Error));
 
             // verify
             expect(page.isDisconnected).toBe(false);
-            expect(loginService.logoff).toHaveBeenCalledTimes(1);
+            expect(router.navigateToRoute).toHaveBeenCalledWith('login');
         });
 
         it('detached should dispose subcription', () => {

test/unit/pages/login.spec.ts

@@ -34,8 +34,9 @@ describe('Login page specs', () => {
             },
             login: (userName: string) => {
                 return promise;
-            },
-            logoff: () => {}
+            },            
+            logoff: () => {},
+            getExternalLoginProviders: () => { return promise ;}
         } as LoginService;
 
         settings = {