Browse Source

Create a mvctest client, check when is the environment variable UseLoadTest in MVC project to true

pull/241/head
Christian Arenas 7 years ago
parent
commit
540f7510b9
4 changed files with 40 additions and 6 deletions
  1. +32
    -0
      src/Services/Identity/Identity.API/Configuration/Config.cs
  2. +6
    -5
      src/Web/WebMVC/Startup.cs
  3. +1
    -0
      src/Web/WebMVC/appsettings.json
  4. +1
    -1
      test/Services/LoadTest/Ordering.API/GetCardTypes.webtest

+ 32
- 0
src/Services/Identity/Identity.API/Configuration/Config.cs View File

@ -114,6 +114,38 @@ namespace Identity.API.Configuration
"locations", "locations",
"marketing" "marketing"
}, },
},
new Client
{
ClientId = "mvctest",
ClientName = "MVC Client Test",
ClientSecrets = new List<Secret>
{
new Secret("secret".Sha256())
},
ClientUri = $"{clientsUrl["Mvc"]}", // public uri of the client
AllowedGrantTypes = GrantTypes.Hybrid,
AllowAccessTokensViaBrowser = true,
RequireConsent = false,
AllowOfflineAccess = true,
RedirectUris = new List<string>
{
$"{clientsUrl["Mvc"]}/signin-oidc"
},
PostLogoutRedirectUris = new List<string>
{
$"{clientsUrl["Mvc"]}/signout-callback-oidc"
},
AllowedScopes = new List<string>
{
IdentityServerConstants.StandardScopes.OpenId,
IdentityServerConstants.StandardScopes.Profile,
IdentityServerConstants.StandardScopes.OfflineAccess,
"orders",
"basket",
"locations",
"marketing"
},
} }
}; };
} }


+ 6
- 5
src/Web/WebMVC/Startup.cs View File

@ -112,21 +112,22 @@ namespace Microsoft.eShopOnContainers.WebMVC
var identityUrl = Configuration.GetValue<string>("IdentityUrl"); var identityUrl = Configuration.GetValue<string>("IdentityUrl");
var callBackUrl = Configuration.GetValue<string>("CallBackUrl"); var callBackUrl = Configuration.GetValue<string>("CallBackUrl");
var useLoadTest = Configuration.GetValue<bool>("UseLoadTest");
var log = loggerFactory.CreateLogger("identity"); var log = loggerFactory.CreateLogger("identity");
var oidcOptions = new OpenIdConnectOptions var oidcOptions = new OpenIdConnectOptions
{ {
AuthenticationScheme = "oidc", AuthenticationScheme = "oidc",
SignInScheme = "Cookies", SignInScheme = "Cookies",
Authority = identityUrl.ToString(),
PostLogoutRedirectUri = callBackUrl.ToString(),
ClientId = "mvc",
Authority = identityUrl,
PostLogoutRedirectUri = callBackUrl,
ClientSecret = "secret", ClientSecret = "secret",
ResponseType = "code id_token",
ClientId = useLoadTest ? "mvctest" : "mvc",
ResponseType = useLoadTest ? "code id_token token" : "code id_token",
SaveTokens = true, SaveTokens = true,
GetClaimsFromUserInfoEndpoint = true, GetClaimsFromUserInfoEndpoint = true,
RequireHttpsMetadata = false, RequireHttpsMetadata = false,
Scope = { "openid", "profile", "orders", "basket", "marketing" }
Scope = { "openid", "profile", "orders", "basket", "marketing", "locations" }
}; };
//Wait untill identity service is ready on compose. //Wait untill identity service is ready on compose.


+ 1
- 0
src/Web/WebMVC/appsettings.json View File

