Adam
/
AyCode.Core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improvements, fixes, etc...

This commit is contained in:
Loretta 2024-07-07 08:32:19 +02:00
parent 70ad51e5df
commit fc8c8941b8
6 changed files with 58 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AyCode.Interfaces/Logins/IAcLoginServiceCommon.cs
View File

@ -16,8 +16,8 @@ public interface IAcLoginServiceCommon<TUser, TProfile, TCompany, TUserToService
public bool Logout(); public bool Logout();
public Task<bool> LogoutAsync(); public Task<bool> LogoutAsync();
public AcErrorCode Registration(string email, string password, string? phoneNumber = null); public AcErrorCode Registration(string email, string password, string? phoneNumber = null, Guid? referralId = null);
public AcErrorCode Registration(Guid userId, string email, string password, string? phoneNumber = null); public AcErrorCode Registration(Guid userId, string email, string password, string? phoneNumber = null, Guid? referralId = null);
public Task<AcErrorCode> RegistrationAsync(string email, string password, string? phoneNumber = null); public Task<AcErrorCode> RegistrationAsync(string email, string password, string? phoneNumber = null, Guid? referralId = null);
public Task<AcErrorCode> RegistrationAsync(Guid userId, string email, string password, string? phoneNumber = null); public Task<AcErrorCode> RegistrationAsync(Guid userId, string email, string password, string? phoneNumber = null, Guid? referralId = null);
} }

21
AyCode.Models/Users/AcUserModelDtoDetailBase.cs
View File

@ -39,12 +39,17 @@ public abstract class AcUserModelDtoDetailBase<TUserDtoDetail, TProfileDto, TCom
protected AcUserModelDtoDetailBase(IAcUserDtoDetailBase<TProfileDto, TCompany, TUserToCompany, TAddressDto> user) : base(user) protected AcUserModelDtoDetailBase(IAcUserDtoDetailBase<TProfileDto, TCompany, TUserToCompany, TAddressDto> user) : base(user)
{ {
UserDto.Id = user.Id;
UserDto.ProfileId = user.ProfileId;
UserDto.EmailAddress = user.EmailAddress; UserDto.EmailAddress = user.EmailAddress;
UserDto.EmailConfirmed = user.EmailConfirmed; UserDto.EmailConfirmed = user.EmailConfirmed;
UserDto.PhoneNumber = user.PhoneNumber; UserDto.PhoneNumber = user.PhoneNumber;
UserDto.RefferalId = user.RefferalId;
UserDto.AffiliateId = user.AffiliateId;
UserDto.RefreshToken = user.RefreshToken;
UserDto.Created = user.Created; UserDto.Created = user.Created;
UserDto.Modified = user.Modified; UserDto.Modified = user.Modified;
var address = Activator.CreateInstance<TAddressDto>(); var address = Activator.CreateInstance<TAddressDto>();
address.Id = user.Profile.AddressId; address.Id = user.Profile.AddressId;
@ -54,4 +59,18 @@ public abstract class AcUserModelDtoDetailBase<TUserDtoDetail, TProfileDto, TCom
ProfileDto.Address = address; ProfileDto.Address = address;
} }
public void CopyUserDtoValuesToUser(IAcUserDtoDetailBase<TProfileDto, TCompany, TUserToCompany, TAddressDto> user)
{
base.CopyUserDtoValuesToUser(user);
user.ProfileId = UserDto.ProfileId;
user.EmailAddress = UserDto.EmailAddress;
user.EmailConfirmed = UserDto.EmailConfirmed;
user.PhoneNumber = UserDto.PhoneNumber;
user.RefferalId = UserDto.RefferalId;
//user.RefreshToken = UserDto.RefreshToken; //Ezzel mi legyen?! - J.
user.Created = UserDto.Created;
user.Modified = UserDto.Modified;
}
} }

6
AyCode.Models/Users/AcUserModelDtoMinBase.cs
View File

