From 8d840a53cf8cbd078c129d92dede5dca57efe7f4 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Mon, 19 Sep 2022 12:59:23 +0300 Subject: [PATCH] Remove cancel functionality from Login --- .../Account/Localization/Resources/ar.json | 1 - .../Account/Localization/Resources/cs.json | 1 - .../Account/Localization/Resources/da.json | 1 - .../Account/Localization/Resources/de-DE.json | 1 - .../Account/Localization/Resources/de.json | 1 - .../Account/Localization/Resources/el.json | 1 - .../Account/Localization/Resources/en-GB.json | 1 - .../Account/Localization/Resources/en.json | 1 - .../Account/Localization/Resources/es-mx.json | 1 - .../Account/Localization/Resources/es.json | 1 - .../Account/Localization/Resources/fa.json | 1 - .../Account/Localization/Resources/fi.json | 1 - .../Account/Localization/Resources/fr.json | 1 - .../Account/Localization/Resources/hi.json | 1 - .../Account/Localization/Resources/hu.json | 1 - .../Account/Localization/Resources/is.json | 1 - .../Account/Localization/Resources/it.json | 1 - .../Account/Localization/Resources/nl.json | 1 - .../Account/Localization/Resources/pl-PL.json | 1 - .../Account/Localization/Resources/pt-BR.json | 1 - .../Account/Localization/Resources/ro-RO.json | 1 - .../Account/Localization/Resources/ru.json | 1 - .../Account/Localization/Resources/sk.json | 1 - .../Account/Localization/Resources/sl.json | 1 - .../Account/Localization/Resources/tr.json | 1 - .../Account/Localization/Resources/vi.json | 1 - .../Localization/Resources/zh-Hans.json | 1 - .../Localization/Resources/zh-Hant.json | 1 - .../IdentityServerSupportedLoginModel.cs | 16 -------------- .../Properties/launchSettings.json | 12 +++++++++++ .../Account/OpenIddictSupportedLoginModel.cs | 21 ------------------- .../Properties/launchSettings.json | 12 +++++++++++ .../Pages/Account/Login.cshtml | 4 ---- .../Pages/Account/Login.cshtml.cs | 2 -- .../Pages/Account/ResetPassword.cshtml | 1 - 35 files changed, 24 insertions(+), 72 deletions(-) create mode 100644 modules/account/src/Volo.Abp.Account.Web.IdentityServer/Properties/launchSettings.json create mode 100644 modules/account/src/Volo.Abp.Account.Web.OpenIddict/Properties/launchSettings.json diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ar.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ar.json index b9840ed207..111e4d75d1 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ar.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ar.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "تم تعطيل التسجيل الذاتي لهذا التطبيق. يرجى الاتصال بمسؤول التطبيق لتسجيل مستخدم جديد.", "LocalLoginDisabledMessage": "تسجيل الدخول المحلي معطّل لهذا التطبيق.", "Login": "دخول", - "Cancel": "إلغاء", "Register": "تسجيل", "AreYouANewUser": "هل أنت مستخدم جديد?", "AlreadyRegistered": "مسجل بالفعل?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/cs.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/cs.json index 3266adae51..622eb75893 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/cs.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/cs.json @@ -13,7 +13,6 @@ "SelfRegistrationDisabledMessage": "Vlastní registrace uživatele není povolena. K vytvoření účtu kontaktujte správce.", "LocalLoginDisabledMessage": "Místní přihlášení je pro tuto aplikaci zakázáno.", "Login": "Přihlásit", - "Cancel": "Zrušit", "Register": "Registrovat", "AreYouANewUser": "Jste nový uživatel?", "AlreadyRegistered": "Jste už zaregistrovaní?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/da.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/da.json index 38d81e8516..f1e1e50922 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/da.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/da.json @@ -13,7 +13,6 @@ "SelfRegistrationDisabledMessage": "Selvregistrering er deaktiveret for denne applikation. Kontakt venligst applikationens administrator for at registrere en ny bruger.", "LocalLoginDisabledMessage": "Lokalt login er deaktiveret for denne appliaktion.", "Login": "Login", - "Cancel": "Annullér", "Register": "Registrér", "AreYouANewUser": "Er du ny bruger?", "AlreadyRegistered": "Allerede registreret?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de-DE.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de-DE.json index 02eae9240d..cbf08e6363 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de-DE.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de-DE.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "Die Selbstregistrierung ist für diese Anwendung deaktiviert. Bitte wenden Sie sich an den Anwendungsadministrator, um einen neuen Benutzer zu registrieren.", "LocalLoginDisabledMessage": "Die lokale Anmeldung ist für diese Anwendung deaktiviert.", "Login": "Anmelden", - "Cancel": "Abbrechen", "Register": "Registrieren", "AreYouANewUser": "Sind Sie ein neuer Benutzer", "AlreadyRegistered": "Bereits registriert?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de.json index f66217156b..64cb2c40c7 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/de.json @@ -13,7 +13,6 @@ "SelfRegistrationDisabledMessage": "Die Selbstregistrierung ist für diese Anwendung deaktiviert. Bitte wenden Sie sich an den Anwendungsadministrator, um einen neuen Benutzer zu registrieren.", "LocalLoginDisabledMessage": "Die lokale Anmeldung ist für diese Anwendung deaktiviert.", "Login": "Anmelden", - "Cancel": "Abbrechen", "Register": "Registrieren", "AreYouANewUser": "Neuer Benutzer?", "AlreadyRegistered": "Bereits registriert?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/el.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/el.json index e5af66d6fe..2e5ec59877 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/el.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/el.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "Η αυτοεγγραφή είναι απενεργοποιημένη για αυτήν την εφαρμογή. Επικοινωνήστε με τον διαχειριστή της εφαρμογής για να εγγραφείτε ως νέος χρήστης.", "LocalLoginDisabledMessage": "Η τοπική σύνδεση είναι απενεργοποιημένη για αυτήν την εφαρμογή.", "Login": "Σύνδεση", - "Cancel": "Ακύρωση", "Register": "Εγγραφή", "AreYouANewUser": "Είστε νέος χρήστης;", "AlreadyRegistered": "Ήδη εγγεγραμμένος;", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en-GB.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en-GB.json index 7bfcdccec7..880fbf8a78 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en-GB.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en-GB.json @@ -13,7 +13,6 @@ "SelfRegistrationDisabledMessage": "Self-registration is disabled for this application. Please contact the application administrator to register a new user.", "LocalLoginDisabledMessage": "Local login is disabled for this application.", "Login": "Login", - "Cancel": "Cancel", "Register": "Register", "AreYouANewUser": "Are you a new user?", "AlreadyRegistered": "Already registered?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json index d5f881e365..7fb42a54b4 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "Self-registration is disabled for this application. Please contact the application administrator to register a new user.", "LocalLoginDisabledMessage": "Local login is disabled for this application.", "Login": "Login", - "Cancel": "Cancel", "Register": "Register", "AreYouANewUser": "Are you a new user?", "AlreadyRegistered": "Already registered?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es-mx.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es-mx.json index d6389de2a9..4369a9d0b4 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es-mx.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es-mx.json @@ -12,7 +12,6 @@ "LoginIsNotAllowed": "¡No está permitido iniciar sesión! Su cuenta está inactiva o necesita confirmar su correo electrónico/número de teléfono.", "SelfRegistrationDisabledMessage": "El autoregistro de usuario está deshabilitado para esta aplicación. Póngase en contacto con el administrador de la aplicación para registrar un nuevo usuario.", "Login": "Iniciar sesión", - "Cancel": "Cancelar", "Register": "Registrar", "InvalidLoginRequest": "Solicitud de inicio de sesión no válido", "ThereAreNoLoginSchemesConfiguredForThisClient": "No hay ningún inicio de sesión esquemas configurado para este cliente.", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es.json index 9632dc91f2..1f69b3505b 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/es.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "El autoregistro de usuario está deshabilitado para esta aplicación. Póngase en contacto con el administrador de la aplicación para registrar un nuevo usuario.", "LocalLoginDisabledMessage": "Inicio de sesión local ha sido deshabilitado para esta aplicación", "Login": "Iniciar sesión", - "Cancel": "Cancelar", "Register": "Registrarse", "AreYouANewUser": "¿Eres un usuario nuevo?", "AlreadyRegistered": "¿Ya esta registrado?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fa.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fa.json index 7116a202eb..15819066f5 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fa.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fa.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "ثبت نام خودکار برای این برنامه غیرفعال است. لطفاً برای ثبت نام کاربر جدید با سرپرست برنامه تماس بگیرید.", "LocalLoginDisabledMessage": "ورود محلی برای این برنامه غیرفعال است.", "Login": "ورود کاربران", - "Cancel": "لغو", "Register": "ثبت نام", "AreYouANewUser": "قبلا ثبت نام نکرده اید؟", "AlreadyRegistered": "قبلاً ثبت نام کرده اید؟", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fi.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fi.json index 42dfb59005..456afea645 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fi.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fi.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "Itserekisteröinti on poistettu käytöstä tälle sovellukselle. Rekisteröi uusi käyttäjä ottamalla yhteyttä sovelluksen järjestelmänvalvojaan.", "LocalLoginDisabledMessage": "Paikallinen sisäänkirjautuminen on poistettu käytöstä tälle sovellukselle.", "Login": "Kirjaudu sisään", - "Cancel": "Peruuttaa", "Register": "Rekisteröidy", "AreYouANewUser": "Oletko uusi käyttäjä?", "AlreadyRegistered": "Jo rekisteröity?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fr.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fr.json index afce5f6bdd..781bc3aa97 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fr.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/fr.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "L'auto-inscription est désactivée pour cette application. Veuillez contacter l'administrateur de l'application pour enregistrer un nouvel utilisateur.", "LocalLoginDisabledMessage": "La connexion locale est désactivée pour cette application.", "Login": "Connectez-vous", - "Cancel": "Annuler", "Register": "S'inscrire", "AreYouANewUser": "Êtes-vous un nouvel utilisateur?", "AlreadyRegistered": "Déjà inscrit?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hi.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hi.json index d406e3f6d5..8373d50ef9 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hi.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hi.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "इस आवेदन के लिए स्व-पंजीकरण अक्षम है। नया उपयोगकर्ता पंजीकृत करने के लिए कृपया एप्लिकेशन व्यवस्थापक से संपर्क करें।", "LocalLoginDisabledMessage": "इस एप्लिकेशन के लिए स्थानीय लॉगिन अक्षम है।", "Login": "लॉग इन करें", - "Cancel": "रद्द करना", "Register": "रजिस्टर करें", "AreYouANewUser": "क्या आप नए उपयोगकर्ता हैं?", "AlreadyRegistered": "पहले से पंजीकृत?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hu.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hu.json index 77fbc0823f..c54c53c9d4 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hu.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/hu.json @@ -13,7 +13,6 @@ "SelfRegistrationDisabledMessage": "Ennél az alkalmazásnál az önregisztráció le van tiltva. Új felhasználó regisztrálásához vegye fel a kapcsolatot az alkalmazás rendszergazdájával.", "LocalLoginDisabledMessage": "A helyi bejelentkezés le van tiltva ennél az alkalmazásnál.", "Login": "Bejelntkezés", - "Cancel": "Mégsem", "Register": "Regisztráció", "AreYouANewUser": "Őn új felhasználó?", "AlreadyRegistered": "Már regisztrált?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/is.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/is.json index e592e956aa..7097f120be 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/is.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/is.json @@ -13,7 +13,6 @@ "SelfRegistrationDisabledMessage": "Sjálfsskráning er óvirk fyrir þetta forrit. Vinsamlegast hafðu samband við umsjónarmann hugbúnaðarins til að skrá nýjan notanda.", "LocalLoginDisabledMessage": "Staðbundin innskráning er óvirk fyrir þetta forrit.", "Login": "Skrá inn", - "Cancel": "Hætta við", "Register": "Skráðu þig", "AreYouANewUser": "Ertu nýr notandi?", "AlreadyRegistered": "Nú þegar skráð?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/it.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/it.json index 5c3dfb77ac..7e39c636e5 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/it.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/it.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "L'auto-registrazione è disabilitata per questa applicazione. Contatta l'amministratore dell'applicazione per richiedere la registrazione.", "LocalLoginDisabledMessage": "L'accesso locale è disabilitato per questa applicazione.", "Login": "Accedi", - "Cancel": "Annulla", "Register": "Registrati", "AreYouANewUser": "Sei un nuovo utente?", "AlreadyRegistered": "Già registrato?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/nl.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/nl.json index 19bc055db9..2133ccb075 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/nl.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/nl.json @@ -13,7 +13,6 @@ "SelfRegistrationDisabledMessage": "Zelfregistratie is uitgeschakeld voor deze applicatie. Neem contact op met de applicatiebeheerder om een nieuwe gebruiker te registreren.", "LocalLoginDisabledMessage": "Lokale aanmelding is uitgeschakeld voor deze applicatie.", "Login": "Log in", - "Cancel": "Annuleer", "Register": "Registreer", "AreYouANewUser": "Bent u een nieuwe gebruiker?", "AlreadyRegistered": "Al geregistreerd?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pl-PL.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pl-PL.json index 21af5b9ce1..4e95a17051 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pl-PL.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pl-PL.json @@ -13,7 +13,6 @@ "SelfRegistrationDisabledMessage": "Rejestracja użytkowników jest wyłączona dla tej aplikacji. Skontaktuj się z administratorem aplikacji w celu rejestracji nowego użytkownika.", "LocalLoginDisabledMessage": "Logowanie lokalne jest wyłączone dla tej aplikacji.", "Login": "Zaloguj", - "Cancel": "Anuluj", "Register": "Zarejestruj", "AreYouANewUser": "Czy jesteś nowym użytkownikiem?", "AlreadyRegistered": "Już zarejestrowany?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pt-BR.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pt-BR.json index 71adf7be31..aa2cbeae55 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pt-BR.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pt-BR.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "Não é permitido que você crie uma nova conta neste site. Contate um administrador para que ele crie uma conta para você.", "LocalLoginDisabledMessage": "O login local está desativado para este aplicativo.", "Login": "Entrar", - "Cancel": "Cancelar", "Register": "Registre-se", "AreYouANewUser": "Você é um novo usuário?", "AlreadyRegistered": "Já registrado?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ro-RO.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ro-RO.json index c753009bb0..cf600d688a 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ro-RO.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ro-RO.json @@ -13,7 +13,6 @@ "SelfRegistrationDisabledMessage": "Înregistrarea personală este dezactivată pentru această aplicaţie. Vă rugăm să contactaţi administratorul aplicaţiei pentru a înregistra un nou utilizator.", "LocalLoginDisabledMessage": "Autentificarea locală este dezactivată pentru această aplicaţie.", "Login": "Autentificare", - "Cancel": "Anulează", "Register": "Înregistrare", "AreYouANewUser": "Sunteţi un utilizator nou?", "AlreadyRegistered": "Deja înregistrat?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ru.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ru.json index 337bf2836a..0321c94dab 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ru.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ru.json @@ -13,7 +13,6 @@ "SelfRegistrationDisabledMessage": "Самостоятельная регистрация не предусмотрена. Пожалуйста, свяжитесь с администраром для получения доступа.", "LocalLoginDisabledMessage": "Локальный вход отключен.", "Login": "Войти", - "Cancel": "Отмена", "Register": "Регистрация", "AreYouANewUser": "Новый пользователь?", "AlreadyRegistered": "Уже зарегистрированы?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sk.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sk.json index c0467110ae..183c318af9 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sk.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sk.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "Samostatná registrácia je pre túto aplikáciu vypnutá. Ak chcete zaregistrovať nového používateľa, obráťte sa na správcu aplikácie.", "LocalLoginDisabledMessage": "Lokálne prihlásenie je pre túto aplikáciu zakázané.", "Login": "Prihlásiť", - "Cancel": "Zrušiť", "Register": "Registrovať", "AreYouANewUser": "Ste nový používateľ?", "AlreadyRegistered": "Už ste zaregistrovaný?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sl.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sl.json index 5298b8d968..b80dd9a4a7 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sl.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/sl.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "Možnost lastne registracije uporabnika je onemogočena za to aplikacijo. Kontaktirajte skrbnika aplikacije, da registrirate novega uporabnika.", "LocalLoginDisabledMessage": "Lokalna prijava za to aplikacijo je onemogočena.", "Login": "Prijava", - "Cancel": "Prekliči", "Register": "Registracija", "AreYouANewUser": "Ste nov uporabnik?", "AlreadyRegistered": "Ste že registrirani?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json index 6edaf2c1c4..3929180600 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/tr.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "Bu uygulama için kullanıcıların kendi kendilerine kaydolmaları engellenmiştir. Yeni bir kullanıcı kaydetmek için lütfen uygulama yöneticisi ile iletişime geçin.", "LocalLoginDisabledMessage": "Bu uygulama için local login devre dışı bırakılmıştır.", "Login": "Giriş yap", - "Cancel": "İptal", "Register": "Kayıt ol", "AreYouANewUser": "Yeni bir kullanıcı mısınız?", "AlreadyRegistered": "Zaten kayıtlı mı?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/vi.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/vi.json index 430bdd3c26..9f43e7d45c 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/vi.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/vi.json @@ -13,7 +13,6 @@ "SelfRegistrationDisabledMessage": "Tự đăng ký người dùng bị vô hiệu hóa cho ứng dụng này. Liên hệ với quản trị viên ứng dụng để đăng ký người dùng mới.", "LocalLoginDisabledMessage": "Đăng nhập cục bộ bị vô hiệu hóa cho ứng dụng này.", "Login": "Đăng nhập", - "Cancel": "Hủy bỏ", "Register": "Đăng ký", "AreYouANewUser": "Bạn có phải là người dùng mới?", "AlreadyRegistered": "Đã đăng ký?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json index 1c51fb1fa9..b8445103f6 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hans.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "应用程序未开放注册,请联系管理员添加新用户.", "LocalLoginDisabledMessage": "应用程序未开放本地账户登录.", "Login": "登录", - "Cancel": "取消", "Register": "注册", "AreYouANewUser": "你是新用户吗?", "AlreadyRegistered": "已经注册过了?", diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hant.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hant.json index dc0f6a94b9..a6fadebfd6 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hant.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/zh-Hant.json @@ -14,7 +14,6 @@ "SelfRegistrationDisabledMessage": "應用程式未開放註冊,請聯絡管理員以加入新使用者.", "LocalLoginDisabledMessage": "應用程序未開放本地賬戶登錄.", "Login": "登入", - "Cancel": "取消", "Register": "註冊", "AreYouANewUser": "你是新使用者嗎?", "AlreadyRegistered": "已經註冊過了?", diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs index 16bd8086d5..79f1dd66db 100644 --- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs +++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs @@ -54,8 +54,6 @@ public class IdentityServerSupportedLoginModel : LoginModel if (context != null) { - ShowCancelButton = true; - LoginInput.UserNameOrEmailAddress = context.LoginHint; //TODO: Reference AspNetCore MultiTenancy module and use options to get the tenant key! @@ -104,20 +102,6 @@ public class IdentityServerSupportedLoginModel : LoginModel public override async Task OnPostAsync(string action) { var context = await Interaction.GetAuthorizationContextAsync(ReturnUrl); - if (action == "Cancel") - { - if (context == null) - { - return Redirect("~/"); - } - - await Interaction.GrantConsentAsync(context, new ConsentResponse() - { - Error = AuthorizationError.AccessDenied - }); - - return Redirect(ReturnUrl); - } await CheckLocalLoginAsync(); diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Properties/launchSettings.json b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Properties/launchSettings.json new file mode 100644 index 0000000000..e964983c7d --- /dev/null +++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "Volo.Abp.Account.Web.IdentityServer": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:51203;http://localhost:51204" + } + } +} \ No newline at end of file diff --git a/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Pages/Account/OpenIddictSupportedLoginModel.cs b/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Pages/Account/OpenIddictSupportedLoginModel.cs index 61b170c612..4646b1e2cc 100644 --- a/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Pages/Account/OpenIddictSupportedLoginModel.cs +++ b/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Pages/Account/OpenIddictSupportedLoginModel.cs @@ -34,8 +34,6 @@ public class OpenIddictSupportedLoginModel : LoginModel var request = await OpenIddictRequestHelper.GetFromReturnUrlAsync(ReturnUrl); if (request?.ClientId != null) { - ShowCancelButton = true; - LoginInput.UserNameOrEmailAddress = request.LoginHint; //TODO: Reference AspNetCore MultiTenancy module and use options to get the tenant key! @@ -52,25 +50,6 @@ public class OpenIddictSupportedLoginModel : LoginModel public async override Task OnPostAsync(string action) { - if (action == "Cancel") - { - var request = await OpenIddictRequestHelper.GetFromReturnUrlAsync(ReturnUrl); - - var transaction = HttpContext.GetOpenIddictServerTransaction(); - if (request?.ClientId != null && transaction != null) - { - transaction.EndpointType = OpenIddictServerEndpointType.Authorization; - transaction.Request = request; - - var notification = new OpenIddictServerEvents.ValidateAuthorizationRequestContext(transaction); - transaction.SetProperty(typeof(OpenIddictServerEvents.ValidateAuthorizationRequestContext).FullName!, notification); - - return Forbid(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme); - } - - return Redirect("~/"); - } - return await base.OnPostAsync(action); } diff --git a/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Properties/launchSettings.json b/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Properties/launchSettings.json new file mode 100644 index 0000000000..4cf7426019 --- /dev/null +++ b/modules/account/src/Volo.Abp.Account.Web.OpenIddict/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "Volo.Abp.Account.Web.OpenIddict": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:51205;http://localhost:51206" + } + } +} \ No newline at end of file diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml index ae31edc5e7..c47091d6b2 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml @@ -39,10 +39,6 @@
@L["Login"] - @if (Model.ShowCancelButton) - { - @L["Cancel"] - }
} diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs index 9d6e2d8b9b..bad4ba618a 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs @@ -53,8 +53,6 @@ public class LoginModel : AccountPageModel protected AbpAccountOptions AccountOptions { get; } protected IOptions IdentityOptions { get; } - public bool ShowCancelButton { get; set; } - public LoginModel( IAuthenticationSchemeProvider schemeProvider, IOptions accountOptions, diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPassword.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPassword.cshtml index 4fad4f91cc..d3b8762fea 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPassword.cshtml +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/ResetPassword.cshtml @@ -13,7 +13,6 @@ - @L["Cancel"]