[FIX] Login process issues (#261)

ilyalehchylin · Jun 24, 2024 · 02c31ba · 02c31ba
2 parents 82d3be2 + 98b2224
commit 02c31ba
Show file tree

Hide file tree

Showing 25 changed files with 205 additions and 294 deletions.
diff --git a/source/EduCATS.UnitTests/Data/AppUserDataTests.cs b/source/EduCATS.UnitTests/Data/AppUserDataTests.cs
@@ -44,7 +44,7 @@ public void SetUp()
 		[Test]
 		public void SetLoginDataTest()
 		{
-			AppUserData.SetLoginData(_mocked, _userId, _username, _username);
+			AppUserData.SetLoginData(_mocked, _userId, _username);
 			Assert.AreEqual(_userId, AppUserData.UserId);
 			Assert.AreEqual(_username, AppUserData.Username);
 		}

diff --git a/source/EduCATS.UnitTests/Data/DataAccessTests.cs b/source/EduCATS.UnitTests/Data/DataAccessTests.cs
@@ -140,24 +140,24 @@ public void GetKeyTest()
 		[Test]
 		public void SetErrorMessageNullTest()
 		{
-			DataAccess.SetError(null, true);
+			DataAccess.SetError(null, true, false);
 			Assert.AreEqual(false, DataAccess.IsError);
 			Assert.AreEqual(false, DataAccess.IsConnectionError);
 
-			DataAccess.SetError(null, false);
+			DataAccess.SetError(null, false, false);
 			Assert.AreEqual(false, DataAccess.IsConnectionError);
 		}
 
 		[Test]
 		public void SetErrorTest()
 		{
 			var message = "Error message";
-			DataAccess.SetError(message, true);
+			DataAccess.SetError(message, true, false);
 			Assert.AreEqual(message, DataAccess.ErrorMessage);
 			Assert.AreEqual(true, DataAccess.IsError);
 			Assert.AreEqual(true, DataAccess.IsConnectionError);
 
-			DataAccess.SetError(message, false);
+			DataAccess.SetError(message, false, false);
 			Assert.AreEqual(false, DataAccess.IsConnectionError);
 		}
 

diff --git a/source/EduCATS.UnitTests/Registration/RegistrationTests.cs b/source/EduCATS.UnitTests/Registration/RegistrationTests.cs
@@ -1,46 +1,46 @@
-using System;
-using System.Reflection;
-using System.Threading.Tasks;
-using EduCATS.Constants;
-using EduCATS.Data.Models;
-using EduCATS.Helpers.Forms;
-using EduCATS.Helpers.Forms.Dialogs;
-using EduCATS.Helpers.Forms.Pages;
-using EduCATS.Helpers.Forms.Settings;
-using EduCATS.Networking;
-using EduCATS.Networking.AppServices;
-using EduCATS.Pages.ForgotPassword.ViewModels;
-using EduCATS.Pages.Login.ViewModels;
-using EduCATS.Pages.Login.Views;
-using EduCATS.Pages.Registration.ViewModels;
-using Moq;
-using NUnit.Framework;
-using Nyxbull.Plugins.CrossLocalization;
+//using System;
+//using System.Reflection;
+//using System.Threading.Tasks;
+//using EduCATS.Constants;
+//using EduCATS.Data.Models;
+//using EduCATS.Helpers.Forms;
+//using EduCATS.Helpers.Forms.Dialogs;
+//using EduCATS.Helpers.Forms.Pages;
+//using EduCATS.Helpers.Forms.Settings;
+//using EduCATS.Networking;
+//using EduCATS.Networking.AppServices;
+//using EduCATS.Pages.ForgotPassword.ViewModels;
+//using EduCATS.Pages.Login.ViewModels;
+//using EduCATS.Pages.Login.Views;
+//using EduCATS.Pages.Registration.ViewModels;
+//using Moq;
+//using NUnit.Framework;
+//using Nyxbull.Plugins.CrossLocalization;
 
-namespace EduCATS.UnitTests
-{
-	[TestFixture]
-	public class RegistrationTests
-	{
-		[TestCase("TestLecturer5", "TestLecturer5")]
-		[Test]
-		public async Task RefreshToken_Test(string username, string password)
-		{
-			try
-			{
-				var mockedServices = Mock.Of<IPlatformServices>();
-				mockedServices.Preferences = Mock.Of<IPreferences>();
-				mockedServices.Preferences.Server = Servers.EduCatsAddress;
-				var mockedLoginPageView = new Mock<LoginPageViewModel>(mockedServices).Object;
-				mockedLoginPageView.Username = username;
-				mockedLoginPageView.Password = password;
-				var actual = await mockedLoginPageView.RefreshToken();
-				Assert.IsNotEmpty(actual);
-			}
-			catch (Exception ex)
-			{
-				Assert.Fail(ex.Message);
-			}
-		}
-	}
-}
+//namespace EduCATS.UnitTests
+//{
+//	[TestFixture]
+//	public class RegistrationTests
+//	{
+//		[TestCase("TestLecturer5", "TestLecturer5")]
+//		[Test]
+//		public async Task RefreshToken_Test(string username, string password)
+//		{
+//			try
+//			{
+//				var mockedServices = Mock.Of<IPlatformServices>();
+//				mockedServices.Preferences = Mock.Of<IPreferences>();
+//				mockedServices.Preferences.Server = Servers.EduCatsAddress;
+//				var mockedLoginPageView = new Mock<LoginPageViewModel>(mockedServices).Object;
+//				mockedLoginPageView.Username = username;
+//				mockedLoginPageView.Password = password;
+//				var actual = await mockedLoginPageView.RefreshToken();
+//				Assert.IsNotEmpty(actual);
+//			}
+//			catch (Exception ex)
+//			{
+//				Assert.Fail(ex.Message);
+//			}
+//		}
+//	}
+//}
diff --git a/source/EduCATS/App.cs b/source/EduCATS/App.cs
@@ -69,14 +69,13 @@ async Task getProfileInfo()
 				}
 
 				var username = _services.Preferences.UserLogin;