@ -7,6 +7,7 @@
"CallBackUrl": "http://localhost:5100/", "CallBackUrl": "http://localhost:5100/",
"IsClusterEnv": "False", "IsClusterEnv": "False",
"UseResilientHttp": "True", "UseResilientHttp": "True",
"UseLoadTest": false,
"Logging": { "Logging": {
"IncludeScopes": false, "IncludeScopes": false,
"LogLevel": { "LogLevel": {


+ 1
- 1
test/Services/LoadTest/Ordering.API/GetCardTypes.webtest View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<WebTest Name="GetCardTypes" Id="bb2ad65f-7035-45c6-ab02-003376d478f4" Owner="" Priority="2147483647" Enabled="True" CssProjectStructure="" CssIteration="" Timeout="0" WorkItemIds="" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010" Description="" CredentialUserName="" CredentialPassword="" PreAuthenticate="True" Proxy="default" StopOnError="False" RecordedResultFile="" ResultsLocale="">
<WebTest Name="GetCardTypes" Id="5ad800ae-aa9a-4e40-844e-fab746fc966d" Owner="" Priority="2147483647" Enabled="True" CssProjectStructure="" CssIteration="" Timeout="0" WorkItemIds="" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010" Description="" CredentialUserName="" CredentialPassword="" PreAuthenticate="True" Proxy="default" StopOnError="False" RecordedResultFile="" ResultsLocale="">
<Items> <Items>
<Request Method="GET" Guid="6010f193-941a-4a7b-98d4-45be7699a0dc" Version="1.1" Url="{{MvcWebServer}}/Account/SignIn" ThinkTime="0" Timeout="300" ParseDependentRequests="True" FollowRedirects="True" RecordResult="True" Cache="False" ResponseTimeGoal="0" Encoding="utf-8" ExpectedHttpStatusCode="0" ExpectedResponseUrl="{{IdentityApiServer}}/account/login?returnUrl=%2Fconnect%2Fauthorize%2Flogin%3Fclient_id%3Dmvc%26redirect_uri%3D{{MvcWebServer}}%252Fsignin-oidc%26response_type%3Dcode%20id_token%20token%26scope%3Dopenid%20profile%20orders%20basket%20marketing%26response_mode%3Dform_post%26nonce%3D636343249853641220.YTUyNDUwYmUtMDUwNi00YzViLWI4ZjItZGJhZDMwNmM1YjNlMDNhYjZmOGItZTk5YS00ZGEzLTg1Y2UtMDE3YTFjNWFlNjEw%26state%3DCfDJ8OCCkEVDCp5PrdqHtEgvt_mxNTrlU_psyuqjm9lkemQgTEZ-k_LUyThb4S21qtGcud5ajY1BOwzMlk0uvC0p8CB9hqSKaaDpjvspLXMLHjjsZNqjG3bdvnGSHp08_go1orFXlRLeC-8dNSlLlzynWJp9uK_WC56gjcJAiqQErMBVub5lacO-ph04so9LMkZ5KSFxP0qPlkYidej2RfOYkNFxzZnLVTs5ZB_l7IU3EPgh8geWXtks_bnlnPCq9CMnWKuxlTY4_M44DCp0mMWmK_JqBfGSlnEt5d2iz2QThepUUgIg0XQxZsEPl0rsdpN0AXOXOc9bgTm-ApXmoAyBRC-dM_9k59MdxYAbipZGcwOc" ReportingName="" IgnoreHttpStatusCode="False"> <Request Method="GET" Guid="6010f193-941a-4a7b-98d4-45be7699a0dc" Version="1.1" Url="{{MvcWebServer}}/Account/SignIn" ThinkTime="0" Timeout="300" ParseDependentRequests="True" FollowRedirects="True" RecordResult="True" Cache="False" ResponseTimeGoal="0" Encoding="utf-8" ExpectedHttpStatusCode="0" ExpectedResponseUrl="{{IdentityApiServer}}/account/login?returnUrl=%2Fconnect%2Fauthorize%2Flogin%3Fclient_id%3Dmvc%26redirect_uri%3D{{MvcWebServer}}%252Fsignin-oidc%26response_type%3Dcode%20id_token%20token%26scope%3Dopenid%20profile%20orders%20basket%20marketing%26response_mode%3Dform_post%26nonce%3D636343249853641220.YTUyNDUwYmUtMDUwNi00YzViLWI4ZjItZGJhZDMwNmM1YjNlMDNhYjZmOGItZTk5YS00ZGEzLTg1Y2UtMDE3YTFjNWFlNjEw%26state%3DCfDJ8OCCkEVDCp5PrdqHtEgvt_mxNTrlU_psyuqjm9lkemQgTEZ-k_LUyThb4S21qtGcud5ajY1BOwzMlk0uvC0p8CB9hqSKaaDpjvspLXMLHjjsZNqjG3bdvnGSHp08_go1orFXlRLeC-8dNSlLlzynWJp9uK_WC56gjcJAiqQErMBVub5lacO-ph04so9LMkZ5KSFxP0qPlkYidej2RfOYkNFxzZnLVTs5ZB_l7IU3EPgh8geWXtks_bnlnPCq9CMnWKuxlTY4_M44DCp0mMWmK_JqBfGSlnEt5d2iz2QThepUUgIg0XQxZsEPl0rsdpN0AXOXOc9bgTm-ApXmoAyBRC-dM_9k59MdxYAbipZGcwOc" ReportingName="" IgnoreHttpStatusCode="False">
<Headers> <Headers>


Loading…
Cancel
Save