@ -34,6 +34,12 @@ public abstract class AcUserModelDtoMinBase<TUserDtoMin, TProfileDto> : AcModelD
//Profile.NickName = user.Profile.NickName; //Profile.NickName = user.Profile.NickName;
} }
public void CopyUserDtoValuesToUser(IAcUserDtoMinBase<TProfileDto> user)
{
user.Id = UserDto.Id;
user.AffiliateId = UserDto.AffiliateId;
}
//public virtual TUserDtoMin CreateMainEntity() //public virtual TUserDtoMin CreateMainEntity()
//{ //{
// var user = base.CreateMainEntity(); // var user = base.CreateMainEntity();

16
AyCode.Services.Server/Logins/AcLoginServiceServer.cs
View File

@ -83,11 +83,13 @@ public class AcLoginServiceServer<TResultLoggedInModel, TDal, TDbContext, TUser,
return TaskHelper.ToThreadPoolTask(Logout); return TaskHelper.ToThreadPoolTask(Logout);
} }
public virtual AcErrorCode Registration(string email, string password, string? phoneNumber = null) public virtual AcErrorCode Registration(string email, string password, string? phoneNumber = null, Guid? referralId = null)
=> Registration(Guid.NewGuid(), email, password, phoneNumber); => Registration(Guid.NewGuid(), email, password, phoneNumber, referralId);
public virtual AcErrorCode Registration(Guid userId, string email, string password, string? phoneNumber = null) public virtual AcErrorCode Registration(Guid userId, string email, string password, string? phoneNumber = null, Guid? referralId = null)
{ {
email = email.ToLower();
if ((phoneNumber != null && !AcValidate.IsValidPhoneNumberFormat(phoneNumber, out var errorCode)) || if ((phoneNumber != null && !AcValidate.IsValidPhoneNumberFormat(phoneNumber, out var errorCode)) ||
!AcValidate.IsValidEmailAndPasswordFormat(email, password, out errorCode)) return errorCode; !AcValidate.IsValidEmailAndPasswordFormat(email, password, out errorCode)) return errorCode;
@ -108,11 +110,11 @@ public class AcLoginServiceServer<TResultLoggedInModel, TDal, TDbContext, TUser,
} }
public virtual Task<AcErrorCode> RegistrationAsync(string email, string password, string? phoneNumber = null) public virtual Task<AcErrorCode> RegistrationAsync(string email, string password, string? phoneNumber = null, Guid? referralId = null)
=> RegistrationAsync(Guid.NewGuid(), email, password, phoneNumber); => RegistrationAsync(Guid.NewGuid(), email, password, phoneNumber, referralId);
public virtual Task<AcErrorCode> RegistrationAsync(Guid userId, string email, string password, string? phoneNumber = null) public virtual Task<AcErrorCode> RegistrationAsync(Guid userId, string email, string password, string? phoneNumber = null, Guid? referralId = null)
=> TaskHelper.ToThreadPoolTask(() => Registration(userId, email, password, phoneNumber)); => TaskHelper.ToThreadPoolTask(() => Registration(userId, email, password, phoneNumber, referralId));
public virtual bool SendConfirmationToken(string? email, string confirmationToken) public virtual bool SendConfirmationToken(string? email, string confirmationToken)
{ {

8
AyCode.Services/Logins/AcLoginServiceClient.cs
View File

@ -37,22 +37,22 @@ public class AcLoginServiceClient<TUser, TProfile, TCompany, TUserToServiceProvi
return TaskHelper.ToThreadPoolTask(Logout); return TaskHelper.ToThreadPoolTask(Logout);
} }
public virtual AcErrorCode Registration(string email, string password, string? phoneNumber = null) public virtual AcErrorCode Registration(string email, string password, string? phoneNumber = null, Guid? referralId = null)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public AcErrorCode Registration(Guid userId, string email, string password, string? phoneNumber = null) public AcErrorCode Registration(Guid userId, string email, string password, string? phoneNumber = null, Guid? referralId = null)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public virtual Task<AcErrorCode> RegistrationAsync(string email, string password, string? phoneNumber = null) public virtual Task<AcErrorCode> RegistrationAsync(string email, string password, string? phoneNumber = null, Guid? referralId = null)
{ {
return TaskHelper.ToThreadPoolTask(() => Registration(email, password, phoneNumber)); return TaskHelper.ToThreadPoolTask(() => Registration(email, password, phoneNumber));
} }
public Task<AcErrorCode> RegistrationAsync(Guid userId, string email, string password, string? phoneNumber = null) public Task<AcErrorCode> RegistrationAsync(Guid userId, string email, string password, string? phoneNumber = null, Guid? referralId = null)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }

27
AyCode.Services/SignalRs/IAcSignalRHubClient.cs
View File

@ -127,37 +127,39 @@ public interface ISignalRMessage
[MessagePackObject] [MessagePackObject]
public sealed class SignalResponseJsonMessage : ISignalResponseMessage<string> public sealed class SignalResponseJsonMessage : ISignalResponseMessage<string>
{ {
[Key(0)] public SignalResponseStatus Status { get; set; } [Key(0)] public int MessageTag { get; set; }
[Key(1)] public string? ResponseData { get; set; } = null; [Key(1)] public SignalResponseStatus Status { get; set; }
[Key(2)] public string? ResponseData { get; set; } = null;
public SignalResponseJsonMessage(){} public SignalResponseJsonMessage(){}
public SignalResponseJsonMessage(SignalResponseStatus status) public SignalResponseJsonMessage(int messageTag, SignalResponseStatus status)
{ {
Status = status; Status = status;
MessageTag = messageTag;
} }
public SignalResponseJsonMessage(SignalResponseStatus status, object? responseData) : this(status) public SignalResponseJsonMessage(int messageTag, SignalResponseStatus status, object? responseData) : this(messageTag, status)
{ {
if (responseData is string) if (responseData is string stringdata)
ResponseData = responseData as string; ResponseData = stringdata;
else ResponseData = responseData.ToJson(); else ResponseData = responseData.ToJson();
} }
public SignalResponseJsonMessage(SignalResponseStatus status, string? responseDataJson) : this(status) public SignalResponseJsonMessage(int messageTag, SignalResponseStatus status, string? responseDataJson) : this(messageTag, status)
{ {
ResponseData = responseDataJson; ResponseData = responseDataJson;
} }
} }
[MessagePackObject] [MessagePackObject]
public sealed class SignalResponseMessage<TResponseData>(SignalResponseStatus status, TResponseData? responseData) : ISignalResponseMessage<TResponseData> public sealed class SignalResponseMessage<TResponseData>(int messageTag, SignalResponseStatus status, TResponseData? responseData) : ISignalResponseMessage<TResponseData>
{ {
[Key(0)] [Key(0)] public int MessageTag { get; set; }
public SignalResponseStatus Status { get; set; } = status; [Key(1)] public SignalResponseStatus Status { get; set; } = status;
[Key(1)] [Key(2)] public TResponseData? ResponseData { get; set; } = responseData;
public TResponseData? ResponseData { get; set; } = responseData;
} }
public sealed class SignalResponseStatusMessage(SignalResponseStatus status) : ISignalRMessage public sealed class SignalResponseStatusMessage(SignalResponseStatus status) : ISignalRMessage
@ -179,6 +181,7 @@ public interface ISignalResponseMessage<TResponseData> : ISignalResponseMessage
public interface ISignalResponseMessage : ISignalRMessage public interface ISignalResponseMessage : ISignalRMessage
{ {
int MessageTag { get; set; }
SignalResponseStatus Status { get; set; } SignalResponseStatus Status { get; set; }
} }