-				var password = _services.Preferences.UserPassword;
 
 				if (string.IsNullOrEmpty(username)) {
 					return;
 				}
 
-				var profile = await DataAccess.GetProfileInfo(username, password);
-				AppUserData.SetLoginData(_services, _services.Preferences.UserId, username, password);
+				var profile = await DataAccess.GetProfileInfo(username);
+				AppUserData.SetLoginData(_services, _services.Preferences.UserId, username);
 				AppUserData.SetProfileData(_services, profile);
 				_services.Preferences.GroupName = profile?.GroupName;
 				_services.Preferences.Avatar = profile?.Avatar;

diff --git a/source/EduCATS/Data/DataAccess.cs b/source/EduCATS/Data/DataAccess.cs
@@ -6,6 +6,7 @@
 using EduCATS.Data.Models.Calendar;
 using EduCATS.Data.Models.User;
 using EduCATS.Networking;
+using EduCATS.Networking.Models.Login;
 using EduCATS.Networking.Models.SaveMarks;
 using EduCATS.Networking.Models.SaveMarks.Labs;
 using EduCATS.Networking.Models.SaveMarks.LabSchedule;
@@ -22,7 +23,6 @@ namespace EduCATS.Data
 	/// </summary>
 	public static partial class DataAccess
 	{
-		public static string Password { get; private set; }
 		public static string Username { get; private set; }
 
 		/// <summary>
@@ -37,12 +37,18 @@ public async static Task<UserModel> Login(string username, string password)
 			return await GetDataObject(dataAccess, false) as UserModel;
 		}
 
-		public async static Task<SecondUserModel> LoginTest(string username, string password)
+		public async static Task<SecondUserModel> GetAccountData()
 		{
-			var dataAccess = new DataAccess<SecondUserModel>("login_error", loginCallbackEducatsby(username, password));
+			var dataAccess = new DataAccess<SecondUserModel>("login_error", getAccountDataCallback());
 			return await GetDataObject(dataAccess, false) as SecondUserModel;
 		}
 
