From 04f35d614fe051635442a6a7d4dcb300225a2a16 Mon Sep 17 00:00:00 2001 From: Hamid Reza Mohammadi Date: Thu, 4 Feb 2021 09:35:00 +0330 Subject: [PATCH] #72 removing PublicRUserSession constructors --- .../Auth/ViewModels/PublicRUserSession.cs | 28 +------------------ RSecurityBackend/RSecurityBackend.xml | 6 ---- .../Services/Implementation/AppUserService.cs | 23 ++++++++++++++- 3 files changed, 23 insertions(+), 34 deletions(-) diff --git a/RSecurityBackend/Models/Auth/ViewModels/PublicRUserSession.cs b/RSecurityBackend/Models/Auth/ViewModels/PublicRUserSession.cs index 8c048cae..2f1fa160 100644 --- a/RSecurityBackend/Models/Auth/ViewModels/PublicRUserSession.cs +++ b/RSecurityBackend/Models/Auth/ViewModels/PublicRUserSession.cs @@ -1,5 +1,4 @@ -using RSecurityBackend.Models.Auth.Db; -using System; +using System; namespace RSecurityBackend.Models.Auth.ViewModels { @@ -9,31 +8,6 @@ namespace RSecurityBackend.Models.Auth.ViewModels public class PublicRUserSession { - /// - /// constructor - /// - /// - public PublicRUserSession(RTemporaryUserSession src) - { - Id = src.Id; - RAppUser = new PublicRAppUser() - { - Id = src.RAppUser.Id, - Username = src.RAppUser.UserName, - Email = src.RAppUser.Email, - FirstName = src.RAppUser.FirstName, - SureName = src.RAppUser.SureName, - PhoneNumber = src.RAppUser.PhoneNumber, - RImageId = src.RAppUser.RImageId, - Status = src.RAppUser.Status - }; - ClientIPAddress = src.ClientIPAddress; - ClientAppName = src.ClientAppName; - Language = src.Language; - LoginTime = src.LoginTime; - LastRenewal = src.LastRenewal; - } - /// /// Session Id /// diff --git a/RSecurityBackend/RSecurityBackend.xml b/RSecurityBackend/RSecurityBackend.xml index 5e484169..edb4a55e 100644 --- a/RSecurityBackend/RSecurityBackend.xml +++ b/RSecurityBackend/RSecurityBackend.xml @@ -1266,12 +1266,6 @@ a safe subset of RUserSession - - - constructor - - - Session Id diff --git a/RSecurityBackend/Services/Implementation/AppUserService.cs b/RSecurityBackend/Services/Implementation/AppUserService.cs index 072007a6..81b8d569 100644 --- a/RSecurityBackend/Services/Implementation/AppUserService.cs +++ b/RSecurityBackend/Services/Implementation/AppUserService.cs @@ -403,7 +403,28 @@ namespace RSecurityBackend.Services.Implementation ; foreach (RTemporaryUserSession rUserSession in sessions) - publicRUserSessions.Add(new PublicRUserSession(rUserSession)); + publicRUserSessions.Add( + new PublicRUserSession() + { + Id = rUserSession.Id, + RAppUser = new PublicRAppUser() + { + Id = rUserSession.RAppUser.Id, + Username = rUserSession.RAppUser.UserName, + Email = rUserSession.RAppUser.Email, + FirstName = rUserSession.RAppUser.FirstName, + SureName = rUserSession.RAppUser.SureName, + PhoneNumber = rUserSession.RAppUser.PhoneNumber, + RImageId = rUserSession.RAppUser.RImageId, + Status = rUserSession.RAppUser.Status + }, + ClientAppName = rUserSession.ClientAppName, + ClientIPAddress = rUserSession.ClientIPAddress, + Language = rUserSession.Language, + LastRenewal = rUserSession.LastRenewal, + LoginTime = rUserSession.LoginTime + } + ); return new RServiceResult(publicRUserSessions.ToArray());