From f29b2399d7bd4b591bec51288da0c82aa9d64fdf Mon Sep 17 00:00:00 2001 From: Thivi Date: Fri, 28 Jan 2022 11:44:34 +0530 Subject: [PATCH 01/82] Update texts --- .../src/models/namespaces/myaccount-ns.ts | 6 ++ .../translations/en-US/portals/myaccount.ts | 60 +++++++++------- .../translations/fr-FR/portals/myaccount.ts | 63 ++++++++++------- .../translations/pt-BR/portals/myaccount.ts | 56 ++++++++------- .../translations/si-LK/portals/myaccount.ts | 61 +++++++++------- .../translations/ta-IN/portals/myaccount.ts | 70 +++++++++++-------- 6 files changed, 185 insertions(+), 131 deletions(-) diff --git a/modules/i18n/src/models/namespaces/myaccount-ns.ts b/modules/i18n/src/models/namespaces/myaccount-ns.ts index 7b373a1cec1..4b663091a42 100644 --- a/modules/i18n/src/models/namespaces/myaccount-ns.ts +++ b/modules/i18n/src/models/namespaces/myaccount-ns.ts @@ -319,6 +319,12 @@ export interface MyAccountNS { description: string; heading: string; }; + deleteConfirmation: { + description: string; + heading: string; + content: string; + assertionHint: string; + } }; notifications: { removeDevice: Notification; diff --git a/modules/i18n/src/translations/en-US/portals/myaccount.ts b/modules/i18n/src/translations/en-US/portals/myaccount.ts index 60081aad31a..be2e2d8cc47 100644 --- a/modules/i18n/src/translations/en-US/portals/myaccount.ts +++ b/modules/i18n/src/translations/en-US/portals/myaccount.ts @@ -650,67 +650,76 @@ export const myAccount: MyAccountNS = { } }, fido: { - description: "Authenticate yourself by connecting a biometric device or a FIDO key", + description: "You can use a FIDO2 security key or biometrics in " + + "your device to sign in to your account.", form: { - label: "Security Device", - placeholder: "Enter a device name", - remove: "Remove the device", - required: "Please enter a name for your security device" + label: "Security Key/Biometrics", + placeholder: "Enter a name for the security key/biometric", + remove: "Remove the security key/biometric", + required: "Please enter a name for your security key/biometric" }, - heading: "Security Device", + heading: "Security Key/Biometrics", modals: { + deleteConfirmation: { + assertionHint: "Please confirm your action.", + content: "This action is irreversible and will permanently delete the security key/biometric.", + description: "If you delete this security key/biometric, you may not be " + + "able to sign in to your account again. Please proceed with caution.", + heading: "Are you sure?" + }, deviceRegistrationErrorModal: { - description: "The device registration was interrupted. If this was not intentional you " + - "may retry the same flow or try again with an older security key.", - heading: "Device Registration Failed" + description: "The security key/biometric registration was interrupted. " + + "If this was not intentional you " + + "may retry the same flow or try again with an older security key/biometric.", + heading: "Security Key/Biometric Registration Failed" } }, notifications: { removeDevice: { error: { description: "{{description}}", - message: "Error occurred while removing the device" + message: "Error occurred while removing the security key/biometric" }, genericError: { - description: "Error occurred while removing the device", + description: "Error occurred while removing the security key/biometric", message: "Something went wrong" }, success: { - description: "The device was successfully removed from the list", - message: "Your Device Removed Successfully" + description: "The security key/biometric was successfully removed from the list", + message: "Your Security Key/Biometric Removed Successfully" } }, startFidoFlow: { error: { description: "{{description}}", - message: "Error occurred while retrieving the device" + message: "Error occurred while retrieving the security key/biometric" }, genericError: { - description: "Error occurred while retrieving the device", + description: "Error occurred while retrieving the security key/biometric", message: "Something went wrong" }, success: { - description: "The device was successfully registered and now you can use it as an " + - "authentication factor", - message: "Your Device Registered Successfully" + description: "The security key/biometric was successfully registered and now you " + + "can use it for authentication.", + message: "Your Security Key/Biometric Registered Successfully" } }, updateDeviceName: { error: { description: "{{description}}", - message: "Error occurred while updating the security device name" + message: "Error occurred while updating the security key/biometric name" }, genericError: { - description: "Error occurred while updating the security device name", + description: "Error occurred while updating the security key/biometric name", message: "Something went wrong" }, success: { - description: "The name of your security device was successfully updated", - message: "Security Device name updated successfully" + description: "The name of your security key/biometric was successfully updated", + message: "Security Key/Biometric name updated successfully" } } }, - tryButton: "Try with an older Device" + tryButton: "Try with an older Security Key/Biometric" }, smsOtp: { descriptions: { @@ -1492,8 +1501,9 @@ export const myAccount: MyAccountNS = { }, mfa: { description: - "Add an extra layer of protection to your account by configuring multiple steps of authentication.", - heading: "Multi-Factor Authentication" + "Configure additional authentications to sign in easily or " + + "to add an extra layer of security to your account.", + heading: "Additional Authentication" }, profile: { description: "Manage your personal profile", diff --git a/modules/i18n/src/translations/fr-FR/portals/myaccount.ts b/modules/i18n/src/translations/fr-FR/portals/myaccount.ts index 3cef5286baa..997909eb98d 100644 --- a/modules/i18n/src/translations/fr-FR/portals/myaccount.ts +++ b/modules/i18n/src/translations/fr-FR/portals/myaccount.ts @@ -668,68 +668,83 @@ export const myAccount: MyAccountNS = { } }, fido: { - description: "Authentifiez-vous à l'aide un dispositif biométrique ou dispositif FIDO", + description: "Vous pouvez utiliser une clé de sécurité FIDO2 ou des données biométriques" + + " dans votre appareil pour vous connecter à votre compte.", form: { - label: "Dispositif de sécurité", - placeholder: "Entrez un nom pour le dispositif", - remove: "Supprimer le dispositif", - required: "Veuillez saisir un nom pour votre dispositif de sécurité" + label: "Clé de sécurité/Biométrie", + placeholder: "Entrez un nom pour la clé de sécurité/biométrique", + remove: "Retirer la clé de sécurité/biométrique", + required: "Veuillez entrer un nom pour votre clé de sécurité/biométrique" }, - heading: "à l'aide d'un dispositif de sécurité", + heading: "Clé de sécurité/Biométrie", modals: { + deleteConfirmation: { + assertionHint: "Veuillez confirmer votre action.", + content: "Cette action est irréversible et supprimera définitivement " + + "la clé de sécurité/biométrique.", + description: "Si vous supprimez cette clé de sécurité/biométrique, vous ne pourrez " + + "peut-être plus vous connecter à votre compte. Veuillez procéder avec prudence.", + heading: "Es-tu sûr?" + }, deviceRegistrationErrorModal: { - description: "L'enregistrement du dispositif a été interrompu. " + - "Si ce n'était pas intentionnel, veuillez recommencer la procédure d'ajout " + - "du dispositif ou réessayer avec un dispositif moins récent.", - heading: "Échec de l'enregistrement du dispositif" + description: "La clé de sécurité/l'enregistrement biométrique a " + + "été interrompu. Si ce n'était pas intentionnel, vous pouvez réessayer le même flux" + + " ou réessayer avec une ancienne clé de sécurité/biométrique.", + heading: "Échec de l'enregistrement de la clé de sécurité/biométrique" } }, notifications: { removeDevice: { error: { description: "{{description}}", - message: "Une erreur s'est produite lors de la suppression du dispositif" + message: "Une erreur s'est produite lors de la suppression " + + "de la clé de sécurité/biométrique" }, genericError: { - description: "Une erreur s'est produite lors de la suppression du dispositif", + description: "Une erreur s'est produite lors de la " + + "suppression de la clé de sécurité/biométrique", message: "Quelque chose s'est mal passé" }, success: { - description: "Le dispositif a été supprimé de votre compte avec succès", - message: "Dispositif retiré avec succès" + description: "La clé de sécurité/biométrique a été supprimée avec succès de la liste", + message: "Votre clé de sécurité/biométrique a été supprimée avec succès" } }, startFidoFlow: { error: { description: "{{description}}", - message: "Une erreur s'est produite lors de l'accès au dispositif" + message: "Une erreur s'est produite lors de la récupération " + + "de la clé de sécurité/biométrique" }, genericError: { - description: "Une erreur s'est produite lors de l'accès au dispositif", + description: "Une erreur s'est produite lors de la récupération" + + " de la clé de sécurité/biométrique", message: "Quelque chose s'est mal passé" }, success: { - description: "Le dispositif a été enregistré avec succès. Vous pouvez dès " + - "à présent l'utiliser comme un facteur d'authentification", - message: "Votre dispositif a été enregistré avec succès" + description: "La clé de sécurité/biométrique a été enregistrée " + + "avec succès et vous pouvez maintenant l'utiliser pour l'authentification.", + message: "Votre clé de sécurité/biométrique enregistrée avec succès" } }, updateDeviceName: { error: { description: "{{description}}", - message: "Une erreur s'est produite lors de la mise à jour du nom du dispositif" + message: "Une erreur s'est produite lors de la mise à jour " + + "de la clé de sécurité/du nom biométrique" }, genericError: { - description: "Une erreur s'est produite lors de la mise à jour du nom du dispositif", + description: "Une erreur s'est produite lors de la mise à " + + "jour de la clé de sécurité/du nom biométrique", message: "Quelque chose s'est mal passé" }, success: { - description: "Le nom de votre dispositif a été mis à jour avec succès", - message: "Nom du dispositif mis à jour avec succès" + description: "Le nom de votre clé de sécurité/biométrique a été mis à jour avec succès", + message: "Clé de sécurité/Nom biométrique mis à jour avec succès" } } }, - tryButton: "Essayez avec un dispositif moins récent" + tryButton: "Essayez avec une ancienne clé de sécurité/biométrique" }, smsOtp: { descriptions: { diff --git a/modules/i18n/src/translations/pt-BR/portals/myaccount.ts b/modules/i18n/src/translations/pt-BR/portals/myaccount.ts index b7fff2ae58c..f66c6a234e6 100644 --- a/modules/i18n/src/translations/pt-BR/portals/myaccount.ts +++ b/modules/i18n/src/translations/pt-BR/portals/myaccount.ts @@ -650,68 +650,76 @@ export const myAccount: MyAccountNS = { } }, fido: { - description: "Autentique-se conectando uma chave FIDO", + description: "Você pode usar uma chave de segurança FIDO2 ou biometria em seu dispositivo " + + "para fazer login em sua conta.", form: { - label: "Dispositivo de segurança", - placeholder: "Digite o nome do dispositivo", - remove: "Retire o dispositivo", - required: "Digite um nome para o seu dispositivo de segurança" + label: "Chave de segurança/biometria", + placeholder: "Insira um nome para a chave de segurança/biométrico", + remove: "Remova a chave de segurança/biométrica", + required: "Insira um nome para sua chave de segurança/biometria" }, - heading: "FIDO", + heading: "Chave de segurança/biometria", modals: { + deleteConfirmation: { + assertionHint: "Por favor, confirme sua ação.", + content: "Esta ação é irreversível e excluirá permanentemente a chave de segurança/biométrica.", + description: "Se você excluir essa chave de segurança/biométrica, talvez não consiga fazer" + + " login na sua conta novamente. Por favor, prossiga com cautela.", + heading: "Tem certeza?" + }, deviceRegistrationErrorModal: { - description: "O registro do dispositivo foi interrompido. Se isso não foi intencional, tente " + - "novamente o mesmo fluxo ou tente novamente com uma chave de segurança mais antiga.", - heading: "Falha no registro do dispositivo" + description: "TA chave de segurança/registro biométrico foi interrompido. " + + "Se isso não foi intencional, você pode tentar novamente o mesmo fluxo ou tentar " + + "novamente com uma chave de segurança/biométrica mais antiga.", + heading: "Falha no registro biométrico/chave de segurança" } }, notifications: { removeDevice: { error: { description: "{{description}}", - message: "Ocorreu um erro ao remover o dispositivo" + message: "Ocorreu um erro ao remover a chave de segurança/biométrica" }, genericError: { - description: "Ocorreu um erro ao remover o dispositivo", + description: "Ocorreu um erro ao remover a chave de segurança/biométrica", message: "Algo deu errado" }, success: { - description: "O dispositivo foi removido com sucesso da lista", - message: "Seu dispositivo foi removido com sucesso" + description: "A chave de segurança/biometria foi removida com sucesso da lista", + message: "Sua chave de segurança/biométrico removido com sucesso" } }, startFidoFlow: { error: { description: "{{description}}", - message: "Ocorreu um erro ao recuperar o dispositivo" + message: "Ocorreu um erro ao recuperar a chave de segurança/biométrica" }, genericError: { - description: "Ocorreu um erro ao recuperar o dispositivo", + description: "Ocorreu um erro ao recuperar a chave de segurança/biométrica", message: "Algo deu errado" }, success: { - description: "O dispositivo foi registrado com sucesso e agora você pode usá-lo como" + - " um fator de autenticação", - message: "Seu dispositivo registrado com sucesso" + description: "A chave de segurança/biométrica foi registrada com sucesso " + + "e agora você pode usá-la para autenticação.", + message: "Sua chave de segurança/biométrico registrado com sucesso" } }, updateDeviceName: { error: { description: "{{description}}", - message: "Ocorreu um erro ao atualizar o nome do dispositivo de segurança" + message: "Ocorreu um erro ao atualizar a chave de segurança/nome biométrico" }, genericError: { - description: "Erro ao atualizar o nome do dispositivo de segurança", + description: "Ocorreu um erro ao atualizar a chave de segurança/nome biométrico", message: "Algo deu errado" }, success: { - description: - "O nome do seu dispositivo de segurança foi atualizado com sucesso", - message: "Nome do dispositivo de segurança atualizado com sucesso" + description: "O nome da sua chave de segurança/biometria foi atualizado com sucesso", + message: "Chave de segurança/nome biométrico atualizado com sucesso" } } }, - tryButton: "Tente com um dispositivo mais antigo" + tryButton: "Tente com uma chave de segurança/biométrica mais antiga" }, smsOtp: { descriptions: { diff --git a/modules/i18n/src/translations/si-LK/portals/myaccount.ts b/modules/i18n/src/translations/si-LK/portals/myaccount.ts index d34f80205d4..cac12504be4 100644 --- a/modules/i18n/src/translations/si-LK/portals/myaccount.ts +++ b/modules/i18n/src/translations/si-LK/portals/myaccount.ts @@ -649,68 +649,75 @@ export const myAccount: MyAccountNS = { } }, fido: { - description: "FIDO යතුරක් සම්බන්ධ කිරීමෙන් සත්\u200Dයාපනය කිරීම", + description: "ඔබට ඔබගේ ගිණුමට පුරනය වීමට ඔබගේ උපාංගයේ FIDO2 ආරක්‍ෂක යතුරක් හෝ ජෛවමිතික භාවිත කළ හැක.", form: { - label: "ආරක්ෂක උපාංගය", - placeholder: "උපාංග නාමයක් ඇතුළත් කරන්න", - remove: "උපාංගය ඉවත් කරන්න", - required: "කරුණාකර ඔබගේ ආරක්ෂක උපාංගයේ නම ඇතුළත් කරන්න" + label: "ආරක්ෂක යතුර/ජීවමිතික", + placeholder: "ආරක්ෂක යතුර/ජීවමිතික සඳහා නමක් ඇතුළත් කරන්න", + remove: "ආරක්ෂක යතුර/ජීවමිතික ඉවත් කරන්න", + required: "කරුණාකර ඔබගේ ආරක්ෂක යතුර/ජෛවමිතික සඳහා නමක් ඇතුළත් කරන්න" }, - heading: "FIDO", + heading: "ආරක්ෂක යතුර/ජීවමිතික", modals: { + deleteConfirmation: { + assertionHint: "කරුණාකර ඔබගේ ක්‍රියාව තහවුරු කරන්න.", + content: "මෙම ක්‍රියාව ආපසු හැරවිය නොහැකි අතර ආරක්ෂක යතුර/ජෛවමිතික ස්ථිරවම මකනු ඇත.", + description: "ඔබ මෙම ආරක්‍ෂක යතුර/ජීවමිතික මකා දැමුවහොත්, ඔබට නැවත ඔබගේ ගිණුමට " + + "පුරනය වීමට නොහැකි විය හැක. කරුණාකර ප්‍රවේශමෙන් ඉදිරියට යන්න.", + heading: "ඔයාට විශ්වාස ද?" + }, deviceRegistrationErrorModal: { - description: - "උපාංග ලියාපදිංචිය බාධා විය. මෙය හිතාමතා නොකළේ නම්, ඔබට එම ප්‍රවාහය නැවත උත්සාහ කළ " + - "හැකිය, නැතහොත් පැරණි ආරක්ෂක යතුරක් සමඟ නැවත උත්සාහ කරන්න.", - heading: "උපාංග ලියාපදිංචි කිරීම අසාර්ථක විය" + description: "ආරක්ෂක යතුර/ජීවමිතික ලියාපදිංචිය බාධා විය. මෙය චේතනාන්විත නොවේ නම්, " + + "ඔබට එම ප්‍රවාහයම නැවත උත්සාහ කිරීමට හෝ පැරණි ආරක්ෂක " + + "යතුරක්/ජෛවමිතික සමඟ නැවත උත්සාහ කිරීමට හැකිය.", + heading: "ආරක්ෂිත යතුර/ජීවමිතික ලියාපදිංචිය අසාර්ථක විය" } }, notifications: { removeDevice: { error: { description: "{{description}}", - message: "උපාංගය ඉවත් කිරීමේදී දෝෂයක් ඇතිවිය" + message: "ආරක්ෂක යතුර/ජීවමිතික ඉවත් කිරීමේදී දෝෂයක් සිදු විය" }, genericError: { - description: "උපාංගය ඉවත් කිරීමේදී දෝෂයක් ඇතිවිය", - message: "දෝෂයක් ඇතිවිය!!!" + description: "ආරක්ෂක යතුර/ජීවමිතික ඉවත් කිරීමේදී දෝෂයක් සිදු විය", + message: "මොකක්හරි වැරැද්දක් වෙලා" }, success: { - description: "උපාංගය ලැයිස්තුවෙන් සාර්ථකව ඉවත් කරන ලදි", - message: "ඔබගේ උපාංගය සාර්ථකව ඉවත් කරන ලදි" + description: "ආරක්ෂිත යතුර/ජීවමිතික ලැයිස්තුවෙන් සාර්ථකව ඉවත් කරන ලදී", + message: "ඔබගේ ආරක්‍ෂක යතුර/ජීවමිතික සාර්ථකව ඉවත් කරන ලදී" } }, startFidoFlow: { error: { description: "{{description}}", - message: "උපාංගය ලියාපදිංචි කිරීමේදී දෝෂයක් ඇතිවිය" + message: "ආරක්ෂක යතුර/ජීවමිතික ලබා ගැනීමේදී දෝෂයක් සිදු විය" }, genericError: { - description: "උපාංගය ලියාපදිංචි කිරීමේදී දෝෂයක් ඇතිවිය", - message: "දෝෂයක් ඇතිවිය!!!" + description: "ආරක්ෂක යතුර/ජීවමිතික ලබා ගැනීමේදී දෝෂයක් සිදු විය", + message: "මොකක්හරි වැරැද්දක් වෙලා" }, success: { - description: - "උපාංගය සාර්ථකව ලියාපදිංචි කර ඇති අතර දැන් ඔබට එය සත්‍යාපන සාධකයක් ලෙස භාවිතා කළ හැකිය", - message: "ඔබගේ උපාංගය සාර්ථකව ලියාපදිංචි කර ඇත" + description: "ආරක්ෂිත යතුර/ජීවමිතික සාර්ථකව ලියාපදිංචි කර ඇති අතර දැන් " + + "ඔබට එය සත්‍යාපනය සඳහා භාවිතා කළ හැක.", + message: "ඔබගේ ආරක්‍ෂක යතුර/ජෛවමිතික සාර්ථකව ලියාපදිංචි විය" } }, updateDeviceName: { error: { description: "{{description}}", - message: "ආරක්ෂක උපාංගයේ නම යාවත්කාලීන කිරීමේදී දෝෂයක් ඇතිවිය" + message: "ආරක්ෂක යතුර/ජෛවමිතික නම යාවත්කාලීන කිරීමේදී දෝෂයක් ඇති විය" }, genericError: { - description: "ආරක්ෂක උපාංගයේ නම යාවත්කාලීන කිරීමේදී දෝෂයක් ඇතිවිය", - message: "දෝෂයක් ඇතිවිය!!!" + description: "ආරක්ෂක යතුර/ජෛවමිතික නම යාවත්කාලීන කිරීමේදී දෝෂයක් ඇති විය", + message: "මොකක්හරි වැරැද්දක් වෙලා" }, success: { - description: "ඔබගේ ආරක්ෂක උපාංගයේ නම සාර්ථකව යාවත්කාලීන කරන ලදි", - message: "ආරක්ෂක උපාංගයේ නම සාර්ථකව යාවත්කාලීන කරන ලදි" + description: "ඔබගේ ආරක්‍ෂක යතුර/ජෛවමිතික නම සාර්ථකව යාවත්කාලීන කරන ලදී", + message: "ආරක්ෂිත යතුර/ජෛවමිතික නම සාර්ථකව යාවත්කාලීන කරන ලදී" } } }, - tryButton: "පැරණි උපාංගයක් සමඟ උත්සාහ කරන්න" + tryButton: "පැරණි ආරක්ෂක යතුරක්/Biometric සමඟ උත්සාහ කරන්න" }, smsOtp: { descriptions: { diff --git a/modules/i18n/src/translations/ta-IN/portals/myaccount.ts b/modules/i18n/src/translations/ta-IN/portals/myaccount.ts index 9d4507ac4f9..b785bcd82eb 100644 --- a/modules/i18n/src/translations/ta-IN/portals/myaccount.ts +++ b/modules/i18n/src/translations/ta-IN/portals/myaccount.ts @@ -654,71 +654,79 @@ export const myAccount: MyAccountNS = { } }, fido: { - description: "FIDO கருவியினை இணைப்பதானூடாக உங்களை உறுதிப்படுத்திக் கொள்ளுங்கள்", + description: "உங்கள் கணக்கில் உள்நுழைய, உங்கள் சாதனத்தில் FIDO2 பாதுகாப்பு விசை அல்லது " + + "பயோமெட்ரிக்ஸைப் பயன்படுத்தலாம்.", form: { - label: "பாதுகாப்பு கருவி", - placeholder: "கருவியின் பெயரை உள்ளிடுக", - remove: "கருவியினை நீக்கு", - required: "உங்களின் பாதுகாப்பு கருவியின் பெயரை உள்ளிடுக" + label: "பாதுகாப்பு விசை/பயோமெட்ரிக்ஸ்", + placeholder: "பாதுகாப்பு விசை/பயோமெட்ரிக் பெயரை உள்ளிடவும்", + remove: "பாதுகாப்பு விசை/பயோமெட்ரிக்கை அகற்றவும்", + required: "உங்கள் பாதுகாப்பு விசை/பயோமெட்ரிக் பெயரை உள்ளிடவும்" }, - heading: "FIDO", + heading: "பாதுகாப்பு விசை/பயோமெட்ரிக்ஸ்", modals: { + deleteConfirmation: { + assertionHint: "உங்கள் செயலை உறுதிப்படுத்தவும்.", + content: "இந்தச் செயல் மீள முடியாதது மற்றும் பாதுகாப்பு " + + "விசை/பயோமெட்ரிக் நிரந்தரமாக நீக்கப்படும்.", + description: "இந்த பாதுகாப்பு விசை/பயோமெட்ரிக்கை " + + "நீக்கினால், உங்கள் கணக்கில் மீண்டும் உள்நுழைய " + + "முடியாமல் போகலாம். எச்சரிக்கையுடன் தொடரவும்.", + heading: "நீ சொல்வது உறுதியா?" + }, deviceRegistrationErrorModal: { - description: "அவர் சாதன பதிவு தடைப்பட்டது. இது வேண்டுமென்றே இல்லையென்றால், நீங்கள் அதே " + - "ஓட்டத்தை மீண்டும் முயற்சிக்கலாம் அல்லது பழைய பாதுகாப்பு விசையுடன் மீண்டும் முயற்சி " + - "செய்யலாம்.", - heading: "சாதன பதிவு தோல்வியுற்றது" + description: "பாதுகாப்பு விசை/பயோமெட்ரிக் பதிவு தடைபட்டது. இது வேண்டுமென்றே " + + "செய்யப்படவில்லை என்றால், நீங்கள் அதே ஓட்டத்தை " + + "மீண்டும் முயற்சிக்கலாம் அல்லது பழைய பாதுகாப்பு " + + "விசை/பயோமெட்ரிக் மூலம் மீண்டும் முயற்சிக்கலாம்.", + heading: "பாதுகாப்பு விசை/பயோமெட்ரிக் பதிவு தோல்வியடைந்தது" } }, notifications: { removeDevice: { error: { description: "{{description}}", - message: "சாதனத்தை அகற்றும்போது பிழை ஏற்பட்டது" + message: "பாதுகாப்பு விசை/பயோமெட்ரிக்கை அகற்றும்போது பிழை ஏற்பட்டது" }, genericError: { - description: "சாதனத்தை அகற்றும்போது பிழை ஏற்பட்டது", - message: "ஏதோ ஒரு தவறு ஏற்பட்டுவிட்டது" + description: "பாதுகாப்பு விசை/பயோமெட்ரிக்கை அகற்றும்போது பிழை ஏற்பட்டது", + message: "ஏதோ தவறு நடந்துவிட்டது" }, success: { - description: "சாதனம் பட்டியலிலிருந்து வெற்றிகரமாக அகற்றப்பட்டது", - message: "உங்கள் சாதனம் வெற்றிகரமாக அகற்றப்பட்டது" + description: "பட்டியலிலிருந்து பாதுகாப்பு விசை/பயோமெட்ரிக் வெற்றிகரமாக அகற்றப்பட்டது", + message: "உங்கள் பாதுகாப்புச் சாவி/பயோமெட்ரிக் வெற்றிகரமாக அகற்றப்பட்டது" } }, startFidoFlow: { error: { - description: "கருவிகளின் பட்டியலை பெறும் பொழுது தவறேற்பட்டுவிட்டது", - message: "ஏதோ ஒரு தவறு ஏற்பட்டுவிட்டது !!!" + description: "{{description}}", + message: "பாதுகாப்பு விசை/பயோமெட்ரிக்கை மீட்டெடுப்பதில் பிழை ஏற்பட்டது" }, genericError: { - description: "உங்களின் கருவியினை பதிவு செய்யும் பொழுது தவறேற்பட்டுவிட்டது.", - message: "ஏதோ ஒரு தவறு ஏற்பட்டுவிட்டது !!!" + description: "பாதுகாப்பு விசை/பயோமெட்ரிக்கை மீட்டெடுப்பதில் பிழை ஏற்பட்டது", + message: "ஏதோ தவறு நடந்துவிட்டது" }, success: { - description: - "உங்கள் கருவி வெற்றிகரமாக பதிவு செய்யப்பட்டுவிட்டது. " + - "இதனை, இனி, நீங்கள் உங்களது உறுதிப்பாட்டு காரணியாக பயன்படுத்திக் கொள்ளலாம்.", - message: "உங்கள் கருவி பதிவு செய்யப்பட்டுவிட்டது." + description: "பாதுகாப்பு விசை/பயோமெட்ரிக் வெற்றிகரமாக பதிவுசெய்யப்பட்டது, " + + "இப்போது நீங்கள் அங்கீகாரத்திற்காக அதைப் பயன்படுத்தலாம்.", + message: "உங்கள் பாதுகாப்புச் சாவி/பயோமெட்ரிக் பதிவுசெய்யப்பட்டது" } }, updateDeviceName: { error: { description: "{{description}}", - message: "பாதுகாப்பு கருவியின் பெயரைப் புதுப்பிக்கும்போது தவறு ஏற்பட்டுவிட்டது" + message: "பாதுகாப்பு விசை/பயோமெட்ரிக் பெயரைப் புதுப்பிக்கும்போது பிழை ஏற்பட்டது" }, genericError: { - description: "உங்களின் பாதுகாப்பு கருவியின் பெயரைப் புதுப்பிக்கும்போது தவறு " + - "ஏற்பட்டுவிட்டது", - message: "ஏதோ ஒரு தவறு ஏற்பட்டுவிட்டது !!!" + description: "பாதுகாப்பு விசை/பயோமெட்ரிக் பெயரைப் புதுப்பிக்கும்போது பிழை ஏற்பட்டது", + message: "ஏதோ தவறு நடந்துவிட்டது" }, success: { - description: - "உங்கள் பாதுகாப்பு கருவியின் பெயர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது.", - message: "பாதுகாப்பு கருவியின் பெயர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது." + description: "உங்கள் பாதுகாப்பு விசை/பயோமெட்ரிக் பெயர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது", + message: "பாதுகாப்புச் சாவி/பயோமெட்ரிக் பெயர் வெற்றிகரமாகப் புதுப்பிக்கப்பட்டது" } } }, - tryButton: "பழைய சாதனத்துடன் முயற்சிக்கவும்" + tryButton: "பழைய பாதுகாப்பு விசை/பயோமெட்ரிக் மூலம் முயற்சிக்கவும்" }, smsOtp: { descriptions: { From 021017a01effbcde36ea4a9a5f603f8ca3f13610 Mon Sep 17 00:00:00 2001 From: Thivi Date: Fri, 28 Jan 2022 11:44:41 +0530 Subject: [PATCH 02/82] Add loader bar styles --- .../definitions/apps/login-portal.less | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/modules/theme/src/theme-core/definitions/apps/login-portal.less b/modules/theme/src/theme-core/definitions/apps/login-portal.less index b8984a3aa80..7a3547d42e3 100644 --- a/modules/theme/src/theme-core/definitions/apps/login-portal.less +++ b/modules/theme/src/theme-core/definitions/apps/login-portal.less @@ -192,4 +192,38 @@ } } +/*----------------------------- + Loader Bar +------------------------------*/ +.loader-bar{ + width: calc(100% + 84px); + height: 0.2em; + background-color: fade(@primaryColor, 50%); + margin-top: -42px; + margin-left: -42px; + border-top-left-radius: 3px; + border-top-right-radius: 3px; + overflow: hidden; +} +.loader-bar::before { + width: 50%; + height: 0.2em; + background-color: @primaryColor; + content: ""; + display: block; + margin-left: -50%; + animation-duration: 1s; + animation-name: loader-bar-motion; + animation-iteration-count: infinite; + animation-timing-function: linear; +} +@keyframes loader-bar-motion { + from { + margin-left: -50%; + } + to { + margin-left: 100%; + } +} + .loadUIOverrides(); From b51d9de5ecd5389f4540d5233ad7326fe6076d3f Mon Sep 17 00:00:00 2001 From: Thivi Date: Fri, 28 Jan 2022 11:44:56 +0530 Subject: [PATCH 03/82] Fix button styling issue --- .../myaccount/src/components/shared/modal.tsx | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/myaccount/src/components/shared/modal.tsx b/apps/myaccount/src/components/shared/modal.tsx index 12619a5db59..3e55531c0fb 100644 --- a/apps/myaccount/src/components/shared/modal.tsx +++ b/apps/myaccount/src/components/shared/modal.tsx @@ -17,7 +17,8 @@ */ import { TestableComponentInterface } from "@wso2is/core/models"; -import React, { MouseEvent } from "react"; +import { PrimaryButton } from "@wso2is/react-components"; +import React, { MouseEvent, ReactElement } from "react"; import { Button, Icon, Modal, ModalProps } from "semantic-ui-react"; /** @@ -32,7 +33,7 @@ interface ModalComponentProps extends ModalProps, TestableComponentInterface { onSecondaryActionClick?: (e: MouseEvent) => void; } -export const ModalComponent = (props: ModalComponentProps) => { +export const ModalComponent = (props: ModalComponentProps): ReactElement => { const { children, @@ -127,12 +128,12 @@ export const ModalComponent = (props: ModalComponentProps) => { ); } else { return ( - + ); } }; @@ -162,12 +163,11 @@ export const ModalComponent = (props: ModalComponentProps) => { > { secondaryAction } - + ); From a245f285e3b8629ea927debc9ad07b3f58f1559c Mon Sep 17 00:00:00 2001 From: Thivi Date: Fri, 28 Jan 2022 11:45:03 +0530 Subject: [PATCH 04/82] Add delete confirmation modal --- .../authenticators/fido-authenticator.tsx | 85 +++++++++++++++---- 1 file changed, 67 insertions(+), 18 deletions(-) diff --git a/apps/myaccount/src/components/multi-factor-authentication/authenticators/fido-authenticator.tsx b/apps/myaccount/src/components/multi-factor-authentication/authenticators/fido-authenticator.tsx index ac6f0444b43..568aa0e5c81 100644 --- a/apps/myaccount/src/components/multi-factor-authentication/authenticators/fido-authenticator.tsx +++ b/apps/myaccount/src/components/multi-factor-authentication/authenticators/fido-authenticator.tsx @@ -18,9 +18,9 @@ import { TestableComponentInterface } from "@wso2is/core/models"; import { Field, Forms } from "@wso2is/forms"; -import { GenericIcon } from "@wso2is/react-components"; +import { ConfirmationModal, GenericIcon } from "@wso2is/react-components"; import isEmpty from "lodash-es/isEmpty"; -import React, { useEffect, useState } from "react"; +import React, { ReactElement, useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { useDispatch, useSelector } from "react-redux"; import { Button, Form, Grid, Icon, List, ModalContent, Popup } from "semantic-ui-react"; @@ -61,13 +61,14 @@ export const FIDOAuthenticator: React.FunctionComponent const { onAlertFired, ["data-testid"]: testId } = props; const { t } = useTranslation(); - const [deviceList, setDeviceList] = useState([]); - const [isDeviceErrorModalVisible, setDeviceErrorModalVisibility] = useState(false); - const [isDeviceSuccessModalVisible, setIsDeviceSuccessModalVisibility] = useState(false); - const [recentFIDOName, setRecentFIDOName] = useState(""); - const [recentFIDONameError, setRecentFIDONameError] = useState(false); - const [recentlyAddedDevice, setRecentlyAddedDevice] = useState(); - const [editFIDO, setEditFido] = useState>(); + const [ deviceList, setDeviceList ] = useState([]); + const [ isDeviceErrorModalVisible, setDeviceErrorModalVisibility ] = useState(false); + const [ isDeviceSuccessModalVisible, setIsDeviceSuccessModalVisibility ] = useState(false); + const [ recentFIDOName, setRecentFIDOName ] = useState(""); + const [ recentFIDONameError, setRecentFIDONameError ] = useState(false); + const [ recentlyAddedDevice, setRecentlyAddedDevice ] = useState(); + const [ editFIDO, setEditFido ] = useState>(); + const [ deleteKey, setDeleteKey ] = useState(""); const activeForm: string = useSelector((state: AppState) => state.global.activeForm); const dispatch = useDispatch(); @@ -89,11 +90,12 @@ export const FIDOAuthenticator: React.FunctionComponent const getFidoMetaData = () => { let devices: FIDODevice[] = []; + getMetaData() .then((response) => { if (response.status === 200) { if (response.data.length > 0) { - devices = [...response.data]; + devices = [ ...response.data ]; } setDeviceList(devices); } @@ -114,7 +116,7 @@ export const FIDOAuthenticator: React.FunctionComponent if (!isEmpty(recentlyAddedDevice)) { getFidoMetaData(); } - }, [recentlyAddedDevice]); + }, [ recentlyAddedDevice ]); /** * This function fires a notification on successful removal of a device. @@ -218,6 +220,7 @@ export const FIDOAuthenticator: React.FunctionComponent */ const cancelEdit = (id: string) => { const tempEditFido: Map = new Map(editFIDO); + tempEditFido.set(id, false); setEditFido(tempEditFido); dispatch(setActiveForm(null)); @@ -228,6 +231,7 @@ export const FIDOAuthenticator: React.FunctionComponent .then(() => { cancelEdit(id); getFidoMetaData(); + setDeleteKey(""); fireDeletionSuccessNotification(); }).catch((error) => { fireDeletionFailureNotification(error); @@ -290,11 +294,52 @@ export const FIDOAuthenticator: React.FunctionComponent */ const showEdit = (id: string) => { const tempEditFido: Map = new Map(editFIDO); + tempEditFido.set(id, true); setEditFido(tempEditFido); dispatch(setActiveForm(CommonConstants.SECURITY + FIDO + id)); }; + /** + * This methods generates and returns the delete confirmation modal. + * + * @returns {ReactElement} Generates the delete confirmation modal. + */ + const generateDeleteConfirmationModal = (): ReactElement => ( + setDeleteKey("") } + type="negative" + open={ Boolean(deleteKey) } + assertionHint={ t("console:manage.features.user.deleteUser.confirmationModal." + + "assertionHint") } + assertionType="checkbox" + primaryAction={ t("common:confirm") } + secondaryAction={ t("common:cancel") } + onSecondaryActionClick={ (): void => { + setDeleteKey(""); + } } + onPrimaryActionClick={ (): void => removeDevice(deleteKey) } + closeOnDimmerClick={ false } + > + + { t("myaccount:components:mfa:fido:modals:deleteConfirmation:heading") } + + + { t("myaccount:components:mfa:fido:modals:deleteConfirmation:description") } + + + { + t("myaccount:components:mfa:fido:modals:deleteConfirmation:content") + } + + + ); + /** * Device registration error modal. * @@ -426,8 +471,9 @@ export const FIDOAuthenticator: React.FunctionComponent editFIDO?.get(device.credential.credentialId) && activeForm?.startsWith(CommonConstants.SECURITY+FIDO) ? ( - + @@ -501,8 +547,10 @@ export const FIDOAuthenticator: React.FunctionComponent ) : ( - + @@ -550,7 +598,7 @@ export const FIDOAuthenticator: React.FunctionComponent className="list-icon" onClick={ () => { - removeDevice( + setDeleteKey( device.credential .credentialId ); @@ -578,14 +626,15 @@ export const FIDOAuthenticator: React.FunctionComponent floated="left" name="info circle" /> - You don't have any devices registered yet. -

+ You don't have any security key/biometric registered yet. +

) } <>{ deviceErrorModal() } <>{ deviceRegistrationSuccessModal() } + { deleteKey && generateDeleteConfirmationModal() } ); }; From ca4acf625f58fce112ec820f683b90b5ebce2e10 Mon Sep 17 00:00:00 2001 From: Thivi Date: Fri, 28 Jan 2022 11:45:16 +0530 Subject: [PATCH 05/82] Update styling of fido2 auth page --- .../src/main/webapp/fido2-auth.jsp | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/apps/authentication-portal/src/main/webapp/fido2-auth.jsp b/apps/authentication-portal/src/main/webapp/fido2-auth.jsp index 4d2bf3598ee..4a35f7266b9 100644 --- a/apps/authentication-portal/src/main/webapp/fido2-auth.jsp +++ b/apps/authentication-portal/src/main/webapp/fido2-auth.jsp @@ -49,8 +49,7 @@ <% } %>
-
- +
<% File productTitleFile = new File(getServletContext().getRealPath("extensions/product-title.jsp")); @@ -61,16 +60,24 @@ <% } %> -
+
+
+

<%=AuthenticationEndpointUtil.i18n(resourceBundle, "verification")%>

- - <%=AuthenticationEndpointUtil.i18n(resourceBundle, "touch.your.u2f.device")%> - +
+
+
+ +
+
+ <%=AuthenticationEndpointUtil.i18n(resourceBundle, "touch.your.u2f.device")%> +
+
+ -
From e40800ab5f19dfeed0eed8478f289ac68d18211f Mon Sep 17 00:00:00 2001 From: Thivi Date: Fri, 28 Jan 2022 11:45:23 +0530 Subject: [PATCH 06/82] Update texts --- .../authentication/endpoint/i18n/Resources.properties | 4 ++-- .../endpoint/i18n/Resources_fr_FR.properties | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties index e9685378f25..b348a22e581 100644 --- a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties +++ b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties @@ -82,8 +82,8 @@ domain=Domain submit=Submit inc=Inc all.rights.reserved=All rights reserved -verification=Verification -touch.your.u2f.device=Touch your FIDO device to Proceed +verification=Authenticate using your Security Key/Biometrics +touch.your.u2f.device=Follow the instructions given by your browser to authenticate yourself using a FIDO2 security key or biometrics in your device. authentication.error=Authentication Error! something.went.wrong.during.authentication=Something went wrong during the authentication process. Please try signing in again. misconfiguration.error=Misconfiguration Error! diff --git a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties index 7c4acba9410..44d5db6ae5d 100644 --- a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties +++ b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties @@ -82,8 +82,8 @@ domain=Domaine submit=Soumettre inc=Inc all.rights.reserved=Tous droits réservés -verification=Vérification -touch.your.u2f.device=Touchez votre appareil FIDO pour continuer +verification=Authentifiez-vous à l'aide de votre clé de sécurité/données biométriques +touch.your.u2f.device=Suivez les instructions données par votre navigateur pour vous authentifier à l'aide d'une clé de sécurité FIDO2 ou de la biométrie de votre appareil. authentication.error=Erreur d'authentification ! something.went.wrong.during.authentication=Quelque chose s'est mal passé pendant le processus d'authentification. Veuillez essayer de vous connecter à nouveau. misconfiguration.error=Erreur de configuration ! @@ -224,5 +224,5 @@ callback.not.match=Le rappel enregistré ne correspond pas à l'URL fournie. invalid.redirect.uri=L'URI de redirection n'est pas présent dans la demande d'autorisation. authentication.attempt.failed=La tentative d'authentification a échoué. authorization.failed=L'autorisation à échouée. -provided.username.already.exists=Erreur d'authentification ! Le nom d'utilisateur fourni existe dj. -error.user.existence=Erreur lors de la vrification des dtails de l'utilisateur. +provided.username.already.exists=Erreur d'authentification ! Le nom d'utilisateur fourni existe d�j�. +error.user.existence=Erreur lors de la v�rification des d�tails de l'utilisateur. From 6b64955c345542d8fe5fd7eb93f58e4898de3c2f Mon Sep 17 00:00:00 2001 From: Thivi Date: Fri, 28 Jan 2022 12:15:52 +0530 Subject: [PATCH 07/82] Create usernameless authentication template --- .../templates/usernameless-login-sequence.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 apps/console/src/features/applications/components/settings/sign-on-methods/templates/usernameless-login-sequence.json diff --git a/apps/console/src/features/applications/components/settings/sign-on-methods/templates/usernameless-login-sequence.json b/apps/console/src/features/applications/components/settings/sign-on-methods/templates/usernameless-login-sequence.json new file mode 100644 index 00000000000..8655517245e --- /dev/null +++ b/apps/console/src/features/applications/components/settings/sign-on-methods/templates/usernameless-login-sequence.json @@ -0,0 +1,17 @@ +{ + "steps": [ + { + "id": 1, + "options": [ + { + "authenticator": "BasicAuthenticator", + "idp": "LOCAL" + }, + { + "authenticator": "FIDOAuthenticator", + "idp": "LOCAL" + } + ] + } + ] +} From bd7dfaaf7dcfdba78371f5ad56e4f4a5ceb951c9 Mon Sep 17 00:00:00 2001 From: Thivi Date: Fri, 28 Jan 2022 12:16:01 +0530 Subject: [PATCH 08/82] Add usernameless to model --- apps/console/src/features/applications/models/application.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/console/src/features/applications/models/application.ts b/apps/console/src/features/applications/models/application.ts index bb5d86dce6f..a9393c8d019 100644 --- a/apps/console/src/features/applications/models/application.ts +++ b/apps/console/src/features/applications/models/application.ts @@ -678,6 +678,7 @@ export enum LoginFlowTypes { GOOGLE_LOGIN = "GOOGLE_LOGIN", GITHUB_LOGIN = "GITHUB_LOGIN", SECOND_FACTOR_TOTP = "SECOND_FACTOR_TOTP", + USERNAMELESS_LOGIN = "USERNAMELESS_LOGIN", DEFAULT = "DEFAULT" } From 1016a4889fe95f43198d734f3b36348446c3a810 Mon Sep 17 00:00:00 2001 From: Thivi Date: Fri, 28 Jan 2022 12:17:21 +0530 Subject: [PATCH 09/82] Add usernameless to sign-in template list --- .../sign-in-method-landing.tsx | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/apps/console/src/features/applications/components/settings/sign-on-methods/sign-in-method-landing.tsx b/apps/console/src/features/applications/components/settings/sign-on-methods/sign-in-method-landing.tsx index 1dbeaa2fa2e..30cef25fe83 100644 --- a/apps/console/src/features/applications/components/settings/sign-on-methods/sign-in-method-landing.tsx +++ b/apps/console/src/features/applications/components/settings/sign-on-methods/sign-in-method-landing.tsx @@ -90,7 +90,7 @@ export const SignInMethodLanding: FunctionComponent
@@ -112,6 +113,9 @@ + + + +
diff --git a/apps/console/src/public/WEB-INF/web.xml b/apps/console/src/public/WEB-INF/web.xml index 57068fb6613..72f019cf20b 100644 --- a/apps/console/src/public/WEB-INF/web.xml +++ b/apps/console/src/public/WEB-INF/web.xml @@ -41,11 +41,6 @@ auth /auth.jsp - - - home - /home.jsp - default @@ -72,11 +67,6 @@ /auth - - home - /authenticate - - default /deployment.config.json diff --git a/apps/console/webpack.config.js b/apps/console/webpack.config.js index 58709933a8b..9afabfb01b8 100755 --- a/apps/console/webpack.config.js +++ b/apps/console/webpack.config.js @@ -460,7 +460,7 @@ module.exports = (env) => { authorizationCode: "<%=request.getParameter(\"code\")%>", contentType: "<%@ page language=\"java\" contentType=\"text/html; charset=UTF-8\" " + "pageEncoding=\"UTF-8\" %>", - filename: path.join(distFolder, "home.jsp"), + filename: path.join(distFolder, "index.jsp"), hash: true, // eslint-disable-next-line max-len hotjarSystemVariable: "<% String hotjar_track_code_system_var = System.getenv().getOrDefault(\"hotjar_tracking_code\", null); %>", @@ -490,7 +490,7 @@ module.exports = (env) => { superTenantConstant: !isDeployedOnExternalServer ? "<%=SUPER_TENANT_DOMAIN_NAME%>" : "", - template: path.join(__dirname, "src", "home.jsp"), + template: path.join(__dirname, "src", "index.jsp"), tenantDelimiter: !isDeployedOnExternalServer ? "\"/\"+'<%=TENANT_AWARE_URL_PREFIX%>'+\"/\"" : "", diff --git a/apps/myaccount/src/index.jsp b/apps/myaccount/src/index.jsp index d9918b73a17..1a0f80272c7 100644 --- a/apps/myaccount/src/index.jsp +++ b/apps/myaccount/src/index.jsp @@ -50,6 +50,10 @@ return serverOrigin + path; } + + + + return serverOrigin; } @@ -77,5 +81,11 @@ auth.signIn(); } + + + +
diff --git a/apps/myaccount/src/public/WEB-INF/web.xml b/apps/myaccount/src/public/WEB-INF/web.xml index 68da3314b3c..80c53b0a53c 100644 --- a/apps/myaccount/src/public/WEB-INF/web.xml +++ b/apps/myaccount/src/public/WEB-INF/web.xml @@ -41,11 +41,6 @@ auth /auth.jsp - - - home - /home.jsp - default @@ -72,11 +67,6 @@ /auth - - home - /authenticate - - default /deployment.config.json diff --git a/apps/myaccount/webpack.config.js b/apps/myaccount/webpack.config.js index cd12da819cf..dce7dbb82cd 100644 --- a/apps/myaccount/webpack.config.js +++ b/apps/myaccount/webpack.config.js @@ -429,7 +429,7 @@ module.exports = (env) => { authorizationCode: "<%=request.getParameter(\"code\")%>", contentType: "<%@ page language=\"java\" contentType=\"text/html; charset=UTF-8\" " + "pageEncoding=\"UTF-8\" %>", - filename: path.join(distFolder, "home.jsp"), + filename: path.join(distFolder, "index.jsp"), hash: true, importSuperTenantConstant: !isDeployedOnExternalServer ? "<%@ page import=\"static org.wso2.carbon.utils.multitenancy." + @@ -454,7 +454,7 @@ module.exports = (env) => { superTenantConstant: !isDeployedOnExternalServer ? "<%=SUPER_TENANT_DOMAIN_NAME%>" : "", - template: path.join(__dirname, "src", "home.jsp"), + template: path.join(__dirname, "src", "index.jsp"), tenantDelimiter: !isDeployedOnExternalServer ? "\"/\"+'<%=TENANT_AWARE_URL_PREFIX%>'+\"/\"" : "", From 6addfbcb2acc81ee510810ed4b3e644521d37440 Mon Sep 17 00:00:00 2001 From: Thivi Date: Thu, 3 Feb 2022 15:22:54 +0530 Subject: [PATCH 32/82] Make divider class generic --- modules/theme/src/themes/default/elements/divider.overrides | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/theme/src/themes/default/elements/divider.overrides b/modules/theme/src/themes/default/elements/divider.overrides index cfd89330d6e..5d74a4c7c5d 100644 --- a/modules/theme/src/themes/default/elements/divider.overrides +++ b/modules/theme/src/themes/default/elements/divider.overrides @@ -12,7 +12,7 @@ margin-bottom: @dividerCompactMargin; } - &.fido-list-divider { + &.list-divider { margin: 0 2rem 0 5rem; } } From c3a665b4b1abb6bb1eb1f30cada5cca6ff827b62 Mon Sep 17 00:00:00 2001 From: Thivi Date: Thu, 3 Feb 2022 15:23:03 +0530 Subject: [PATCH 33/82] Limit retries --- .../authenticators/fido-authenticator.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/myaccount/src/components/multi-factor-authentication/authenticators/fido-authenticator.tsx b/apps/myaccount/src/components/multi-factor-authentication/authenticators/fido-authenticator.tsx index daa6ece6d32..500d9023be2 100644 --- a/apps/myaccount/src/components/multi-factor-authentication/authenticators/fido-authenticator.tsx +++ b/apps/myaccount/src/components/multi-factor-authentication/authenticators/fido-authenticator.tsx @@ -81,6 +81,7 @@ export const FIDOAuthenticator: React.FunctionComponent const [ fidoFlowStartResponse, setFidoFlowStartResponse ] = useState(null); const tryOlderDevice = useRef(false); + const retryAttempt = useRef(0); const activeForm: string = useSelector((state: AppState) => state.global.activeForm); const dispatch = useDispatch(); @@ -196,7 +197,7 @@ export const FIDOAuthenticator: React.FunctionComponent setIsDeviceSuccessModalVisibility(true); }) .catch(() => { - if (tryOlderDevice.current) { + if (tryOlderDevice.current || retryAttempt.current > 1) { fireFailureNotification(); } else { setDeviceErrorModalVisibility(true); @@ -387,6 +388,7 @@ export const FIDOAuthenticator: React.FunctionComponent secondaryAction={ t("common:cancel") } onSecondaryActionClick={ handleDeviceErrorModalClose } onPrimaryActionClick={ () => { + retryAttempt.current++; talkToDevice(); } } open={ isDeviceErrorModalVisible } @@ -643,7 +645,7 @@ export const FIDOAuthenticator: React.FunctionComponent - { deviceList.length !== index + 1 && } + { deviceList.length !== index + 1 && } ) ) } From ad4c36566514a97387d96abb2ec79be3d35ee0d3 Mon Sep 17 00:00:00 2001 From: Thivi Date: Mon, 7 Feb 2022 19:44:10 +0530 Subject: [PATCH 34/82] Replace fido icon with fingerprint icon --- apps/console/src/features/identity-providers/configs/ui.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/console/src/features/identity-providers/configs/ui.ts b/apps/console/src/features/identity-providers/configs/ui.ts index ed4cb8fc28d..0a0b4086940 100644 --- a/apps/console/src/features/identity-providers/configs/ui.ts +++ b/apps/console/src/features/identity-providers/configs/ui.ts @@ -17,7 +17,6 @@ */ import BasicAuthIcon from "../../../themes/default/assets/images/authenticators/basic-auth.png"; -import FIDOLogo from "../../../themes/default/assets/images/authenticators/fido.png"; import SMSOTPIcon from "../../../themes/default/assets/images/authenticators/sms-otp.svg"; import SalesforceLogo from "../../../themes/default/assets/images/connectors/salesforce.png"; import SCIMLogo from "../../../themes/default/assets/images/connectors/scim.png"; @@ -26,6 +25,7 @@ import CertificateColoredIcon from "../../../themes/default/assets/images/icons/ import ClockColoredIcon from "../../../themes/default/assets/images/icons/clock-colored-icon.svg"; import ConnectionIcon from "../../../themes/default/assets/images/icons/connection.svg"; import { ReactComponent as DocumentIcon } from "../../../themes/default/assets/images/icons/document-icon.svg"; +import FIDOLogo from "../../../themes/default/assets/images/icons/fingerprint.svg"; import { ReactComponent as GearsIcon } from "../../../themes/default/assets/images/icons/gears-icon.svg"; import MagnifierColoredIcon from "../../../themes/default/assets/images/icons/magnifier-colored-icon.svg"; import { ReactComponent as OpenBookIcon } from "../../../themes/default/assets/images/icons/open-book-icon.svg"; From e4ea8f1f978452d245273b14dc1a6cf5cf05e82d Mon Sep 17 00:00:00 2001 From: Thivi Date: Mon, 7 Feb 2022 19:44:23 +0530 Subject: [PATCH 35/82] Add usernameless tag to fido --- .../identity-providers/pages/identity-providers.tsx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apps/console/src/features/identity-providers/pages/identity-providers.tsx b/apps/console/src/features/identity-providers/pages/identity-providers.tsx index 167ab39eb01..2495f685cf8 100644 --- a/apps/console/src/features/identity-providers/pages/identity-providers.tsx +++ b/apps/console/src/features/identity-providers/pages/identity-providers.tsx @@ -36,6 +36,7 @@ import { AuthenticatorExtensionsConfigInterface, identityProviderConfig } from " import { AdvancedSearchWithBasicFilters, AppConstants, EventPublisher, UIConstants, history } from "../../core"; import { getAuthenticatorTags, getAuthenticators, getIdentityProviderList } from "../api"; import { AuthenticatorGrid, IdentityProviderList, handleGetIDPListCallError } from "../components"; +import { IdentityProviderManagementConstants } from "../constants"; import { AuthenticatorMeta } from "../meta"; import { AuthenticatorInterface, @@ -298,6 +299,14 @@ const IdentityProvidersPage: FunctionComponent = ( ]; } + const fido = response?.identityProviders + ?.find(idp => idp?.id + === IdentityProviderManagementConstants.FIDO_AUTHENTICATOR_ID) as AuthenticatorInterface; + + if (fido) { + fido.tags = [ ...fido.tags, "Usernameless" ]; + } + setIdPList(response); }) .catch((error) => { From cef69317fba1a7a850d6ce023dae6bacdf9fed74 Mon Sep 17 00:00:00 2001 From: Thivi Date: Mon, 7 Feb 2022 19:44:32 +0530 Subject: [PATCH 36/82] Modify fido name and description --- .../features/identity-providers/meta/authenticator-meta.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/console/src/features/identity-providers/meta/authenticator-meta.ts b/apps/console/src/features/identity-providers/meta/authenticator-meta.ts index 2389cc80214..3ec389d7dcc 100644 --- a/apps/console/src/features/identity-providers/meta/authenticator-meta.ts +++ b/apps/console/src/features/identity-providers/meta/authenticator-meta.ts @@ -46,7 +46,7 @@ export class AuthenticatorMeta { "credentials.", [ IdentityProviderManagementConstants.IDENTIFIER_FIRST_AUTHENTICATOR_ID ]: "Get users Identity first to " + "control the authentication flow.", - [ IdentityProviderManagementConstants.FIDO_AUTHENTICATOR_ID ]: "Provide secure and fast passwordless " + + [ IdentityProviderManagementConstants.FIDO_AUTHENTICATOR_ID ]: "Provide secure and fast usernameless " + "login experience.", [ IdentityProviderManagementConstants.TOTP_AUTHENTICATOR_ID ]: "Two-factor authentication using " + "Time-Based One Time passcode.", @@ -150,7 +150,7 @@ export class AuthenticatorMeta { return get({ [ IdentityProviderManagementConstants.BASIC_AUTHENTICATOR ]: "Username & Password", [ IdentityProviderManagementConstants.BASIC_AUTHENTICATOR_ID ]: "Username & Password", - [ IdentityProviderManagementConstants.FIDO_AUTHENTICATOR_ID ]: "FIDO", + [ IdentityProviderManagementConstants.FIDO_AUTHENTICATOR_ID ]: "Security Key/Biometrics", [ IdentityProviderManagementConstants.TOTP_AUTHENTICATOR_ID ]: "TOTP", [ IdentityProviderManagementConstants.EMAIL_OTP_AUTHENTICATOR_ID ]: "Email OTP", [ IdentityProviderManagementConstants.IDENTIFIER_FIRST_AUTHENTICATOR_ID ]: "Identifier First", From 3163a87b210c47e9c5d263c56c989079e66b6889 Mon Sep 17 00:00:00 2001 From: Thivi Date: Mon, 7 Feb 2022 19:45:30 +0530 Subject: [PATCH 37/82] Update fido description --- .../src/features/identity-providers/meta/authenticator-meta.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/console/src/features/identity-providers/meta/authenticator-meta.ts b/apps/console/src/features/identity-providers/meta/authenticator-meta.ts index 3ec389d7dcc..2c07e35c969 100644 --- a/apps/console/src/features/identity-providers/meta/authenticator-meta.ts +++ b/apps/console/src/features/identity-providers/meta/authenticator-meta.ts @@ -47,7 +47,7 @@ export class AuthenticatorMeta { [ IdentityProviderManagementConstants.IDENTIFIER_FIRST_AUTHENTICATOR_ID ]: "Get users Identity first to " + "control the authentication flow.", [ IdentityProviderManagementConstants.FIDO_AUTHENTICATOR_ID ]: "Provide secure and fast usernameless " + - "login experience.", + "login experience using FIDO2.", [ IdentityProviderManagementConstants.TOTP_AUTHENTICATOR_ID ]: "Two-factor authentication using " + "Time-Based One Time passcode.", [ IdentityProviderManagementConstants.GOOGLE_OIDC_AUTHENTICATOR_ID ]: "Login users with " + From f3ad123a862b4663ab78ed631b69dd633c465d7b Mon Sep 17 00:00:00 2001 From: Thivi Date: Mon, 7 Feb 2022 20:25:37 +0530 Subject: [PATCH 38/82] Implement a retry mechanism for Safari --- .../src/main/webapp/fido2-auth.jsp | 39 +++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/apps/authentication-portal/src/main/webapp/fido2-auth.jsp b/apps/authentication-portal/src/main/webapp/fido2-auth.jsp index 8651a6a55dd..aa9f9058126 100644 --- a/apps/authentication-portal/src/main/webapp/fido2-auth.jsp +++ b/apps/authentication-portal/src/main/webapp/fido2-auth.jsp @@ -73,8 +73,21 @@
- <%=AuthenticationEndpointUtil.i18n(resourceBundle, "touch.your.u2f.device")%> +

+ <%=AuthenticationEndpointUtil.i18n(resourceBundle, "touch.your.u2f.device")%> +

+
+ +
+ +
@@ -83,7 +96,6 @@ - @@ -114,7 +126,28 @@ From 51c4dce36aeb3376fe09bc508a7bad0f9382e7f8 Mon Sep 17 00:00:00 2001 From: Thivi Date: Thu, 10 Feb 2022 20:08:19 +0530 Subject: [PATCH 50/82] Localize texts --- .../authentication/endpoint/i18n/Resources.properties | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties index 760112499d9..4557e7fd617 100644 --- a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties +++ b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties @@ -232,5 +232,12 @@ authorization.failed=Authorization Failed. provided.username.already.exists=Authentication error! Provided username already exists. error.user.existence=Error while checking the user details. -fido.failed.retry=Proceed fido.failed.instruction=Click on proceed and follow the instructions given by your browser to authenticate yourself using a security key or biometrics in your device. +fido.error=Authenticating using your security key/biometrics failed +fido.registration.info=You should have a registered security key or biometrics to sign in. If not, register your security keys/biometrics in the My Account app. +fido.learn.more.part.one=Learn more about this in our +fido.learn.more.documentation=documentation +fido.learn.more.part.two=or contact us at +fido.retry=Retry +fido.proceed=Proceed +fido.cancel=Cancel From 9e87d63bb0be61df6e452d9bbeb67a9b3c133464 Mon Sep 17 00:00:00 2001 From: Thivi Date: Thu, 10 Feb 2022 20:09:40 +0530 Subject: [PATCH 51/82] Translate texts to French --- .../endpoint/i18n/Resources_fr_FR.properties | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties index 5cfcf08b273..197eaaf1ad4 100644 --- a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties +++ b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties @@ -227,5 +227,12 @@ authorization.failed=L'autorisation à échouée. provided.username.already.exists=Erreur d'authentification ! Le nom d'utilisateur fourni existe d�j�. error.user.existence=Erreur lors de la v�rification des d�tails de l'utilisateur. -fido.failed.retry=Procéder fido.failed.instruction=Cliquez sur continuer et suivez les instructions données par votre navigateur pour vous authentifier à l'aide d'une clé de sécurité ou de données biométriques dans votre appareil. +fido.error=Échec de l'authentification à l'aide de votre clé de sécurité/données biométriques +fido.registration.info=Vous devez avoir une clé de sécurité ou des données biométriques enregistrées pour vous connecter. Si ce n'est pas le cas, enregistrez vos clés de sécurité/données biométriques dans l'application Mon compte. +fido.learn.more.part.one=Apprenez-en plus à ce sujet dans notre +fido.learn.more.documentation=documentation +fido.learn.more.part.two=ou contactez-nous au +fido.retry=Retenter +fido.proceed=Procéder +fido.cancel=Annuler From a383fcc015a37b0cfe3c5bbbef956763697bf8da Mon Sep 17 00:00:00 2001 From: Thivi Date: Fri, 11 Feb 2022 10:24:46 +0530 Subject: [PATCH 52/82] Remove email address from on prem --- .../authentication/endpoint/i18n/Resources.properties | 2 +- .../authentication/endpoint/i18n/Resources_fr_FR.properties | 2 +- apps/authentication-portal/src/main/webapp/fido2-auth.jsp | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties index 4557e7fd617..d9afa83d969 100644 --- a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties +++ b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties @@ -237,7 +237,7 @@ fido.error=Authenticating using your security key/biometrics failed fido.registration.info=You should have a registered security key or biometrics to sign in. If not, register your security keys/biometrics in the My Account app. fido.learn.more.part.one=Learn more about this in our fido.learn.more.documentation=documentation -fido.learn.more.part.two=or contact us at +fido.learn.more.part.two=or contact your administrator fido.retry=Retry fido.proceed=Proceed fido.cancel=Cancel diff --git a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties index 197eaaf1ad4..1de8d079954 100644 --- a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties +++ b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties @@ -232,7 +232,7 @@ fido.error=Échec de l'authentification à l'aide de votre clé de sécurité/do fido.registration.info=Vous devez avoir une clé de sécurité ou des données biométriques enregistrées pour vous connecter. Si ce n'est pas le cas, enregistrez vos clés de sécurité/données biométriques dans l'application Mon compte. fido.learn.more.part.one=Apprenez-en plus à ce sujet dans notre fido.learn.more.documentation=documentation -fido.learn.more.part.two=ou contactez-nous au +fido.learn.more.part.two=ou contactez votre administrateur fido.retry=Retenter fido.proceed=Procéder fido.cancel=Annuler diff --git a/apps/authentication-portal/src/main/webapp/fido2-auth.jsp b/apps/authentication-portal/src/main/webapp/fido2-auth.jsp index 4f1aff62631..281d6c7351c 100644 --- a/apps/authentication-portal/src/main/webapp/fido2-auth.jsp +++ b/apps/authentication-portal/src/main/webapp/fido2-auth.jsp @@ -106,8 +106,7 @@ <%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.learn.more.part.two" )%> - - asgardeo-help@wso2.com. + .

From a1d84f078b6e80b5fbd940188f5e8c26338a2db8 Mon Sep 17 00:00:00 2001 From: Thivi Date: Fri, 11 Feb 2022 11:57:59 +0530 Subject: [PATCH 53/82] Add branding email --- .../endpoint/i18n/Resources.properties | 1 + .../endpoint/i18n/Resources_fr_FR.properties | 1 + .../extensions/branding-preferences.jsp | 21 +++++++++++++++++++ .../src/main/webapp/fido2-auth.jsp | 18 +++++++++++++--- 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 apps/authentication-portal/src/main/webapp/extensions/branding-preferences.jsp diff --git a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties index d9afa83d969..40e351b7df3 100644 --- a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties +++ b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties @@ -238,6 +238,7 @@ fido.registration.info=You should have a registered security key or biometrics t fido.learn.more.part.one=Learn more about this in our fido.learn.more.documentation=documentation fido.learn.more.part.two=or contact your administrator +fido.learn.more.part.two.email=or contact us at fido.retry=Retry fido.proceed=Proceed fido.cancel=Cancel diff --git a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties index 1de8d079954..004698915ae 100644 --- a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties +++ b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties @@ -233,6 +233,7 @@ fido.registration.info=Vous devez avoir une clé de sécurité ou des données b fido.learn.more.part.one=Apprenez-en plus à ce sujet dans notre fido.learn.more.documentation=documentation fido.learn.more.part.two=ou contactez votre administrateur +fido.learn.more.part.two.email=ou contactez-nous au fido.retry=Retenter fido.proceed=Procéder fido.cancel=Annuler diff --git a/apps/authentication-portal/src/main/webapp/extensions/branding-preferences.jsp b/apps/authentication-portal/src/main/webapp/extensions/branding-preferences.jsp new file mode 100644 index 00000000000..0feac4874f5 --- /dev/null +++ b/apps/authentication-portal/src/main/webapp/extensions/branding-preferences.jsp @@ -0,0 +1,21 @@ +<%-- + ~ Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com) All Rights Reserved. + ~ + ~ WSO2 Inc. licenses this file to you under the Apache License, + ~ Version 2.0 (the "License"); you may not use this file except + ~ in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. +--%> + +<% + String supportEmail = ""; +%> diff --git a/apps/authentication-portal/src/main/webapp/fido2-auth.jsp b/apps/authentication-portal/src/main/webapp/fido2-auth.jsp index 281d6c7351c..7ee8dbf0c58 100644 --- a/apps/authentication-portal/src/main/webapp/fido2-auth.jsp +++ b/apps/authentication-portal/src/main/webapp/fido2-auth.jsp @@ -18,6 +18,8 @@ <%@ page import="org.owasp.encoder.Encode" %> <%@ page import="java.io.File" %> +<%@ page import="org.apache.commons.text.StringEscapeUtils" %> + <%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@include file="includes/localize.jsp" %> @@ -27,6 +29,9 @@ String authRequest = request.getParameter("data"); %> + + + @@ -104,9 +109,16 @@ <%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.learn.more.documentation" )%> - - <%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.learn.more.part.two" )%> - . + <% if (supportEmail == null || supportEmail.isEmpty()) { %> + + <%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.learn.more.part.two" )%> + + <% } else { %> + + <%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.learn.more.part.two.email" )%> + + <%=StringEscapeUtils.escapeHtml4(supportEmail)%>. + <% } %>

From ada18ffe6e1a24ad8e23faaadba90927b853a35e Mon Sep 17 00:00:00 2001 From: Thivi Date: Mon, 14 Feb 2022 11:28:42 +0530 Subject: [PATCH 54/82] Change fido logo --- .../src/main/webapp/login.jsp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/authentication-portal/src/main/webapp/login.jsp b/apps/authentication-portal/src/main/webapp/login.jsp index 3f195a9a640..4e78c4f1a52 100644 --- a/apps/authentication-portal/src/main/webapp/login.jsp +++ b/apps/authentication-portal/src/main/webapp/login.jsp @@ -88,7 +88,7 @@ localAuthenticatorNames = Arrays.asList(authList.split(",")); } } - + String multiOptionURIParam = ""; if (localAuthenticatorNames.size() > 1 || idpAuthenticatorMapping != null && idpAuthenticatorMapping.size() > 1) { String baseURL; @@ -100,7 +100,7 @@ request.getRequestDispatcher("error.do").forward(request, response); return; } - + String queryParamString = request.getQueryString() != null ? ("?" + request.getQueryString()) : ""; multiOptionURIParam = "&multiOptionURI=" + Encode.forUriComponent(baseURL + queryParamString); } @@ -156,7 +156,7 @@ // We need to send the tenant domain as a query param only in non tenant qualified URL mode. loginContextRequestUrl += "&tenantDomain=" + Encode.forUriComponent(tenantDomain); } - + String t = request.getParameter("t"); String ut = request.getParameter("ut"); if (StringUtils.isNotBlank(t)) { @@ -372,14 +372,17 @@ if (localAuthenticatorNames.contains(FIDO_AUTHENTICATOR)) { %>
-
<% From a3c8a79c930c2b380e76a9e25b49e0ee777c5274 Mon Sep 17 00:00:00 2001 From: Thivi Date: Mon, 14 Feb 2022 11:29:24 +0530 Subject: [PATCH 55/82] Add fido localization --- .../authentication/endpoint/i18n/Resources.properties | 1 + .../authentication/endpoint/i18n/Resources_fr_FR.properties | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties index 40e351b7df3..eecd497a311 100644 --- a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties +++ b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties @@ -242,3 +242,4 @@ fido.learn.more.part.two.email=or contact us at fido.retry=Retry fido.proceed=Proceed fido.cancel=Cancel +fido.authenticator=Sign in with Security Key diff --git a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties index 004698915ae..8937d256f0d 100644 --- a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties +++ b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties @@ -237,3 +237,4 @@ fido.learn.more.part.two.email=ou contactez-nous au fido.retry=Retenter fido.proceed=Procéder fido.cancel=Annuler +fido.authenticator=Connectez-vous avec la clé de sécurité From fd3c6665e4906ce6b6cf18f98d1044e088dc775d Mon Sep 17 00:00:00 2001 From: Thivi Date: Mon, 14 Feb 2022 18:20:24 +0530 Subject: [PATCH 56/82] Update fingerprint icon --- .../assets/images/icons/fingerprint.svg | 64 +++++++------------ 1 file changed, 24 insertions(+), 40 deletions(-) diff --git a/modules/theme/src/themes/default/assets/images/icons/fingerprint.svg b/modules/theme/src/themes/default/assets/images/icons/fingerprint.svg index 3de792f4198..c641bae8c2e 100644 --- a/modules/theme/src/themes/default/assets/images/icons/fingerprint.svg +++ b/modules/theme/src/themes/default/assets/images/icons/fingerprint.svg @@ -1,41 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + From 6f51de65c77afae7757e7206c82cea2665c4169a Mon Sep 17 00:00:00 2001 From: Thivi Date: Mon, 14 Feb 2022 18:21:21 +0530 Subject: [PATCH 57/82] Remove usernameless tag --- .../features/identity-providers/pages/identity-providers.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/apps/console/src/features/identity-providers/pages/identity-providers.tsx b/apps/console/src/features/identity-providers/pages/identity-providers.tsx index 2495f685cf8..844a239cec7 100644 --- a/apps/console/src/features/identity-providers/pages/identity-providers.tsx +++ b/apps/console/src/features/identity-providers/pages/identity-providers.tsx @@ -303,10 +303,6 @@ const IdentityProvidersPage: FunctionComponent = ( ?.find(idp => idp?.id === IdentityProviderManagementConstants.FIDO_AUTHENTICATOR_ID) as AuthenticatorInterface; - if (fido) { - fido.tags = [ ...fido.tags, "Usernameless" ]; - } - setIdPList(response); }) .catch((error) => { From 7afee429aba1b657a089f1f2529fbc252d92ca8d Mon Sep 17 00:00:00 2001 From: Thivi Date: Mon, 14 Feb 2022 18:21:32 +0530 Subject: [PATCH 58/82] Replace authentication with login --- .../settings/sign-on-methods/sign-in-method-customization.tsx | 2 +- modules/i18n/src/translations/en-US/portals/console.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/console/src/features/applications/components/settings/sign-on-methods/sign-in-method-customization.tsx b/apps/console/src/features/applications/components/settings/sign-on-methods/sign-in-method-customization.tsx index bb420963418..14ce4f6a37a 100644 --- a/apps/console/src/features/applications/components/settings/sign-on-methods/sign-in-method-customization.tsx +++ b/apps/console/src/features/applications/components/settings/sign-on-methods/sign-in-method-customization.tsx @@ -603,7 +603,7 @@ export const SignInMethodCustomization: FunctionComponent - To sign in with passwordless authentication, your users + To sign in with passwordless login, your users should have their FIDO2 security keys or biometrics registered via My Account. Learn more about this in our { window[ "AppUtils" ].getConfig().docSiteUrl diff --git a/modules/i18n/src/translations/en-US/portals/console.ts b/modules/i18n/src/translations/en-US/portals/console.ts index a0173bf8242..ef13762ddc7 100644 --- a/modules/i18n/src/translations/en-US/portals/console.ts +++ b/modules/i18n/src/translations/en-US/portals/console.ts @@ -1117,7 +1117,7 @@ export const console: ConsoleNS = { description: "Enable users to log in using a FIDO2 security key " + "or biometrics.", heading: "Add passwordless login", - info: "To sign in with passwordless authentication, your users " + + info: "To sign in with passwordless login, your users " + "should have their FIDO2 security keys or biometrics " + "registered via My Account. Learn more about " + "this in our <1>documentation." From 0f8db067e8d1ac9d640d6b59b48a704289e97449 Mon Sep 17 00:00:00 2001 From: Thivi Date: Mon, 14 Feb 2022 18:22:27 +0530 Subject: [PATCH 59/82] Remove usernameless tag --- .../src/features/identity-providers/meta/authenticator-meta.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/console/src/features/identity-providers/meta/authenticator-meta.ts b/apps/console/src/features/identity-providers/meta/authenticator-meta.ts index c1211aa38d7..40c65b11702 100644 --- a/apps/console/src/features/identity-providers/meta/authenticator-meta.ts +++ b/apps/console/src/features/identity-providers/meta/authenticator-meta.ts @@ -81,7 +81,6 @@ export class AuthenticatorMeta { return get({ [ IdentityProviderManagementConstants.IDENTIFIER_FIRST_AUTHENTICATOR_ID ]: [ AuthenticatorLabels.HANDLERS ], [ IdentityProviderManagementConstants.FIDO_AUTHENTICATOR_ID ]: [ - AuthenticatorLabels.USERNAMELESS, AuthenticatorLabels.SECOND_FACTOR, AuthenticatorLabels.PASSWORDLESS, AuthenticatorLabels.MULTI_FACTOR From 6eced2f857b15399df3bafa159c44b3e12021a28 Mon Sep 17 00:00:00 2001 From: Thivi Date: Mon, 14 Feb 2022 22:08:53 +0530 Subject: [PATCH 60/82] Update doc link --- .../settings/sign-on-methods/sign-in-method-customization.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/console/src/features/applications/components/settings/sign-on-methods/sign-in-method-customization.tsx b/apps/console/src/features/applications/components/settings/sign-on-methods/sign-in-method-customization.tsx index 14ce4f6a37a..b483f03878d 100644 --- a/apps/console/src/features/applications/components/settings/sign-on-methods/sign-in-method-customization.tsx +++ b/apps/console/src/features/applications/components/settings/sign-on-methods/sign-in-method-customization.tsx @@ -608,7 +608,8 @@ export const SignInMethodCustomization: FunctionComponentdocumentation) From 1364f1a0e008ae55e462cf929e3443302760b615 Mon Sep 17 00:00:00 2001 From: Thivi Date: Mon, 14 Feb 2022 22:09:05 +0530 Subject: [PATCH 61/82] Update button text --- .../authentication/endpoint/i18n/Resources.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties index eecd497a311..6d89ec61e12 100644 --- a/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties +++ b/apps/authentication-portal/src/main/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties @@ -233,7 +233,7 @@ provided.username.already.exists=Authentication error! Provided username already error.user.existence=Error while checking the user details. fido.failed.instruction=Click on proceed and follow the instructions given by your browser to authenticate yourself using a security key or biometrics in your device. -fido.error=Authenticating using your security key/biometrics failed +fido.error=Authenticating using your Security Key/Biometrics failed fido.registration.info=You should have a registered security key or biometrics to sign in. If not, register your security keys/biometrics in the My Account app. fido.learn.more.part.one=Learn more about this in our fido.learn.more.documentation=documentation @@ -242,4 +242,4 @@ fido.learn.more.part.two.email=or contact us at fido.retry=Retry fido.proceed=Proceed fido.cancel=Cancel -fido.authenticator=Sign in with Security Key +fido.authenticator=Security Key From 88cb1daf2f6cff268b1bd309898d1b6403dd9264 Mon Sep 17 00:00:00 2001 From: Thivi Date: Mon, 14 Feb 2022 22:09:22 +0530 Subject: [PATCH 62/82] Improve button text --- apps/authentication-portal/src/main/webapp/login.jsp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/authentication-portal/src/main/webapp/login.jsp b/apps/authentication-portal/src/main/webapp/login.jsp index 4e78c4f1a52..df00a24fad6 100644 --- a/apps/authentication-portal/src/main/webapp/login.jsp +++ b/apps/authentication-portal/src/main/webapp/login.jsp @@ -377,10 +377,12 @@ '<%=Encode.forJavaScriptAttribute(Encode.forUriComponent(idpEntry.getKey()))%>', 'FIDOAuthenticator')" id="icon-<%=iconId%>" - title="<%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with")%> Security key"> + title="<%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with")%>  + <%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with" )%>"> Fido Logo + <%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with" )%>  <%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.authenticator" )%> From 4ae8466ce1f2e6c530898ecaa57be539f257e416 Mon Sep 17 00:00:00 2001 From: Thivi Date: Mon, 14 Feb 2022 22:09:34 +0530 Subject: [PATCH 63/82] Filter fido tags --- .../features/identity-providers/pages/identity-providers.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/console/src/features/identity-providers/pages/identity-providers.tsx b/apps/console/src/features/identity-providers/pages/identity-providers.tsx index 844a239cec7..2319b6cfead 100644 --- a/apps/console/src/features/identity-providers/pages/identity-providers.tsx +++ b/apps/console/src/features/identity-providers/pages/identity-providers.tsx @@ -303,6 +303,10 @@ const IdentityProvidersPage: FunctionComponent = ( ?.find(idp => idp?.id === IdentityProviderManagementConstants.FIDO_AUTHENTICATOR_ID) as AuthenticatorInterface; + if (fido) { + fido.tags = [ ...identityProviderConfig.filterFidoTags(fido?.tags) ]; + } + setIdPList(response); }) .catch((error) => { From e1ed083685e5601c97544e6dd235271b8cfe3c29 Mon Sep 17 00:00:00 2001 From: Thivi Date: Tue, 15 Feb 2022 02:11:10 +0530 Subject: [PATCH 64/82] Filter fido tags --- .../src/extensions/configs/identity-provider.tsx | 10 +++++++++- .../extensions/configs/models/identity-providers.ts | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/console/src/extensions/configs/identity-provider.tsx b/apps/console/src/extensions/configs/identity-provider.tsx index 8185180a45b..bbc4a6c0f2f 100644 --- a/apps/console/src/extensions/configs/identity-provider.tsx +++ b/apps/console/src/extensions/configs/identity-provider.tsx @@ -17,7 +17,7 @@ */ import { IdentityProviderConfig } from "./models"; -import { IdentityProviderManagementConstants } from "../../features/identity-providers"; +import { AuthenticatorLabels, IdentityProviderManagementConstants } from "../../features/identity-providers"; export const identityProviderConfig: IdentityProviderConfig = { authenticatorResponseExtension: [], @@ -54,6 +54,14 @@ export const identityProviderConfig: IdentityProviderConfig = { oidc: true, saml: true }, + fidoTags: [ + AuthenticatorLabels.SECOND_FACTOR, + AuthenticatorLabels.PASSWORDLESS, + AuthenticatorLabels.MULTI_FACTOR + ], + filterFidoTags:(tags: string[]): string[] => { + return tags; + }, // Handles backward compatibility with the legacy IDP view & new connections view. // TODO: Remove this usage once https://github.com/wso2/product-is/issues/12052 is addressed. useNewConnectionsView: false, diff --git a/apps/console/src/extensions/configs/models/identity-providers.ts b/apps/console/src/extensions/configs/models/identity-providers.ts index 2a0737d2893..8e47a0e2122 100644 --- a/apps/console/src/extensions/configs/models/identity-providers.ts +++ b/apps/console/src/extensions/configs/models/identity-providers.ts @@ -97,6 +97,8 @@ export interface IdentityProviderConfig { saml: boolean; oidc: boolean; } + fidoTags: string[]; + filterFidoTags: (tags: string[]) => string[]; } /** From af1fc04c28bce9a279c889fa6af3e82301703bca Mon Sep 17 00:00:00 2001 From: Thivi Date: Tue, 15 Feb 2022 02:11:35 +0530 Subject: [PATCH 65/82] Revert back to the fido flow screen when retry is clicked --- .../src/main/webapp/fido2-auth.jsp | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/apps/authentication-portal/src/main/webapp/fido2-auth.jsp b/apps/authentication-portal/src/main/webapp/fido2-auth.jsp index 7ee8dbf0c58..b410a2b4433 100644 --- a/apps/authentication-portal/src/main/webapp/fido2-auth.jsp +++ b/apps/authentication-portal/src/main/webapp/fido2-auth.jsp @@ -106,7 +106,7 @@ <%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.learn.more.part.one" )%> - + <%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.learn.more.documentation" )%> <% if (supportEmail == null || supportEmail.isEmpty()) { %> @@ -122,7 +122,7 @@

- From 8f1b6b774cb318664fa06584f959dcbe9884d2c7 Mon Sep 17 00:00:00 2001 From: Thivi Date: Tue, 15 Feb 2022 19:40:55 +0530 Subject: [PATCH 70/82] Improve fido error page --- .../src/main/webapp/fido2-auth.jsp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/apps/authentication-portal/src/main/webapp/fido2-auth.jsp b/apps/authentication-portal/src/main/webapp/fido2-auth.jsp index b410a2b4433..d068e4eb32c 100644 --- a/apps/authentication-portal/src/main/webapp/fido2-auth.jsp +++ b/apps/authentication-portal/src/main/webapp/fido2-auth.jsp @@ -76,7 +76,6 @@ <%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.error" )%> -
@@ -101,21 +100,12 @@

<%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.registration.info" )%> + My Account.

- - <%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.learn.more.part.one" )%> - - - <%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.learn.more.documentation" )%> - - <% if (supportEmail == null || supportEmail.isEmpty()) { %> + <% if (supportEmail != null && !supportEmail.isEmpty()) { %> - <%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.learn.more.part.two" )%> - - <% } else { %> - - <%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.learn.more.part.two.email" )%> + <%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.learn.more.part.one" )%> <%=StringEscapeUtils.escapeHtml4(supportEmail)%>. <% } %> @@ -170,6 +160,8 @@ + - - - -

diff --git a/apps/console/src/public/WEB-INF/web.xml b/apps/console/src/public/WEB-INF/web.xml index 72f019cf20b..57068fb6613 100644 --- a/apps/console/src/public/WEB-INF/web.xml +++ b/apps/console/src/public/WEB-INF/web.xml @@ -41,6 +41,11 @@ auth /auth.jsp + + + home + /home.jsp + default @@ -67,6 +72,11 @@ /auth + + home + /authenticate + + default /deployment.config.json diff --git a/apps/console/webpack.config.js b/apps/console/webpack.config.js index 9afabfb01b8..e3cdda0a9ef 100755 --- a/apps/console/webpack.config.js +++ b/apps/console/webpack.config.js @@ -452,6 +452,12 @@ module.exports = (env) => { force: true, from: "auth.jsp", to: "." + }, + !isDeployedOnStaticServer && { + context: path.join(__dirname, "src"), + force: true, + from: "index.jsp", + to: "." } ].filter(Boolean) }), @@ -460,7 +466,7 @@ module.exports = (env) => { authorizationCode: "<%=request.getParameter(\"code\")%>", contentType: "<%@ page language=\"java\" contentType=\"text/html; charset=UTF-8\" " + "pageEncoding=\"UTF-8\" %>", - filename: path.join(distFolder, "index.jsp"), + filename: path.join(distFolder, "home.jsp"), hash: true, // eslint-disable-next-line max-len hotjarSystemVariable: "<% String hotjar_track_code_system_var = System.getenv().getOrDefault(\"hotjar_tracking_code\", null); %>", @@ -490,7 +496,7 @@ module.exports = (env) => { superTenantConstant: !isDeployedOnExternalServer ? "<%=SUPER_TENANT_DOMAIN_NAME%>" : "", - template: path.join(__dirname, "src", "index.jsp"), + template: path.join(__dirname, "src", "home.jsp"), tenantDelimiter: !isDeployedOnExternalServer ? "\"/\"+'<%=TENANT_AWARE_URL_PREFIX%>'+\"/\"" : "", diff --git a/apps/myaccount/src/index.jsp b/apps/myaccount/src/index.jsp index 1a0f80272c7..ec5308dd307 100644 --- a/apps/myaccount/src/index.jsp +++ b/apps/myaccount/src/index.jsp @@ -43,9 +43,9 @@ : null; var authSessionState = "<%= htmlWebpackPlugin.options.sessionState %>" != "null" ? "<%= htmlWebpackPlugin.options.sessionState %>" - : null; - function getApiPath(path) { + var serverOrigin = "<%=serverUrl%>"; + if(path) { return serverOrigin + path; } @@ -81,11 +81,5 @@ auth.signIn(); } - - - -
diff --git a/apps/myaccount/src/public/WEB-INF/web.xml b/apps/myaccount/src/public/WEB-INF/web.xml index 80c53b0a53c..68da3314b3c 100644 --- a/apps/myaccount/src/public/WEB-INF/web.xml +++ b/apps/myaccount/src/public/WEB-INF/web.xml @@ -41,6 +41,11 @@ auth /auth.jsp + + + home + /home.jsp + default @@ -67,6 +72,11 @@ /auth + + home + /authenticate + + default /deployment.config.json diff --git a/apps/myaccount/webpack.config.js b/apps/myaccount/webpack.config.js index dce7dbb82cd..8b0b47d7281 100644 --- a/apps/myaccount/webpack.config.js +++ b/apps/myaccount/webpack.config.js @@ -421,6 +421,12 @@ module.exports = (env) => { force: true, from: "auth.jsp", to: "." + }, + !isDeployedOnStaticServer && { + context: path.join(__dirname, "src"), + force: true, + from: "index.jsp", + to: "." } ].filter(Boolean) }), @@ -429,7 +435,7 @@ module.exports = (env) => { authorizationCode: "<%=request.getParameter(\"code\")%>", contentType: "<%@ page language=\"java\" contentType=\"text/html; charset=UTF-8\" " + "pageEncoding=\"UTF-8\" %>", - filename: path.join(distFolder, "index.jsp"), + filename: path.join(distFolder, "home.jsp"), hash: true, importSuperTenantConstant: !isDeployedOnExternalServer ? "<%@ page import=\"static org.wso2.carbon.utils.multitenancy." + @@ -454,7 +460,7 @@ module.exports = (env) => { superTenantConstant: !isDeployedOnExternalServer ? "<%=SUPER_TENANT_DOMAIN_NAME%>" : "", - template: path.join(__dirname, "src", "index.jsp"), + template: path.join(__dirname, "src", "home.jsp"), tenantDelimiter: !isDeployedOnExternalServer ? "\"/\"+'<%=TENANT_AWARE_URL_PREFIX%>'+\"/\"" : "", From 692d98f421260f3b95740bef9a89b8ab947712db Mon Sep 17 00:00:00 2001 From: Thivi Date: Thu, 17 Feb 2022 11:21:03 +0530 Subject: [PATCH 79/82] Revert changes to index.jsp --- apps/console/src/index.jsp | 60 +++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/apps/console/src/index.jsp b/apps/console/src/index.jsp index 29659760156..8d03126dd78 100644 --- a/apps/console/src/index.jsp +++ b/apps/console/src/index.jsp @@ -23,16 +23,21 @@ - + From 01bf97246e3b16c78b3a423ca5d1875e25fbdaa8 Mon Sep 17 00:00:00 2001 From: Thivi Date: Thu, 17 Feb 2022 11:23:59 +0530 Subject: [PATCH 80/82] Revert changes to myaccount index.jsp --- apps/myaccount/src/index.jsp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/myaccount/src/index.jsp b/apps/myaccount/src/index.jsp index ec5308dd307..d9918b73a17 100644 --- a/apps/myaccount/src/index.jsp +++ b/apps/myaccount/src/index.jsp @@ -43,17 +43,13 @@ : null; var authSessionState = "<%= htmlWebpackPlugin.options.sessionState %>" != "null" ? "<%= htmlWebpackPlugin.options.sessionState %>" + : null; - var serverOrigin = "<%=serverUrl%>"; - + function getApiPath(path) { if(path) { return serverOrigin + path; } - - - - return serverOrigin; } From 3a34022fc1aa446ff6506b753779705810a3cfc4 Mon Sep 17 00:00:00 2001 From: Thivi Date: Thu, 17 Feb 2022 11:25:16 +0530 Subject: [PATCH 81/82] Revert changes to myaccount webpack config --- apps/myaccount/webpack.config.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/apps/myaccount/webpack.config.js b/apps/myaccount/webpack.config.js index 8b0b47d7281..cd12da819cf 100644 --- a/apps/myaccount/webpack.config.js +++ b/apps/myaccount/webpack.config.js @@ -421,12 +421,6 @@ module.exports = (env) => { force: true, from: "auth.jsp", to: "." - }, - !isDeployedOnStaticServer && { - context: path.join(__dirname, "src"), - force: true, - from: "index.jsp", - to: "." } ].filter(Boolean) }), From c85b8147fef54a451c123edb302ede7763ecdde7 Mon Sep 17 00:00:00 2001 From: Thivi Date: Thu, 17 Feb 2022 11:26:19 +0530 Subject: [PATCH 82/82] Revert changes to console webpack config --- apps/console/webpack.config.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/apps/console/webpack.config.js b/apps/console/webpack.config.js index e3cdda0a9ef..58709933a8b 100755 --- a/apps/console/webpack.config.js +++ b/apps/console/webpack.config.js @@ -452,12 +452,6 @@ module.exports = (env) => { force: true, from: "auth.jsp", to: "." - }, - !isDeployedOnStaticServer && { - context: path.join(__dirname, "src"), - force: true, - from: "index.jsp", - to: "." } ].filter(Boolean) }),