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

Merge 7c559dd298acbc4df168d5e3ae760195a9b9dbf2 into 39aec4cb8a67203322b0f706b3689cd85928a759

Browse Source
This commit is contained in:
Bill Wagner 2017-04-17 17:38:38 +00:00 committed by GitHub
commit c3c79294e8
10 changed files with 223 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Services/Catalog/Catalog.API/Dockerfile.nanowin
View File

@ -1,4 +1,4 @@
FROM microsoft/dotnet:1.1-runtime-nanoserver
FROM microsoft/dotnet:1.1-sdk-nanoserver
ARG source
WORKDIR /app
RUN set-itemproperty -path 'HKLM:\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters' -Name ServerPriorityTimeLimit -Value 0 -Type DWord

3
src/Web/Catalog.WebForms/Catalog.WebForms/Catalog.WebForms.csproj
View File

@ -57,6 +57,8 @@
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data.Entity" />
<Reference Include="System.Net" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
@ -415,6 +417,7 @@
<Compile Include="Services\Common.cs" />
<Compile Include="Services\ICatalogService.cs" />
<Compile Include="Services\IRouteProvider.cs" />
<Compile Include="Services\RequestProvider.cs" />
<Compile Include="Site.Master.cs">
<DependentUpon>Site.Master</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

6
src/Web/Catalog.WebForms/Catalog.WebForms/Modules/AutoFacHttpModule.cs
View File

@ -1,5 +1,6 @@
using Autofac;
using eShopOnContainers.Core.Services.Catalog;
using eShopOnContainers.Core.Services.RequestProvider;
using System;
using System.Collections.Generic;
using System.Linq;
@ -34,8 +35,11 @@ namespace eShopOnContainers.Catalog.WebForms.Modules
}
else
{
builder.RegisterType<CatalogMockService>()
builder.RegisterType<CatalogService>()
.As<ICatalogService>();
builder.RegisterType<RequestProvider>()
.As<IRequestProvider>();
}
var container = builder.Build();
return container;

28
src/Web/Catalog.WebForms/Catalog.WebForms/Services/CatalogService.cs
View File

