auth: add language and timezone check on signup

darakeon · Feb 18, 2024 · d93eb18 · d93eb18
1 parent c02a157
commit d93eb18
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 27 deletions.
diff --git a/core/BusinessLogic/Services/AuthService.cs b/core/BusinessLogic/Services/AuthService.cs
@@ -10,6 +10,8 @@
 using DFM.Entities.Bases;
 using Keon.Util.Extensions;
 using Error = DFM.BusinessLogic.Exceptions.Error;
+using DFM.Generic.Datetime;
+using DFM.Language;
 
 namespace DFM.BusinessLogic.Services
 {
@@ -24,6 +26,12 @@ public void SaveUser(SignUpInfo info)
 			{
 				info.VerifyPassword();
 
+				if (!PlainText.AcceptLanguage(info.Language))
+					throw Error.LanguageUnknown.Throw();
+
+				if (!TZ.IsValid(info.TimeZone))
+					throw Error.TimeZoneUnknown.Throw();
+
 				var user = info.GetEntity();
 				user.Control.MiscDna = Misc.RandomDNA();
 

diff --git a/core/Entities/Bases/Defaults.cs b/core/Entities/Bases/Defaults.cs
@@ -6,7 +6,7 @@ namespace DFM.Entities.Bases
 	public static class Defaults
 	{
 		public const String SettingsLanguage = "pt-BR";
-		public const String SettingsTimeZone = "E. South America Standard Time";
+		public const String SettingsTimeZone = "UTC-03:00";
 
 		public const Boolean SettingsUseCategories = false;
 		public const Boolean SettingsUseAccountsSigns = false;

diff --git a/core/Tests/BusinessLogic/A.Auth/a.SaveUser.feature b/core/Tests/BusinessLogic/A.Auth/a.SaveUser.feature
@@ -2,24 +2,24 @@
 
 Scenario: Aa01. Save user with empty e-mail
 	Given I have this user data
-			| Email | Password | Retype Password |
-			|       | password | password        |
+			| Email | Password | Retype Password | Language | Timezone  |
+			|       | password | password        | pt-BR    | UTC-03:00 |
 	When I try to save the user
 	Then I will receive this core error: UserEmailRequired
 		And the user will not be saved
 
 Scenario: Aa02. Save user with empty password
 	Given I have this user data
-			| Email                           | Password | Retype Password |
-			| {scenarioCode}@dontflymoney.com |          |                 |
+			| Email                           | Password | Retype Password | Language | Timezone  |
+			| {scenarioCode}@dontflymoney.com |          |                 | pt-BR    | UTC-03:00 |
 	When I try to save the user
 	Then I will receive this core error: UserPasswordRequired
 		And the user will not be saved
 
 Scenario: Aa03. Save user with invalid e-mail
 	Given I have this user data
-			| Email          | Password | Retype Password |
-			| {scenarioCode} | password | password        |
+			| Email          | Password | Retype Password | Language | Timezone  |
+			| {scenarioCode} | password | password        | pt-BR    | UTC-03:00 |
 	When I try to save the user
 	Then I will receive this core error: UserEmailInvalid
 		And the user will not be saved
@@ -29,74 +29,90 @@ Scenario: Aa04. Save user with repeated e-mail
 			| Email                           | Password |
 			| {scenarioCode}@dontflymoney.com | password |
 		And I have this user data
-			| Email                           | Password | Retype Password |
-			| {scenarioCode}@dontflymoney.com | password | password        |
+			| Email                           | Password | Retype Password | Language | Timezone  |
+			| {scenarioCode}@dontflymoney.com | password | password        | pt-BR    | UTC-03:00 |
 	When I try to save the user
 	Then I will receive this core error: UserAlreadyExists
 		And the user will not be changed
 
 Scenario: Aa05. Save user wrong retype
 	Given I have this user data
-			| Email                           | Password | Retype Password |
-			| {scenarioCode}@dontflymoney.com | password | password_wrong  |
+			| Email                           | Password | Retype Password | Language | Timezone  |
+			| {scenarioCode}@dontflymoney.com | password | password_wrong  | pt-BR    | UTC-03:00 |
 	When I try to save the user
 	Then I will receive this core error: RetypeWrong
 		And the user will not be saved
 
 Scenario: Aa06. Save user with info all right
 	Given I have this user data
-			| Email                           | Password | Retype Password |
-			| {scenarioCode}@dontflymoney.com | password | password        |
+			| Email                           | Password | Retype Password | Language | Timezone  |
+			| {scenarioCode}@dontflymoney.com | password | password        | pt-BR    | UTC-03:00 |
 	When I try to save the user
 	Then I will receive no core error
 		And the user will be saved
 		And it will have a misc
 
 Scenario: Aa07. Save user without e-mail
 	Given I have this user data
-			| Password | Retype Password |
-			| password | password        |
+			| Password | Retype Password | Language | Timezone  |
+			| password | password        | pt-BR    | UTC-03:00 |
 	When I try to save the user
 	Then I will receive this core error: UserEmailRequired
 		And the user will not be saved
 
 Scenario: Aa08. Save user without password
 	Given I have this user data
-			| Email                           | Retype Password |
-			| {scenarioCode}@dontflymoney.com | password        |
+			| Email                           | Retype Password | Language | Timezone  |
+			| {scenarioCode}@dontflymoney.com | password        | pt-BR    | UTC-03:00 |
 	When I try to save the user
 	Then I will receive this core error: UserPasswordRequired
 		And the user will not be saved
 
 Scenario: Aa09. Save user without retype password
 	Given I have this user data
-			| Email                           | Password |
-			| {scenarioCode}@dontflymoney.com | password |
+			| Email                           | Password | Language | Timezone  |
+			| {scenarioCode}@dontflymoney.com | password | pt-BR    | UTC-03:00 |
 	When I try to save the user
 	Then I will receive this core error: RetypeWrong
 		And the user will not be saved
 
 Scenario: Aa10. Too large e-mail username (65)
 	Given I have this user data
-			| Password | Retype Password | Email                                                                              |
-			| password | password        | ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLM@dontflymoney.com |
+			| Password | Retype Password | Email                                                                              | Language | Timezone  |
+			| password | password        | ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLM@dontflymoney.com | pt-BR    | UTC-03:00 |
 	When I try to save the user
 	Then I will receive this core error: TooLargeUserEmail
 		And the user will not be saved
 
 Scenario: Aa11. Too large e-mail domain (256)
 	Given I have this user data
-			| Password | Retype Password | Email                                                                                                                                                                                                                                                                                       |
-			| password | password        | ABCDEFGHIJKLMNOPQRSTUVWXYZ@dontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.com |
+			| Password | Retype Password | Email                                                                                                                                                                                                                                                                                       | Language | Timezone  |
+			| password | password        | ABCDEFGHIJKLMNOPQRSTUVWXYZ@dontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.com | pt-BR    | UTC-03:00 |
 	When I try to save the user
 	Then I will receive this core error: TooLargeUserEmail
 		And the user will not be saved
 
 Scenario: Aa12. Exactly length username (64) and domain (255)
 	Given I have this user data
-			| Password | Retype Password | Email                                                                                                                                                                                            |
-			| password | password        | ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKL@dontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.co |
+			| Password | Retype Password | Email                                                                                                                                                                                            | Language | Timezone  |
+			| password | password        | ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKL@dontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.comdontflymoney.co | pt-BR    | UTC-03:00 |
 	When I try to save the user
 	Then I will receive no core error
 		And the user will be saved
 		And it will have a misc
+
+Scenario: Aa13. Save user with invalid language
+	Given I have this user data
+			| Email                           | Password | Retype Password | Language | Timezone  |
+			| {scenarioCode}@dontflymoney.com | P        | P               | at-ST    | UTC-03:00 |
+	When I try to save the user
+	Then I will receive this core error: LanguageUnknown
+		And the user will not be saved
+
+Scenario: Aa14. Save user with invalid timezone
+	Given I have this user data
+			| Email                           | Password | Retype Password | Language | Timezone |
+			| {scenarioCode}@dontflymoney.com | P        | P               | pt-BR    | GMT-03   |
+	When I try to save the user
+	Then I will receive this core error: TimeZoneUnknown
+		And the user will not be saved
diff --git a/core/Tests/BusinessLogic/Steps/BaseStep.cs b/core/Tests/BusinessLogic/Steps/BaseStep.cs
@@ -147,7 +147,7 @@ protected void createUserIfNotExists(
 				Email = email,
 				Password = password,
 				RetypePassword = password,
-				Language = Defaults.SettingsLanguage,
+				Language = language ?? Defaults.SettingsLanguage
 			};
 
 			if (timezone != null)
@@ -158,6 +158,10 @@ protected void createUserIfNotExists(
 
 				info.TimeZone = $"UTC{userHour:+00;-00; 00}:00";
 			}
+			else
+			{
+				info.TimeZone = Defaults.SettingsTimeZone;
+			}
 
 			if (language != null)
 			{

diff --git a/core/Tests/BusinessLogic/Steps/_A.SafeStep.cs b/core/Tests/BusinessLogic/Steps/_A.SafeStep.cs
@@ -61,6 +61,18 @@ private String currentPassword
 			set => set("CurrentPassword", value);
 		}
 
+		private String language
+		{
+			get => get<String>("Language");
+			set => set("Language", value);
+		}
+
+		private String timezone
+		{
+			get => get<String>("Timezone");
+			set => set("Timezone", value);
+		}
+
 		private SecurityAction action
 		{
 			get => get<SecurityAction>("Action");
@@ -112,6 +124,12 @@ public void GivenIHaveThisUserData(Table table)
 
 			if (table.Header.Any(c => c == "Retype Password"))
 				retypePassword = table.Rows[0]["Retype Password"];
+
+			if (table.Header.Any(c => c == "Language"))
+				language = table.Rows[0]["Language"];
+
+			if (table.Header.Any(c => c == "Timezone"))
+				timezone = table.Rows[0]["Timezone"];
 		}
 
 		[When(@"I try to save the user")]
@@ -124,7 +142,8 @@ public void WhenITryToSaveTheUser()
 					Email = email,
 					Password = password,
 					RetypePassword = retypePassword,
-					Language = Defaults.SettingsLanguage,
+					Language = language,
+					TimeZone = timezone,
 				};
 
 				service.Auth.SaveUser(info);