Merge branch 'Dev' of https://github.com/dotnet/eShopOnContainers into Dev
This commit is contained in:
commit
48da780028
@ -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.basketDroppedSubscription = this.service.basketDroped$.subscribe(res => this.badge = 0);
|
||||||
this.service.getBasket().subscribe(basket => {
|
|
||||||
this.badge = basket.items.length;
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
// 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 => {
|
||||||
|
@ -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…
x
Reference in New Issue
Block a user