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

Merge branch 'master' of https://github.com/dotnet/eShopOnContainers.git

Browse Source
This commit is contained in:
Javier Suárez Ruiz 2017-01-10 15:42:51 +01:00
commit e89221214a
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
View File

@ -16,7 +16,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>

2
src/Services/Identity/eShopOnContainers.Identity/Startup.cs
View File

@ -67,7 +67,7 @@ namespace eShopOnContainers.Identity
clientUrls.Add("Spa", Configuration.GetValue<string>("SpaClient"));
// Adds IdentityServer
services.AddIdentityServer()
services.AddIdentityServer(x => x.IssuerUri = "null")
.AddTemporarySigningCredential()
.AddInMemoryScopes(Config.GetScopes())
.AddInMemoryClients(Config.GetClients(clientUrls))

3
src/Web/WebMVC/Controllers/CartController.cs
View File

@ -51,6 +51,8 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
}
public async Task<IActionResult> AddToCart(CatalogItem productDetails)
{
if (productDetails != null)
{
var user = _appUserParser.Parse(HttpContext.User);
var product = new BasketItem()
@ -63,6 +65,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
ProductId = productDetails.Id
};
await _basketSvc.AddItemToBasket(user, product);
}
return RedirectToAction("Index", "Catalog");
}
}