@ -23,8 +23,8 @@ namespace eShopOnContainers.Core.Services.Catalog
{
try
{
// TODO:
UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */);
var baseURl = System.Configuration.ConfigurationManager.AppSettings["CatalogURL"];
UriBuilder builder = new UriBuilder(baseURl);
builder.Path = string.Format("api/v1/catalog/items/type/{0}/brand/{1}", catalogTypeId, catalogBrandId);
@ -48,8 +48,8 @@ namespace eShopOnContainers.Core.Services.Catalog
{
try
{
// TODO:
UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */);
var baseURl = System.Configuration.ConfigurationManager.AppSettings["CatalogURL"];
UriBuilder builder = new UriBuilder(baseURl);
builder.Path = "api/v1/catalog/items";
@ -82,8 +82,8 @@ namespace eShopOnContainers.Core.Services.Catalog
{
try
{
// TODO:
UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */);
var baseURl = System.Configuration.ConfigurationManager.AppSettings["CatalogURL"];
UriBuilder builder = new UriBuilder(baseURl);
builder.Path = "api/v1/catalog/catalogbrands";
@ -107,8 +107,8 @@ namespace eShopOnContainers.Core.Services.Catalog
{
try
{
// TODO:
UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */);
var baseURl = System.Configuration.ConfigurationManager.AppSettings["CatalogURL"];
UriBuilder builder = new UriBuilder(baseURl);
builder.Path = "api/v1/catalog/catalogtypes";
@ -130,8 +130,8 @@ namespace eShopOnContainers.Core.Services.Catalog
public Task DeleteCatalogItemAsync(string catalogItemId)
{
// TODO:
UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */);
var baseURl = System.Configuration.ConfigurationManager.AppSettings["CatalogURL"];
UriBuilder builder = new UriBuilder(baseURl);
builder.Path = $"api/v1/catalog/{catalogItemId}";
@ -142,8 +142,8 @@ namespace eShopOnContainers.Core.Services.Catalog
public Task<CatalogItem> UpdateCatalogItemAsync(CatalogItem item)
{
// TODO:
UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */);
var baseURl = System.Configuration.ConfigurationManager.AppSettings["CatalogURL"];
UriBuilder builder = new UriBuilder(baseURl);
builder.Path = "api/v1/catalog/edit";
@ -154,8 +154,8 @@ namespace eShopOnContainers.Core.Services.Catalog
public Task<CatalogItem> CreateCatalogItemAsync(CatalogItem item)
{
// TODO:
UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */);
var baseURl = System.Configuration.ConfigurationManager.AppSettings["CatalogURL"];
UriBuilder builder = new UriBuilder(baseURl);
builder.Path = "api/v1/catalog/create";

174
src/Web/Catalog.WebForms/Catalog.WebForms/Services/RequestProvider.cs Normal file
View File

@ -0,0 +1,174 @@
using eShopOnContainers.Core.Exceptions;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Serialization;
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Text;
using System.Threading.Tasks;
using System;
// Taken from https://raw.githubusercontent.com/dotnet/eShopOnContainers/dev/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs
// TODO: DRY This
namespace eShopOnContainers.Core.Services.RequestProvider
{
public class RequestProvider : IRequestProvider
{
private readonly JsonSerializerSettings _serializerSettings;
public RequestProvider()
{
_serializerSettings = new JsonSerializerSettings
{
ContractResolver = new CamelCasePropertyNamesContractResolver(),
DateTimeZoneHandling = DateTimeZoneHandling.Utc,
NullValueHandling = NullValueHandling.Ignore
};
_serializerSettings.Converters.Add(new StringEnumConverter());
}
public async Task<TResult> GetAsync<TResult>(string uri, string token = "")
{
HttpClient httpClient = CreateHttpClient(token);
HttpResponseMessage response = await httpClient.GetAsync(uri);
await HandleResponse(response);
string serialized = await response.Content.ReadAsStringAsync();
TResult result = await Task.Run(() =>
JsonConvert.DeserializeObject<TResult>(serialized, _serializerSettings));
return result;
}
public async Task<TResult> PostAsync<TResult>(string uri, TResult data, string token = "", string header = "")
{
HttpClient httpClient = CreateHttpClient(token);
if (!string.IsNullOrEmpty(header))
{
AddHeaderParameter(httpClient, header);
}
var content = new StringContent(JsonConvert.SerializeObject(data));
content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
HttpResponseMessage response = await httpClient.PostAsync(uri, content);
await HandleResponse(response);
string serialized = await response.Content.ReadAsStringAsync();
TResult result = await Task.Run(() =>
JsonConvert.DeserializeObject<TResult>(serialized, _serializerSettings));
return result;
}
public Task<TResult> PostAsync<TResult>(string uri, TResult data, string token = "")
{
return PostAsync<TResult, TResult>(uri, data, token);
}
public async Task<TResult> PostAsync<TRequest, TResult>(string uri, TRequest data, string token = "")
{
HttpClient httpClient = CreateHttpClient(token);
string serialized = await Task.Run(() => JsonConvert.SerializeObject(data, _serializerSettings));
var content = new StringContent(serialized, Encoding.UTF8, "application/json");
HttpResponseMessage response = await httpClient.PostAsync(uri, content);
await HandleResponse(response);
string responseData = await response.Content.ReadAsStringAsync();
return await Task.Run(() => JsonConvert.DeserializeObject<TResult>(responseData, _serializerSettings));
}
public Task<TResult> PutAsync<TResult>(string uri, TResult data, string token = "")
{
return PutAsync<TResult, TResult>(uri, data, token);
}
public async Task<TResult> PutAsync<TRequest, TResult>(string uri, TRequest data, string token = "")
{
HttpClient httpClient = CreateHttpClient(token);
string serialized = await Task.Run(() => JsonConvert.SerializeObject(data, _serializerSettings));
HttpResponseMessage response = await httpClient.PutAsync(uri, new StringContent(serialized, Encoding.UTF8, "application/json"));
await HandleResponse(response);
string responseData = await response.Content.ReadAsStringAsync();
return await Task.Run(() => JsonConvert.DeserializeObject<TResult>(responseData, _serializerSettings));
}
public async Task DeleteAsync(string uri, string token = "")
{
HttpClient httpClient = CreateHttpClient(token);
await httpClient.DeleteAsync(uri);
}
private HttpClient CreateHttpClient(string token = "")
{
var httpClient = new HttpClient();
httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
if (!string.IsNullOrEmpty(token))
{
httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
}
return httpClient;
}
private void AddHeaderParameter(HttpClient httpClient, string parameter)
{
if (httpClient == null)
return;
if (string.IsNullOrEmpty(parameter))
return;
httpClient.DefaultRequestHeaders.Add(parameter, Guid.NewGuid().ToString());
}
private async Task HandleResponse(HttpResponseMessage response)
{
if (!response.IsSuccessStatusCode)
{
var content = await response.Content.ReadAsStringAsync();
if (response.StatusCode == HttpStatusCode.Forbidden
|| response.StatusCode == HttpStatusCode.Unauthorized)
{
throw new ServiceAuthenticationException(content);
}
throw new HttpRequestException(content);
}
}
}
}
// Taken from: https://raw.githubusercontent.com/dotnet/eShopOnContainers/dev/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Exceptions/ServiceAuthenticationException.cs
namespace eShopOnContainers.Core.Exceptions
{
public class ServiceAuthenticationException : Exception
{
public string Content { get; }
public ServiceAuthenticationException()
{
}
public ServiceAuthenticationException(string content)
{
Content = content;
}
}
}

1
src/Web/Catalog.WebForms/Catalog.WebForms/Web.Debug.config
View File

@ -26,5 +26,6 @@
<error statusCode="500" redirect="InternalError.htm"/>
</customErrors>
-->
<customErrors mode="Off"/>
</system.web>
</configuration>

3
src/Web/Catalog.WebForms/Catalog.WebForms/Web.config
View File

@ -9,7 +9,8 @@
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<appSettings>
<add key="usefake" value="true" />
<add key="usefake" value="false" />
<add key ="CatalogURL" value="http://catalog.api:5101" />
</appSettings>
<connectionStrings>
<add name="DefaultConnection" connectionString="Data Source=(LocalDb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\aspnet-Catalog.WebForms-20170322110716.mdf;Initial Catalog=aspnet-Catalog.WebForms-20170322110716;Integrated Security=True" providerName="System.Data.SqlClient" />

6
src/Web/Catalog.WebForms/docker-compose.override.yml
View File

@ -11,6 +11,7 @@ services:
catalog.api:
environment:
- ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:5101
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
#- ExternalCatalogBaseUrl=http://13.88.8.119:5101 #Remote: VM Needs to have public access at 5105.
- ExternalCatalogBaseUrl=http://localhost:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
@ -20,8 +21,3 @@ services:
catalog.webforms:
ports:
- "80:80"
networks:
default:
external:
name: nat

15
src/Web/Catalog.WebForms/docker-compose.vs.debug.yml
View File

@ -2,7 +2,7 @@ version: '2.1'
services:
catalog.webforms:
image: catalog.webforms:dev
image: eshop/catalog.webforms:dev
build:
args:
source: ${DOCKER_BUILD_SOURCE}
@ -11,3 +11,16 @@ services:
- ~\msvsmon:C:\msvsmon:ro
labels:
- "com.microsoft.visualstudio.targetoperatingsystem=windows"
catalog.api:
image: eshop/catalog.api:dev
build:
args:
source: ${DOCKER_BUILD_SOURCE}
environment:
- DOTNET_USE_POLLING_FILE_WATCHER=1
volumes:
- ../../Services/Catalog/Catalog.API:C:\app
- ~\msvsmon:C:\msvsmon:ro
labels:
- "com.microsoft.visualstudio.targetoperatingsystem=windows"

11
src/Web/Catalog.WebForms/docker-compose.yml
View File

@ -2,7 +2,7 @@ version: '2.1'
services:
catalog.webforms:
image: catalog.webforms
image: eshop/catalog.webforms
build:
context: .\Catalog.WebForms
dockerfile: Dockerfile
@ -12,10 +12,15 @@ services:
catalog.api:
image: eshop/catalog.api
build:
context: ..\..\Services\Catalog\Catalog.API
dockerfile: Dockerfile.windows
context: ../../Services/Catalog/Catalog.API
dockerfile: Dockerfile.nanowin
depends_on:
- sql.data
sql.data:
image: microsoft/mssql-server-windows
networks:
default:
external:
name: nat