+		public async static Task<TokenModel> GetToken(string username, string password)
+		{
+			var dataAccess = new DataAccess<TokenModel>("login_error", getTokenCallback(username, password));
+			return await GetDataObject(dataAccess, false) as TokenModel;
+		}
+
 		public async static Task<DeleteAccountModel> DeleteAccount()
 		{
 			var dataAccess = new DataAccess<DeleteAccountModel>(
@@ -56,9 +62,8 @@ public async static Task<DeleteAccountModel> DeleteAccount()
 		/// <param name="username">Username.</param>
 		/// <param name="password">Password.</param>
 		/// <returns>User profile data.</returns>
-		public async static Task<UserProfileModel> GetProfileInfo(string username, string password = "")
+		public async static Task<UserProfileModel> GetProfileInfo(string username)
 		{
-			Password = password;
 			Username = username;
 			var dataAccess = new DataAccess<UserProfileModel>(
 				"login_user_profile_error", getProfileCallback(username), GlobalConsts.DataProfileKey);

diff --git a/source/EduCATS/Data/DataAccessCallbacks.cs b/source/EduCATS/Data/DataAccessCallbacks.cs
@@ -15,8 +15,10 @@ public static partial class DataAccess
 		static async Task<object> loginCallback(
 			string username, string password) => await AppServices.Login(username, password);
 
-		static async Task<object> loginCallbackEducatsby(
-			string username, string password) => await AppServices.LoginEducatsBy(username, password);
+		static async Task<object> getAccountDataCallback() => await AppServices.GetAccountData();
+
+		static async Task<object> getTokenCallback(
+			string username, string password) => await AppServices.GetToken(username, password);
 
 		static async Task<object> getLecturesCallbackTest(
 			int subjectId, int groupId) => await AppServices.GetLecturesEducatsBy(subjectId, groupId);

diff --git a/source/EduCATS/Data/DataAccessHelper.cs b/source/EduCATS/Data/DataAccessHelper.cs
@@ -51,6 +51,11 @@ public partial class DataAccess<T> : IDataAccess<T> where T : new()
 		/// </summary>
 		public bool IsConnectionError { get; set; }
 
+		/// <summary>
+		/// Is session expired issue.
+		/// </summary>
+		public bool IsSessionExpiredError { get; set; }
+
 		/// <summary>
 		/// Error message localized key.
 		/// </summary>
@@ -93,6 +98,13 @@ public async Task<T> GetSingle()
 			}
 
 			var response = await _callback();
+
+			if (response.Value == HttpStatusCode.Unauthorized)
+			{
+				setError("base_session_expired", sessionExpired: true);
+				return new T();
+			}
+
 			singleObject = GetAccess(response);
 
 			if (singleObject == null) {
@@ -116,6 +128,13 @@ public async Task<List<T>> GetList()
 			}
 
 			var response = await _callback();
+
+			if (response.Value == HttpStatusCode.Unauthorized)
+			{
+				setError("base_session_expired", sessionExpired: true);
+				return new List<T>();
+			}
+
 			list = GetListAccess(response);
 
 			if (list == null) {
@@ -221,12 +240,14 @@ public T GetAccess(KeyValuePair<string, HttpStatusCode> response)
 		/// Set error details.
 		/// </summary>
 		/// <param name="message">Error message.</param>
+		/// <param name="sessionExpired">Session expired error.</param>
 		/// <param name="isConnectionError">Is connection error.</param>
-		void setError(string message, bool isConnectionError = false)
+		void setError(string message, bool sessionExpired = false, bool isConnectionError = false)
 		{
 			IsError = true;
 			ErrorMessageKey = message;
 			IsConnectionError = isConnectionError;
+			IsSessionExpiredError = sessionExpired;
 		}
 
 		/// <summary>

diff --git a/source/EduCATS/Data/DataAccessTools.cs b/source/EduCATS/Data/DataAccessTools.cs
@@ -20,6 +20,11 @@ public static partial class DataAccess
 		/// </summary>
 		public static bool IsConnectionError { get; set; }
 
+		/// <summary>
+		/// Is session expired issue.
+		/// </summary>
+		public static bool IsSessionExpiredError { get; set; }
+
 		/// <summary>
 		/// Error message.
 		/// </summary>
@@ -50,7 +55,7 @@ public async static Task<object> GetDataObject<T>(IDataAccess<T> dataAccess, boo
 				objectToGet = await dataAccess.GetSingle();
 			}
 
-			SetError(dataAccess.ErrorMessageKey, dataAccess.IsConnectionError);
+			SetError(dataAccess.ErrorMessageKey, dataAccess.IsConnectionError, dataAccess.IsSessionExpiredError);
 			return objectToGet;
 		}
 
@@ -82,19 +87,22 @@ public static string GetKey(string key, object id)
 		/// </summary>
 		/// <param name="message">Error message.</param>
 		/// <param name="isConnectionError">Is network connection issue.</param>
+		/// <param name="sessionExpired">Is session expired issue.</param>
 		/// <remarks>
 		/// Can be <c>null</c> (if no error occurred).
 		/// </remarks>
-		public static void SetError(string message, bool isConnectionError)
+		public static void SetError(string message, bool isConnectionError, bool sessionExpired)
 		{
 			if (message == null) {
 				IsError = false;
 				IsConnectionError = false;
+				IsSessionExpiredError = false;
 				return;
 			}
 
 			IsError = true;
 			IsConnectionError = isConnectionError;
+			IsSessionExpiredError = sessionExpired;
 			ErrorMessage = CrossLocalization.Translate(message);
 		}
 	}

diff --git a/source/EduCATS/Data/Interfaces/IDataAccess.cs b/source/EduCATS/Data/Interfaces/IDataAccess.cs
@@ -18,6 +18,11 @@ public interface IDataAccess<T>
 		/// </summary>
 		bool IsConnectionError { get; set; }
 
+		/// <summary>
+		/// Is error referred to expired session.
+		/// </summary>
+		bool IsSessionExpiredError { get; set; }
+
 		/// <summary>
 		/// Error message localization key.
 		/// </summary>

diff --git a/source/EduCATS/Data/Models/User/UserModel.cs b/source/EduCATS/Data/Models/User/UserModel.cs
@@ -9,7 +9,5 @@ public class UserModel
 
 		[JsonProperty("UserId")]
 		public int UserId { get; set; }
-
-		public string Password { get; set; }
 	}
 }
