ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed errors and updated config

Browse Source
This commit is contained in:
eiximenis 2018-02-27 17:29:37 +01:00
parent a18cec21fe
commit 152fcc8205
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@ -142,5 +142,5 @@ services:
image: eshop/webshoppingagg image: eshop/webshoppingagg
build: build:
context: . context: .
dockerfile: src/Aggregators/Mobile.Shopping.HttpAggregator/Dockerfile dockerfile: src/Aggregators/Web.Shopping.HttpAggregator/Dockerfile

6
src/Aggregators/Mobile.Shopping.HttpAggregator/Startup.cs
View File

@ -47,9 +47,9 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
options.DescribeAllEnumsAsStrings(); options.DescribeAllEnumsAsStrings();
options.SwaggerDoc("v1", new Swashbuckle.AspNetCore.Swagger.Info options.SwaggerDoc("v1", new Swashbuckle.AspNetCore.Swagger.Info
{ {
Title = "Purchase BFF API Gateway", Title = "Shopping Aggregator for Mobile Clients",
Version = "v1", Version = "v1",
Description = "BFF API Gateway for Purchase features", Description = "Shopping Aggregator for Mobile Clients",
TermsOfService = "Terms Of Service" TermsOfService = "Terms Of Service"
}); });
@ -61,7 +61,7 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
TokenUrl = $"{Configuration.GetValue<string>("IdentityUrlExternal")}/connect/token", TokenUrl = $"{Configuration.GetValue<string>("IdentityUrlExternal")}/connect/token",
Scopes = new Dictionary<string, string>() Scopes = new Dictionary<string, string>()
{ {
{ "mobileshoppingagg", "Purchase BFF API Gateway" } { "mobileshoppingagg", "Shopping Aggregator for Mobile Clients" }
} }
}); });

6
src/Aggregators/Web.Shopping.HttpAggregator/Startup.cs
View File

@ -47,9 +47,9 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
options.DescribeAllEnumsAsStrings(); options.DescribeAllEnumsAsStrings();
options.SwaggerDoc("v1", new Swashbuckle.AspNetCore.Swagger.Info options.SwaggerDoc("v1", new Swashbuckle.AspNetCore.Swagger.Info
{ {
Title = "Purchase BFF API Gateway", Title = "Shopping Aggregator for Web Clients",
Version = "v1", Version = "v1",
Description = "BFF API Gateway for Purchase features", Description = "Shopping Aggregator for Web Clients",
TermsOfService = "Terms Of Service" TermsOfService = "Terms Of Service"
}); });
@ -61,7 +61,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
TokenUrl = $"{Configuration.GetValue<string>("IdentityUrlExternal")}/connect/token", TokenUrl = $"{Configuration.GetValue<string>("IdentityUrlExternal")}/connect/token",
Scopes = new Dictionary<string, string>() Scopes = new Dictionary<string, string>()
{ {
{ "webshoppingagg", "Purchase BFF API Gateway" } { "webshoppingagg", "Shopping Aggregator for Web Clients" }
} }
}); });

2
src/Services/Identity/Identity.API/Configuration/Config.cs
View File

@ -16,7 +16,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Configuration
new ApiResource("marketing", "Marketing Service"), new ApiResource("marketing", "Marketing Service"),
new ApiResource("locations", "Locations Service"), new ApiResource("locations", "Locations Service"),
new ApiResource("mobileshoppingagg", "Mobile Shopping Aggregator"), new ApiResource("mobileshoppingagg", "Mobile Shopping Aggregator"),
new ApiResource("Webshoppingagg", "Web Shopping Aggregator") new ApiResource("webshoppingagg", "Web Shopping Aggregator")
}; };
} }

1
src/Web/WebMVC/Startup.cs
View File

@ -130,7 +130,6 @@ namespace Microsoft.eShopOnContainers.WebMVC
options.Scope.Add("basket"); options.Scope.Add("basket");
options.Scope.Add("marketing"); options.Scope.Add("marketing");
options.Scope.Add("locations"); options.Scope.Add("locations");
options.Scope.Add("mobileshoppingagg");
options.Scope.Add("webshoppingagg"); options.Scope.Add("webshoppingagg");
}); });
} }

2
src/Web/WebSPA/Client/modules/shared/services/security.service.ts
View File

@ -82,7 +82,7 @@ export class SecurityService {
let client_id = 'js'; let client_id = 'js';
let redirect_uri = location.origin + '/'; let redirect_uri = location.origin + '/';
let response_type = 'id_token token'; let response_type = 'id_token token';
let scope = 'openid profile orders basket marketing locations mobileshoppingagg'; let scope = 'openid profile orders basket marketing locations webshoppingagg';
let nonce = 'N' + Math.random() + '' + Date.now(); let nonce = 'N' + Math.random() + '' + Date.now();
let state = Date.now() + '' + Math.random(); let state = Date.now() + '' + Math.random();