From 47fd95293ef89baad43c8b442e544ecd1f9e2219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ca=C3=B1izares=20Est=C3=A9vez?= Date: Tue, 13 Dec 2016 17:20:10 +0100 Subject: [PATCH] - Fix docker-compose file for identity project (was not working) - Fix a problem with a setting. - Some css media queries in login and register for Xamarin --- .../Controllers/AccountController.cs | 2 + .../eShopOnContainers.Identity/Program.cs | 2 +- .../Views/Account/ConfirmEmail.cshtml | 10 --- .../Account/ExternalLoginConfirmation.cshtml | 35 --------- .../Views/Account/ExternalLoginFailure.cshtml | 8 --- .../Views/Account/ForgotPassword.cshtml | 31 -------- .../Account/ForgotPasswordConfirmation.cshtml | 8 --- .../Views/Account/Lockout.cshtml | 8 --- .../Views/Account/LoggedOut.cshtml | 2 +- .../Views/Account/Logout.cshtml | 2 +- .../Views/Account/ResetPassword.cshtml | 43 ----------- .../Account/ResetPasswordConfirmation.cshtml | 8 --- .../Views/Account/SendCode.cshtml | 21 ------ .../Views/Account/VerifyCode.cshtml | 38 ---------- .../Views/Consent/Index.cshtml | 2 +- .../Views/Manage/AddPhoneNumber.cshtml | 27 ------- .../Views/Manage/ChangePassword.cshtml | 42 ----------- .../Views/Manage/Index.cshtml | 71 ------------------- .../Views/Manage/ManageLogins.cshtml | 54 -------------- .../Views/Manage/SetPassword.cshtml | 38 ---------- .../Views/Manage/VerifyPhoneNumber.cshtml | 30 -------- .../Views/Shared/_Layout.cshtml | 4 +- .../docker-compose.yml | 4 +- .../wwwroot/css/site.css | 14 ++++ .../wwwroot/css/site.min.css | 2 +- 25 files changed, 25 insertions(+), 481 deletions(-) delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Account/ConfirmEmail.cshtml delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Account/ExternalLoginConfirmation.cshtml delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Account/ExternalLoginFailure.cshtml delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Account/ForgotPassword.cshtml delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Account/ForgotPasswordConfirmation.cshtml delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Account/Lockout.cshtml delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Account/ResetPassword.cshtml delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Account/ResetPasswordConfirmation.cshtml delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Account/SendCode.cshtml delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Account/VerifyCode.cshtml delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Manage/AddPhoneNumber.cshtml delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Manage/ChangePassword.cshtml delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Manage/Index.cshtml delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Manage/ManageLogins.cshtml delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Manage/SetPassword.cshtml delete mode 100644 src/Services/Identity/eShopOnContainers.Identity/Views/Manage/VerifyPhoneNumber.cshtml diff --git a/src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs b/src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs index c441e5976..5c71cbf64 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs +++ b/src/Services/Identity/eShopOnContainers.Identity/Controllers/AccountController.cs @@ -70,6 +70,7 @@ namespace IdentityServer4.Quickstart.UI.Controllers } var vm = await BuildLoginViewModelAsync(returnUrl, context); + ViewData["ReturnUrl"] = returnUrl; return View(vm); } @@ -118,6 +119,7 @@ namespace IdentityServer4.Quickstart.UI.Controllers // something went wrong, show form with error var vm = await BuildLoginViewModelAsync(model); + ViewData["ReturnUrl"] = model.ReturnUrl; return View(vm); } diff --git a/src/Services/Identity/eShopOnContainers.Identity/Program.cs b/src/Services/Identity/eShopOnContainers.Identity/Program.cs index 23d4b8060..48531ae65 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Program.cs +++ b/src/Services/Identity/eShopOnContainers.Identity/Program.cs @@ -15,7 +15,7 @@ namespace eShopOnContainers.Identity .UseKestrel() .UseUrls("http://0.0.0.0:5105") .UseContentRoot(Directory.GetCurrentDirectory()) - //.UseIISIntegration() + .UseIISIntegration() .UseStartup() .Build(); diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/ConfirmEmail.cshtml b/src/Services/Identity/eShopOnContainers.Identity/Views/Account/ConfirmEmail.cshtml deleted file mode 100644 index 3244fef5f..000000000 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/ConfirmEmail.cshtml +++ /dev/null @@ -1,10 +0,0 @@ -@{ - ViewData["Title"] = "Confirm Email"; -} - -

@ViewData["Title"].

-
-

- Thank you for confirming your email. Please Click here to Log in. -

-
diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/ExternalLoginConfirmation.cshtml b/src/Services/Identity/eShopOnContainers.Identity/Views/Account/ExternalLoginConfirmation.cshtml deleted file mode 100644 index 987fff41c..000000000 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/ExternalLoginConfirmation.cshtml +++ /dev/null @@ -1,35 +0,0 @@ -@model ExternalLoginConfirmationViewModel -@{ - ViewData["Title"] = "Register"; -} - -

@ViewData["Title"].

-

Associate your @ViewData["LoginProvider"] account.

- -
-

Association Form

-
-
- -

- You've successfully authenticated with @ViewData["LoginProvider"]. - Please enter an email address for this site below and click the Register button to finish - logging in. -

-
- -
- - -
-
-
-
- -
-
-
- -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/ExternalLoginFailure.cshtml b/src/Services/Identity/eShopOnContainers.Identity/Views/Account/ExternalLoginFailure.cshtml deleted file mode 100644 index d89339e01..000000000 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/ExternalLoginFailure.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@{ - ViewData["Title"] = "Login Failure"; -} - -
-

@ViewData["Title"].

-

Unsuccessful login with service.

-
diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/ForgotPassword.cshtml b/src/Services/Identity/eShopOnContainers.Identity/Views/Account/ForgotPassword.cshtml deleted file mode 100644 index ee02538a0..000000000 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/ForgotPassword.cshtml +++ /dev/null @@ -1,31 +0,0 @@ -@model ForgotPasswordViewModel -@{ - ViewData["Title"] = "Forgot your password?"; -} - -

@ViewData["Title"]

-

- For more information on how to enable reset password please see this article. -

- -@*
-

Enter your email.

-
-
-
- -
- - -
-
-
-
- -
-
-
*@ - -@section Scripts { - @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } -} diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/ForgotPasswordConfirmation.cshtml b/src/Services/Identity/eShopOnContainers.Identity/Views/Account/ForgotPasswordConfirmation.cshtml deleted file mode 100644 index ab9bf44c8..000000000 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/ForgotPasswordConfirmation.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@{ - ViewData["Title"] = "Forgot Password Confirmation"; -} - -

@ViewData["Title"].

-

- Please check your email to reset your password. -

diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Lockout.cshtml b/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Lockout.cshtml deleted file mode 100644 index 2cc946d5c..000000000 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/Lockout.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@{ - ViewData["Title"] = "Locked out"; -} - -
-

Locked out.

-

This account has been locked out, please try again later.

-
diff --git a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/LoggedOut.cshtml b/src/Services/Identity/eShopOnContainers.Identity/Views/Account/LoggedOut.cshtml index 070397209..11886a1b0 100644 --- a/src/Services/Identity/eShopOnContainers.Identity/Views/Account/LoggedOut.cshtml +++ b/src/Services/Identity/eShopOnContainers.Identity/Views/Account/LoggedOut.cshtml @@ -1,6 +1,6 @@ @model eShopOnContainers.Identity.Models.AccountViewModels.LoggedOutViewModel -