palash/BMC
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: palash:6180e3356a70e89230dace29dab8d6c1be01f8e5
Branches Tags
palash:master
palash:feature/ForgotPasswordFunctionality
palash:feature/IndividualSendNotificationFunctionality
palash:feature/ModificationForSentNotificationAPI
palash:dev
palash:feature/FcmTokenRemoveFunctionality
palash:feature/SaveFirebaseNotifications
palash:feature/CompanyMasterEditFunctionality
palash:feature/AddUrlPropertyInLoginAndRegister
palash:feature/Registration
palash:feature/AuthApi_ValidateTenancy
..
compare: palash:838d149d522609cafcf9ec544e42bc7507833b1a
Branches Tags
palash:feature/ForgotPasswordFunctionality
palash:feature/IndividualSendNotificationFunctionality
palash:feature/ModificationForSentNotificationAPI
palash:dev
palash:feature/FcmTokenRemoveFunctionality
palash:feature/SaveFirebaseNotifications
palash:feature/CompanyMasterEditFunctionality
palash:master
palash:feature/AddUrlPropertyInLoginAndRegister
palash:feature/Registration
palash:feature/AuthApi_ValidateTenancy

No commits in common. "6180e3356a70e89230dace29dab8d6c1be01f8e5" and "838d149d522609cafcf9ec544e42bc7507833b1a" have entirely different histories.
6180e3356a ... 838d149d52

2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
BCS.BMC/src/BCS.BMC.Web.Core/Controllers/TokenAuthController.cs
View File

@ -323,7 +323,7 @@ namespace BCS.BMC.Controllers
{ {
var responseStream = await response.Content.ReadAsStringAsync(); var responseStream = await response.Content.ReadAsStringAsync();
LoginOrRegisterResponseMessageModel result = JsonConvert.DeserializeObject<LoginOrRegisterResponseMessageModel>(responseStream); LoginOrRegisterResponseMessageModel result = JsonConvert.DeserializeObject<LoginOrRegisterResponseMessageModel>(responseStream);
result.result.CompanyId = company.Id; result.result.CompanyId = company.Id.ToString();
var getTokenDetails = _firebaseToken.GetAllList().Where(x => x.HostName == host && x.UserId == int.Parse(result.result.userId)).FirstOrDefault(); var getTokenDetails = _firebaseToken.GetAllList().Where(x => x.HostName == host && x.UserId == int.Parse(result.result.userId)).FirstOrDefault();
if (getTokenDetails is null) if (getTokenDetails is null)
@ -388,7 +388,7 @@ namespace BCS.BMC.Controllers
{ {
var responseStream = await response.Content.ReadAsStringAsync(); var responseStream = await response.Content.ReadAsStringAsync();
LoginOrRegisterResponseMessageModel result = JsonConvert.DeserializeObject<LoginOrRegisterResponseMessageModel>(responseStream); LoginOrRegisterResponseMessageModel result = JsonConvert.DeserializeObject<LoginOrRegisterResponseMessageModel>(responseStream);
result.result.CompanyId = company.Id; result.result.CompanyId = company.Id.ToString();
return Ok(result); return Ok(result);
} }
else if (response.StatusCode == HttpStatusCode.InternalServerError) else if (response.StatusCode == HttpStatusCode.InternalServerError)

2
BCS.BMC/src/BCS.BMC.Web.Core/Models/TokenAuth/LoginOrRegisterResponseMessageModel.cs
View File

@ -23,7 +23,7 @@ namespace BCS.BMC.Models.TokenAuth
public string employeeId { get; set; } public string employeeId { get; set; }
public string phoneNo { get; set; } public string phoneNo { get; set; }
public string profilePictureId { get; set; } public string profilePictureId { get; set; }
public int? CompanyId { get; set; } public string CompanyId { get; set; }
} }
} }