@@ -300,26 +300,28 @@ export class Angular2TokenService implements CanActivate {
300300
301301 // Check if response is complete and newer, then update storage
302302 private _handleResponse ( response : Observable < Response > ) {
303-
304303 response . subscribe ( res => {
305-
306- let headers = res . headers ;
307-
308- let authData : AuthData = {
309- accessToken : headers . get ( 'access-token' ) ,
310- client : headers . get ( 'client' ) ,
311- expiry : headers . get ( 'expiry' ) ,
312- tokenType : headers . get ( 'token-type' ) ,
313- uid : headers . get ( 'uid' )
314- } ;
315-
316- this . _setAuthData ( authData ) ;
317-
304+ this . _parseAuthHeadersFromResponse ( < any > res ) ;
318305 } , error => {
306+ this . _parseAuthHeadersFromResponse ( < any > error ) ;
319307 console . log ( 'Session Service: Error Fetching Response' ) ;
320308 } ) ;
321309 }
322310
311+ private _parseAuthHeadersFromResponse ( data : any ) {
312+ let headers = data . headers ;
313+
314+ let authData : AuthData = {
315+ accessToken : headers . get ( 'access-token' ) ,
316+ client : headers . get ( 'client' ) ,
317+ expiry : headers . get ( 'expiry' ) ,
318+ tokenType : headers . get ( 'token-type' ) ,
319+ uid : headers . get ( 'uid' )
320+ } ;
321+
322+ this . _setAuthData ( authData ) ;
323+ }
324+
323325 // Try to get auth data from storage.
324326 private _getAuthDataFromStorage ( ) {
325327
0 commit comments