From 206be058e5c1a7767da06b3565b7988998c3521f Mon Sep 17 00:00:00 2001 From: rafsanulhasan Date: Sat, 1 Sep 2018 17:53:32 +0600 Subject: [PATCH] Edited/Removed files --- Certificates/DotNet Foundation CA.pfx | Bin 2970 -> 0 bytes Certificates/eShopOnContainers.pfx | Bin 3354 -> 0 bytes .../Certificates/DotNet Foundation CA.pfx | Bin 2970 -> 0 bytes .../Certificates/eShopOnContainers.pfx | Bin 3354 -> 0 bytes src/Services/Identity/Identity.API/Dockerfile | 2 -- src/Services/Identity/Identity.API/Startup.cs | 14 +------- .../Identity/Identity.API/appsettings.json | 4 +-- .../Certificates/DotNet Foundation CA.pfx | Bin 2970 -> 0 bytes .../WebMVC/Certificates/eShopOnContainers.pfx | Bin 3354 -> 0 bytes src/Web/WebMVC/Dockerfile | 2 -- src/Web/WebMVC/Startup.cs | 34 ++---------------- src/Web/WebMVC/appsettings.json | 14 ++------ src/Web/WebSPA/Dockerfile | 2 -- src/Web/WebSPA/Startup.cs | 23 +++--------- src/Web/WebSPA/appsettings.json | 4 +-- 15 files changed, 16 insertions(+), 83 deletions(-) delete mode 100644 Certificates/DotNet Foundation CA.pfx delete mode 100644 Certificates/eShopOnContainers.pfx delete mode 100644 src/Services/Identity/Identity.API/Certificates/DotNet Foundation CA.pfx delete mode 100644 src/Services/Identity/Identity.API/Certificates/eShopOnContainers.pfx delete mode 100644 src/Web/WebMVC/Certificates/DotNet Foundation CA.pfx delete mode 100644 src/Web/WebMVC/Certificates/eShopOnContainers.pfx diff --git a/Certificates/DotNet Foundation CA.pfx b/Certificates/DotNet Foundation CA.pfx deleted file mode 100644 index 67ce2e415e0ec2386c4f9d8311cc040adbc1794f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2970 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 TKbCK5Rr&~?ju+kjYe4=B2y$^; diff --git a/Certificates/eShopOnContainers.pfx b/Certificates/eShopOnContainers.pfx deleted file mode 100644 index c5962c1c2ca28cce03688aaeab86a83e8f24892c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3354 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 diff --git a/src/Services/Identity/Identity.API/Certificates/DotNet Foundation CA.pfx b/src/Services/Identity/Identity.API/Certificates/DotNet Foundation CA.pfx deleted file mode 100644 index 67ce2e415e0ec2386c4f9d8311cc040adbc1794f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2970 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 TKbCK5Rr&~?ju+kjYe4=B2y$^; diff --git a/src/Services/Identity/Identity.API/Certificates/eShopOnContainers.pfx b/src/Services/Identity/Identity.API/Certificates/eShopOnContainers.pfx deleted file mode 100644 index c5962c1c2ca28cce03688aaeab86a83e8f24892c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3354 zcmZWqcQoAJw*Sr;lVA`ndKW~UQAQ_9h!J8KA$keXJ5hdOj51P$AbRi7gXlG)1Q8j% zmxK^eqGTdb?&Plb?p<%awb$O~b3UKXK4+bO&W7WtuYy5ja2$*Pr4Wg^6+@&3T>|Cd zV7(9=tcygq!EsR7|B=YgAUN_9IF9_7ls}+U|I-Dd1cCE#kaIW=@*B0SEn#mS>Cz`_O^43ius6A) zh(faJ!m!lC9XDUAfMHpv^w}EEIF*=zGgb^4>m!Me&E+Z&(TDIiI6-;t1<{DTDEuI+ zL2AIfxfX5cVA%EYtNw#^T}Ob_M`7yX+@UQ;8_t|ktPC5im_^MV!N4w|T>NaeeDJ(S zRb#&n*ps)kGz`9ZhdOB8-geoO3t4o-mJxnjvWALp8Fqs;xkn9>i;V(nn}c(FdtjLd zW2XrrUa8SRDS-9)$@3 zp@wjuyqiAiA-1sygT=g~sMff9P!TPqoS)-VP<39LiIHZ&tV#}Sw8fFLLx@KmrmaT% z?N=Ic&YevyJ=wJ*dYE<9)=+$F_O@Ohz^q1@k$W?H~4*1@(XS%YOCqGQ%VOomMr_z(pLm zlHTo_-;n%*le2WXZHLZ)o0n;5cEn$3q_PW3`hY51{L?)NUHI%zd3+5{s$ERdU*2F#YvrkF^Nty1p< zi@Wsehs99eQRWC&gm4H3Sc!(KE>2V%D^V?myb%W82J{`Kei0?k3(s*r#L5w1;!jx!At z$ch~Pe2~Rhw%dy+nFsU1{lo>dxt)7fU-K)}(`A1QwwUgtUx;8pDFJ4jm#pta_%r!O z-=e^yw)LF<2UUR0YMDgt{Q>nRdRELR8=HLBHMDd%U!}n9T2uE04MrO4Un7Bqr*RT~ zwYP?;`t3^gmNsAepn_39XOFvd&re_nM^#I%&jh|Rn7t@v_n)_MT_nrYRXJQqlv!WI zc6=$|*1Tf8qMV*v(*4iob(^f=@klE%l!8sm)|4Y(fM>{6NPt7WLS5~d=;T|pUXy;Z zzR!edAdlA1E5od2JZ5{v@8jq!2(|FuAo^#MaE(YkXJvZWm{Dz-7mJEoZ$m#37T1&f z+i9}_gnByI?;xx_utK<(?;?{hs^7@$FPdz8#KFG3^0Uc6<4f@ZC`CNY^(F^u3Xwe1 zz~5avtYwVfGnmg6634I!-oJ)BKx^*{OwlZES#VudFWcVAW=d}J()?cH6p2)5tY2A9 zuR?nlm9P=VwRo61K}g{cMmBbf6L@X|vOGWDNTcQKuzcfj*DUL(E?!J^o+vy<$LlPW zgMU_mIXXZ!J5GYiO z6(a2PX7tVDTS173WjMoszDo)w1QY@R0RRBE_%F$bFyOikgaYz_EFc3&0a}1MscHk_ z00Kag;xCdRRXISDgcJY`68{%Tld23Ukt8>Qr2mbZBoqdBgHnh>K@bp5jt+#d=CTCz z0T;jl@CCd8KTIpalcBJY6I0E-cj3&tu40w}NFW>KR>3u#4WfSDPC9H(4+@ zatUQ+g%asp>b10c-Zfa~Kw0?5 zikd|q`3J83$wV;z_cUQ_gX@>_kM(+{T>q36?rx79;qizmHeE5*~M z#qsVLhC`nz|twoUSbw_u1WUkj7fr$fkFDQ0D>jX^?TE@D@QI%xH7z(u$_@ES={ zDmV(AojrM5Uh+ z%S0AE@o-iwpuQgVJ<4}!R7Q?oi;!6qJlQp4qZ08V&}Eu$wC{8B$fPnJDzjPou;`NP zkGBP7rngiYf8SL)qQ7P%_gX!)38wK_fMF&U003QN|`%zX2g?KxKOE|&{-FKvVF zHjLM46-f~I_$|?Gm)Lj(N6Ai-)^2`k8RczOpin9@w-HF)E_-s|&UvPgGv!ZT!F^!d zm}eph{}IniHQH=?=&Z8Wq5iA|r z=jF-w?Su>b*E7BzmaJYY`Hs4r?oWEz&!KYi)^*1NI@E9E2CC?IXjEBdEVlKFinsD6 zt9}1r*PNBmzcxIe;Dt56$v~$& z?Zrw&_)ME^60$00v@Yl+PgJFJ#$;&b@yE`JkBY%U zdS8_uto8i1W07Y}pPi8{@yRT5>}v#nXcX%x>pp!(n}RVxOg}fPD|f^*Kc{VDkK$~- zEewiGfM?&JHe65-K=`wk3w5U(>Hc8wYFH$$iyV9g>w7{v#U{lcDFQ8q85csbb=~G} zBa}=Se^12WVG;%H&N9vQl|rAj)CdK*5}X@;2}&+XLk4DpFoMZc)U9>%AGeG9k(XK( j2lE}y6hau^t3GJrQOjB&Q&!Aq%=3F;Zo=dBcR>9M3k&{i diff --git a/src/Services/Identity/Identity.API/Dockerfile b/src/Services/Identity/Identity.API/Dockerfile index 102fc8c13..3931a135b 100644 --- a/src/Services/Identity/Identity.API/Dockerfile +++ b/src/Services/Identity/Identity.API/Dockerfile @@ -2,7 +2,6 @@ ARG NODE_IMAGE=node:8.11 FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -EXPOSE 443 FROM microsoft/dotnet:2.1-sdk as dotnet-build WORKDIR /src @@ -17,7 +16,6 @@ FROM dotnet-build as build WORKDIR /src/src/Services/Identity/Identity.API/wwwroot COPY --from=node-build /web/wwwroot . WORKDIR /src -COPY ./Certificates/eShopOnContainers.pfx /root/.aspnet/https/ COPY . . WORKDIR /src/src/Services/Identity/Identity.API RUN dotnet restore -nowarn:msb3202,nu1503 diff --git a/src/Services/Identity/Identity.API/Startup.cs b/src/Services/Identity/Identity.API/Startup.cs index 22dd039a0..750088608 100644 --- a/src/Services/Identity/Identity.API/Startup.cs +++ b/src/Services/Identity/Identity.API/Startup.cs @@ -35,16 +35,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API services.Configure(Configuration); - services.AddMvc(opts => - { - opts.SslPort = 4105; - opts.RequireHttpsPermanent = true; - }); - - services.AddHttpsRedirection(opts => - { - opts.HttpsPort = 4105; - }); + services.AddMvc(); if (Configuration.GetValue("IsClusterEnv") == bool.TrueString) { @@ -119,11 +110,8 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API else { app.UseExceptionHandler("/Home/Error"); - app.UseHsts(); } - app.UseHttpsRedirection(); - var pathBase = Configuration["PATH_BASE"]; if (!string.IsNullOrEmpty(pathBase)) { diff --git a/src/Services/Identity/Identity.API/appsettings.json b/src/Services/Identity/Identity.API/appsettings.json index 40cf02804..efee76e88 100644 --- a/src/Services/Identity/Identity.API/appsettings.json +++ b/src/Services/Identity/Identity.API/appsettings.json @@ -2,8 +2,8 @@ "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.IdentityDb;User Id=sa;Password=Pass@word;", "IsClusterEnv": "False", "MvcClient": "https://localhost:4100", - "SpaClient": "https://localhost:4104", - "XamarinCallback": "https://localhost:4105/xamarincallback", + "SpaClient": "http://localhost:5104", + "XamarinCallback": "http://localhost:5105/xamarincallback", "UseCustomizationData": false, "Logging": { "IncludeScopes": false, diff --git a/src/Web/WebMVC/Certificates/DotNet Foundation CA.pfx b/src/Web/WebMVC/Certificates/DotNet Foundation CA.pfx deleted file mode 100644 index 67ce2e415e0ec2386c4f9d8311cc040adbc1794f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2970 zcmZXVc{J327stQD7&}8KQI;vDgc*!1l`NAzA;l;n`<`70V<*el844l9ko2>KNXbvh zPL{Exm}$lmMi@Nv`<>_cJ?A;kx#xa9_rBiue$M&)b1wqRnZpEPMqoM3AnfPk^x}57 zL9C!+ET=XY%c;S@>If`^>whGc12C3l7lCEjX7~n#^WR-u93ZA*Ecg(C1@9q5Asqj~ zjK_JvY{(K~qTj*GTqY*gK`<6Pi7zpk$vF3c&at9n{M-KAVcA!Ut_BrYVII3jd2FCf z8T)Ef9?r`rGKi=Z5H~#tcJK&5Ns4k-_=I?Oh@H$1~ z_lL%UEGYipPs&NIUYL8d6Ek8pHSq2_VmYKfWsb(g%aRlUoi$Tr>)~ginV2V(W3{L2;Xi-_+}OxGSTgc|NkCig#g(*ywH8kj2RI zC_?4B9}fVmLNR%{YxhETlcAmg-tx+&{68LYIYXzOZVc$ANK6pj!wgDZYRO#t=IS}+ zlyerk7q{7uT-xoN?bYU(GnsZ9BXc7uG!|V8U!&s4SVb=$a#3=t6Dgq)}Uw@xN;hK1xjgNJqU2b z$&CnE3kxW}O-l6p8hyR5OoaN@?ob@ao(#636h4@J7qTBx<(wJw?Cdr-&erHNckNQ2 z6+Y^W63FAhKa zHsM;+F#EOA!$!n^qrgay_|ys+97tj-qSVT21zr7BQGWFO#MB1-srBW|>H0x4ewNfO zHyXNK<2eC&^=Yu3l>KO!CMwi9-uAb$-PbcOS5~0wSwHmm$GQ!_jK&I^flgVsx*6KS zdM1sU_Ohqx-jN51_TJf)ab-4Y?6yagCY0D3N$v@}$1-f?`@Z|g3kgo@A{V?CmeH+TXnU<*x8oz|x3Z&0fa7rdRS&FJ zP8uc%WJ@n_?={#!N~4p8rNWyuV_FP4)FxIJQMUXSC)F+c%NCSJ>r>!!vU8J}lA=pp z){6ya&zNGe$P)sGX+Mo!&YFVY!T17{dD*LBcGDtAr0Js*y-;}f8|ISut@ zzn?8dsov0aJr`IH_mnr@l1Mz-KfkQ?zF1-FlK=0{PZB3EU#xa>97@keb7SX0GH`HGUg{Gh>yaEcX+LnNA3*O-d=VmHOUiU*pZV)y@BD_TV{v0#-wW$|Jg9L zM$2@0XuUP4N~mb)ffh1q4sqy000oy|Ahj`>!*!?P(T^b1TF#yhA9C$ z02+`5t}%!*Ba>w~0zm!ER2WnTP-HL#hKgqRU#88-6c}8KQ5lYKhp@{)KwuE|A|D88 zbNUWo47dXK0bjry@ME|W;17s1TD<@lz>aa=2OI$h2GM3zgaAGa)f;eT#CD9>Z9Dra9ed&Mx!U`$IvYcQb0VWW@xVZnTfc}38NGL1dH%H7V ze=UJXEO=hu+D_*SECy320E^z~wjOm^7aP*1UZ;(qn;ZYgGp)`%mivwEMbUt5b+5+_ z0(-|e>EZcHRH_4iePU-)gtH2vN|rWa9;Eo~*TJKXRip3<_bd!M$8d+-A>Bc#=4A)G zno9mWHNwh!Yi!3L!rn?UYMoZ|VOCW7-AdM+Y%IMk74LAvEJgo10hh%YMLzykTTW9L zM7VpYu*LM?K+jGxD>{F`*(A=zkc|ji|CZ|5A1gH~y&Pu~*IIGMgDrq`>+E4{Vj#V} zc0Z%rjn%jVS*IVRupF?(uHMtj75notI^V;j?S9gQ4Gi~YnREJ@7duASNBX`zDV3aN z8sAE3<#Od#PqSMYemM2qjCsErY;d-&$SVrnjqT(aBk_ckRzXSLA*)0aLW{D*Zwpaw{;mcPL$v> zo$_;frKU*eA5Qr6>AiG#VVHi@Hi6sMfV{@62r6k>7@8SA%_K~EwRHZ7zivxm$D2po zm^zT?mC$6?`T3e}gHw>@I6DGuq$VYLEL?0yKxRy%pG=ycC6dTl+B?Npj^WL0m&*Ul zx|7P!J=pddlXC)+U3q*<6YX*GqBw?R&wTT;g`a#LFWaD~%j*$x$MpJXzgM2VY8dR^ z`8PEZ#`iWe6E*LR9i(o5_vp;O_h3mW=(LWOpT8R{2xL0jk!$47QEqxbv1|gA%Hvw3 z&&2W77wCr5T^^Ery62hOcZfLIw8ooBDwkj?#g*G3%ej7;-K|2Oft!hG;<^^dJ4x|l zk*HPwF^a~v{)H>{>0<`psXnA}9~#fN;F-Sbm!hikBHS_WQl9w%kOy9A=bnS28p`Cgl45AFPsOx(@OJWZ>+Q|0aP1T*8deZl&#k=0ht36|AGzmScesUre z)hR#ekXitJB27K>K!fjif?%f~grHfIME(#`K>bvbS|s-SZ52ZGoM29RigBaqN4BI3 zldGCysyD>Xnl6)vLLDdihTMGJ)J!DaszUp|+=LZMg;8T_gyG(E#+CXveE?g6y^@Eg zg>KBb$hE4dCoRwyY!JdqReOC6|1TJfOamqIH>SItVNvUQ}ac}z+Ixm*x{XCK0Hq_z`TJx<7R4>{0bI;XM2s=>-}yq TKbCK5Rr&~?ju+kjYe4=B2y$^; diff --git a/src/Web/WebMVC/Certificates/eShopOnContainers.pfx b/src/Web/WebMVC/Certificates/eShopOnContainers.pfx deleted file mode 100644 index c5962c1c2ca28cce03688aaeab86a83e8f24892c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3354 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 diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile index 3b0e08ea4..9847ad772 100644 --- a/src/Web/WebMVC/Dockerfile +++ b/src/Web/WebMVC/Dockerfile @@ -2,7 +2,6 @@ ARG NODE_IMAGE=node:8.11 FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -EXPOSE 443 FROM microsoft/dotnet:2.1-sdk as dotnet-build WORKDIR /src @@ -17,7 +16,6 @@ FROM dotnet-build as build WORKDIR /src/src/Web/WebMVC/wwwroot COPY --from=node-build /web/wwwroot . WORKDIR /src -COPY ./Certificates/eShopOnContainers.pfx /root/.aspnet/https/ COPY . . WORKDIR /src/src/Web/WebMVC RUN dotnet restore -nowarn:msb3202,nu1503 diff --git a/src/Web/WebMVC/Startup.cs b/src/Web/WebMVC/Startup.cs index 791ff0336..b760876db 100644 --- a/src/Web/WebMVC/Startup.cs +++ b/src/Web/WebMVC/Startup.cs @@ -1,23 +1,5 @@ -using Microsoft.ApplicationInsights.Extensibility; -using Microsoft.ApplicationInsights.ServiceFabric; -using Microsoft.AspNetCore.Authentication.Cookies; -using Microsoft.AspNetCore.Authentication.OpenIdConnect; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.DataProtection; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.eShopOnContainers.WebMVC.Services; +using Microsoft.eShopOnContainers.WebMVC.Services; using Microsoft.eShopOnContainers.WebMVC.ViewModels; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.HealthChecks; -using Microsoft.Extensions.Logging; -using Polly; -using Polly.Extensions.Http; -using StackExchange.Redis; -using System; -using System.IdentityModel.Tokens.Jwt; -using System.Net.Http; using WebMVC.Infrastructure; using WebMVC.Infrastructure.Middlewares; using WebMVC.Services; @@ -41,10 +23,6 @@ namespace Microsoft.eShopOnContainers.WebMVC opts.CheckConsentNeeded = context => true; opts.MinimumSameSitePolicy = SameSiteMode.None; }); - services.AddHttpsRedirection(opts=> - { - opts.HttpsPort = 4100; - }); services.AddAppInsight(Configuration) .AddHealthChecks(Configuration) .AddCustomMvc(Configuration) @@ -68,7 +46,6 @@ namespace Microsoft.eShopOnContainers.WebMVC else { app.UseExceptionHandler("/Error"); - app.UseHsts(); } var pathBase = Configuration["PATH_BASE"]; @@ -77,8 +54,7 @@ namespace Microsoft.eShopOnContainers.WebMVC loggerFactory.CreateLogger("init").LogDebug($"Using PATH BASE '{pathBase}'"); app.UsePathBase(pathBase); } - - app.UseHttpsRedirection(); + app.UseCookiePolicy(); #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously @@ -161,11 +137,7 @@ namespace Microsoft.eShopOnContainers.WebMVC services.AddOptions(); services.Configure(configuration); - services.AddMvc(opts=> - { - opts.SslPort = 4100; - opts.RequireHttpsPermanent = true; - }); + services.AddMvc(); services.AddSession(); diff --git a/src/Web/WebMVC/appsettings.json b/src/Web/WebMVC/appsettings.json index 05a1f35c3..a3fd659eb 100644 --- a/src/Web/WebMVC/appsettings.json +++ b/src/Web/WebMVC/appsettings.json @@ -3,8 +3,8 @@ "OrderingUrl": "http://localhost:5102", "BasketUrl": "http://localhost:5103", "MarketingUrl": "http://localhost:5110", - "IdentityUrl": "https://localhost:4105", - "CallBackUrl": "https://localhost:4100/", + "IdentityUrl": "http://localhost:5105", + "CallBackUrl": "http://localhost:5100/", "LocationsUrl": "http://localhost:5109/", "IsClusterEnv": "False", "UseResilientHttp": "True", @@ -23,14 +23,6 @@ "InstrumentationKey": "" }, "HttpClientRetryCount": 8, - "HttpClientExceptionsAllowedBeforeBreaking": 7, - "Kestrel": { - "Certificates": { - "Default": { - "Path": "./Certificates/eShopOnContainers.pfx", - "Password": "D0tNet@" - } - } - } + "HttpClientExceptionsAllowedBeforeBreaking": 7 } \ No newline at end of file diff --git a/src/Web/WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile index 9a03bce6d..4e806786c 100644 --- a/src/Web/WebSPA/Dockerfile +++ b/src/Web/WebSPA/Dockerfile @@ -2,7 +2,6 @@ ARG NODE_IMAGE=node:8.11 FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base WORKDIR /app EXPOSE 80 -EXPOSE 443 FROM microsoft/dotnet:2.1-sdk as dotnet-build WORKDIR /src @@ -17,7 +16,6 @@ FROM dotnet-build as publish WORKDIR /src/src/Web/WebSPA/wwwroot COPY --from=node-build /web/wwwroot . WORKDIR /src -COPY ./Certificates/eShopOnContainers.pfx /root/.aspnet/https/ COPY . . WORKDIR /src/src/Web/WebSPA RUN dotnet publish -c Release -o /app diff --git a/src/Web/WebSPA/Startup.cs b/src/Web/WebSPA/Startup.cs index c0c89f663..e5f1c3412 100644 --- a/src/Web/WebSPA/Startup.cs +++ b/src/Web/WebSPA/Startup.cs @@ -57,20 +57,11 @@ namespace eShopConContainers.WebSPA services.AddAntiforgery(options => options.HeaderName = "X-XSRF-TOKEN"); services - .AddMvc(opts => + .AddMvc() + .AddJsonOptions(options => { - opts.SslPort = 4104; - opts.RequireHttpsPermanent = true; - }) - .AddJsonOptions(options => - { - options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); - }); - - services.AddHttpsRedirection(opts => - { - opts.HttpsPort = 4104; - }); + options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); + }); } @@ -85,12 +76,8 @@ namespace eShopConContainers.WebSPA { app.UseDeveloperExceptionPage(); } - else - { - app.UseHsts(); - } - app.UseHttpsRedirection(); + app.UseCookiePolicy(); // Configure XSRF middleware, This pattern is for SPA style applications where XSRF token is added on Index page // load and passed back token on every subsequent async request diff --git a/src/Web/WebSPA/appsettings.json b/src/Web/WebSPA/appsettings.json index d843edeec..5fb18e7b1 100644 --- a/src/Web/WebSPA/appsettings.json +++ b/src/Web/WebSPA/appsettings.json @@ -1,7 +1,7 @@ { - "IdentityUrl": "https://localhost:4105", + "IdentityUrl": "http://localhost:5105", "MarketingUrl": "http://localhost:5110", - "CallBackUrl": "https://localhost:4104/", + "CallBackUrl": "http://localhost:4104/", "PurchaseUrl": "http://localhost:5200", "UseCustomizationData": true, "IsClusterEnv": "False",