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

Compare commits

base: palash:a8dea50c2c4690dfb077765ae577fcae48d1cfc3
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:6180e3356a70e89230dace29dab8d6c1be01f8e5
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. "a8dea50c2c4690dfb077765ae577fcae48d1cfc3" and "6180e3356a70e89230dace29dab8d6c1be01f8e5" have entirely different histories.
a8dea50c2c ... 6180e3356a

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

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

@ -282,7 +282,7 @@ namespace BCS.BMC.Controllers
var protocol = "";
if (string.IsNullOrWhiteSpace(input.CompanyUrl))
{
return BadRequest("Please enter a valid Url");
return BadRequest("Please Enter A Valid Url");
}
using (HttpClient client = new HttpClient())
{
@ -305,11 +305,6 @@ namespace BCS.BMC.Controllers
{
return BadRequest("Invalid Company Url");
}
var companyAccountId = await _companyMaster.FirstOrDefaultAsync(x => x.CompanyName == input.CompanyId);
if (companyAccountId == null)
{
return BadRequest("Please enter valid Company Account ID");
}
// var baseUrl = uri + "api/BmcLogin";
var baseUrl = protocol + "://" + host + "/api/BmcLogin";
@ -352,7 +347,7 @@ namespace BCS.BMC.Controllers
var contents = await response.Content.ReadAsStringAsync();
ResponseMessageModel result = JsonConvert.DeserializeObject<ResponseMessageModel>(contents);
return BadRequest(result.error.message == "Login Failed" ? "Please enter valid Username or Password" : result.error.message);
return BadRequest(result.error.message == "Login Failed" ? "Invalid Username Or Password" : result.error.message);
}
return Ok();
}
@ -373,11 +368,6 @@ namespace BCS.BMC.Controllers
{
return BadRequest("Url Not Found");
}
var companyAccountId = await _companyMaster.FirstOrDefaultAsync(x => x.CompanyName == input.CompanyAccountId);
if (companyAccountId == null)
{
return BadRequest("Please enter valid Company Account ID");
}
using (HttpClient client = new HttpClient())
{
var baseUrl = input.CompanyUrl + "/api/services/bwac/employeeRegister/RegisterEmployeeAsNewUser";