diff --git a/source/EduCATS/Data/User/AppUserData.cs b/source/EduCATS/Data/User/AppUserData.cs
@@ -67,11 +67,10 @@ public class AppUserData
 		/// <param name="services">Platfrom services.</param>
 		/// <param name="userId">User ID.</param>
 		/// <param name="username">Username.</param>
-		public static void SetLoginData(IPlatformServices services, int userId, string username, string password)
+		public static void SetLoginData(IPlatformServices services, int userId, string username)
 		{
 			services.Preferences.UserId = userId;
 			services.Preferences.UserLogin = username;
-			services.Preferences.UserPassword = password;
 			UserId = userId;
 			Username = username;
 		}

diff --git a/source/EduCATS/Helpers/Forms/Settings/AppPrefs.cs b/source/EduCATS/Helpers/Forms/Settings/AppPrefs.cs
@@ -93,25 +93,6 @@ public class AppPrefs : IPreferences
 		/// </summary>
 		const string _userLoginDefault = null;
 
-		/// <summary>
-		/// Password key.
-		/// </summary>
-		const string _userPassKey = "USER_LOGIN";
-
-		/// <summary>
-		/// Default password.
-		/// </summary>
-		const string _userPassDefault = null;
-
-		/// <summary>
-		/// Password.
-		/// </summary>
-		public string UserPassword
-		{
-			get => Preferences.Get(_userPassKey, _userPassDefault);
-			set => Preferences.Set(_userPassKey, value);
-		}
-
 		/// <summary>
 		/// Username.
 		/// </summary>

diff --git a/source/EduCATS/Helpers/Forms/Settings/Interfaces/IPreferences.cs b/source/EduCATS/Helpers/Forms/Settings/Interfaces/IPreferences.cs
@@ -7,7 +7,6 @@ public interface IPreferences
 		string Server { get; set; }
 		bool IsLoggedIn { get; set; }
 		string UserLogin { get; set; }
-		string UserPassword { get; set; }
 		int UserId { get; set; }
 		int ChosenSubjectId { get; set; }
 		int GroupId { get; set; }

diff --git a/source/EduCATS/Localization/be.json b/source/EduCATS/Localization/be.json
@@ -12,6 +12,7 @@
 	"base_connection_error": "Адсутнічае злучэнне з інтэрнэтам. Праверце налады ў сетцы і паспрабуйце зноў",
 	"base_no_data": "Адсутнічаюць даныя для адлюстравання",
 	"base_something_went_wrong": "Нешта пайшло не так. Паўтарыце спробу або звярніцеся ў службу падтрымкі.",
+	"base_session_expired": "Сесія скончылася. Калі ласка, увайдзіце ў рахунак зноў.",
 
 	"contributor_ilya_lehchylin": "Ілля Легчылін",
 	"contributor_julia_popova": "Юлія Папова",

diff --git a/source/EduCATS/Localization/de.json b/source/EduCATS/Localization/de.json
@@ -12,6 +12,7 @@
 	"base_connection_error": "Keine Internetverbindung. Überprüfen Sie die Netzwerkeinstellungen und versuchen Sie es erneut.",
 	"base_no_data": "Keine Daten angezeigt werden",
 	"base_something_went_wrong": "Etwas ist schief gelaufen. Bitte versuchen Sie es erneut oder wenden Sie sich an den Support.",
+	"base_session_expired": "Die Sitzung ist abgelaufen. Bitte melden Sie sich erneut bei Ihrem Konto an.",
 
 	"contributor_ilya_lehchylin": "Ilya Legtschilin",
 	"contributor_julia_popova": "Yuliya Popova",