Browse Source

Merge branch 'Dev' of https://github.com/dotnet/eShopOnContainers into Dev

pull/49/merge
Quique Fernandez 8 years ago
parent
commit
48da780028
2 changed files with 4 additions and 8 deletions
  1. +1
    -5
      src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket-status/basket-status.component.ts
  2. +3
    -3
      src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/security.service.ts

+ 1
- 5
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket-status/basket-status.component.ts View File

@ -31,11 +31,7 @@ export class BasketStatusComponent implements OnInit {
}); });
// Subscribe to Drop Basket Observable: // Subscribe to Drop Basket Observable:
this.basketDroppedSubscription = this.service.basketDroped$.subscribe(res =>
this.service.getBasket().subscribe(basket => {
this.badge = basket.items.length;
})
);
this.basketDroppedSubscription = this.service.basketDroped$.subscribe(res => this.badge = 0);
// Subscribe to login and logout observable // Subscribe to login and logout observable
this.authSubscription = this.authService.authenticationChallenge$.subscribe(res => { this.authSubscription = this.authService.authenticationChallenge$.subscribe(res => {


+ 3
- 3
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/services/security.service.ts View File

@ -70,7 +70,7 @@ export class SecurityService {
public Authorize() { public Authorize() {
this.ResetAuthorizationData(); this.ResetAuthorizationData();
let authorizationUrl = 'http://localhost:5105/connect/authorize';
let authorizationUrl = 'http://10.0.75.1:5105/connect/authorize';
let client_id = 'js'; let client_id = 'js';
let redirect_uri = 'http://localhost:5104/'; let redirect_uri = 'http://localhost:5104/';
let response_type = 'id_token token'; let response_type = 'id_token token';
@ -142,7 +142,7 @@ export class SecurityService {
} }
public Logoff() { public Logoff() {
let authorizationUrl = 'http://localhost:5105/connect/endsession';
let authorizationUrl = 'http://10.0.75.1:5105/connect/endsession';
let id_token_hint = this.retrieve('authorizationDataIdToken'); let id_token_hint = this.retrieve('authorizationDataIdToken');
let post_logout_redirect_uri = 'http://localhost:5104/'; let post_logout_redirect_uri = 'http://localhost:5104/';
@ -213,7 +213,7 @@ export class SecurityService {
private getUserData = (): Observable<string[]> => { private getUserData = (): Observable<string[]> => {
this.setHeaders(); this.setHeaders();
return this._http.get('http://localhost:5105/connect/userinfo', {
return this._http.get('http://10.0.75.1:5105/connect/userinfo', {
headers: this.headers, headers: this.headers,
body: '' body: ''
}).map(res => res.json()); }).map(res => res.json());


Loading…
Cancel
Save