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

BMC: Send CompanyId in ValidateTenancy Response

Browse Source
This commit is contained in:
Palash Biswas 2022-12-16 12:23:24 +05:30
parent 3682a17d53
commit 097f0f1378
9 changed files with 132 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
BCS.BMC/src/BCS.BMC.Application/CompanyMasters/CompanyMasterAppService.cs
View File

@ -36,7 +36,7 @@ using System.Net.Http;
using System.Net.Http.Headers;
using Newtonsoft.Json;
using Abp.Json;
using System.Diagnostics;
namespace BCS.BMC.CompanyMasters
{
@ -125,7 +125,7 @@ namespace BCS.BMC.CompanyMasters
protected async Task<int> Create(CreateOrUpdateCompanyMasterInput input)
{
int companyId = 0;
// await GetUrlIsValid(input.Url);
var company = from m in _companyMaster.GetAllList().Where(m => m.Url.ToLower().Trim() == input.Url.ToLower().Trim())
select m;
@ -158,6 +158,46 @@ namespace BCS.BMC.CompanyMasters
return companyId;
}
public async Task<bool> GetUrlIsValid(string url)
{
try
{
HttpWebRequest request = HttpWebRequest.Create(url) as HttpWebRequest;
request.Timeout = 5000; //set the timeout to 5 seconds to keep the user from waiting too long for the page to load
request.Method = "HEAD"; //Get only the header information -- no need to download any content
using (HttpWebResponse response = request.GetResponse() as HttpWebResponse)
{
int statusCode = (int)response.StatusCode;
if (statusCode >= 100 && statusCode < 400) //Good requests
{
return true;
}
else if (statusCode >= 500 && statusCode <= 510) //Server Errors
{
//log.Warn(String.Format("The remote server has thrown an internal error. Url is not valid: {0}", url));
Debug.WriteLine(String.Format("The remote server has thrown an internal error. Url is not valid: {0}", url));
return false;
}
}
}
catch (WebException ex)
{
if (ex.Status == WebExceptionStatus.ProtocolError) //400 errors
{
return false;
}
else
{
// log.Warn(String.Format("Unhandled status [{0}] returned for url: {1}", ex.Status, url), ex);
}
}
catch (Exception ex)
{
// log.Error(String.Format("Could not test url {0}.", url), ex);
}
return false;
}
protected async Task Update(CreateOrUpdateCompanyMasterInput input)
{
var entity = await _companyMaster.FirstOrDefaultAsync(x => x.Id == input.Id);
@ -217,7 +257,7 @@ namespace BCS.BMC.CompanyMasters
}
var company = await _companyMaster.FirstOrDefaultAsync(x => x.Url == input.CompanyUrl.ToString());
if(company == null)
if (company == null)
{
return new HttpStatusCodeResult(HttpStatusCode.BadRequest);
}

1
BCS.BMC/src/BCS.BMC.Application/CompanyMasters/ICompanyMasterAppService.cs
View File

@ -28,5 +28,6 @@ namespace BCS.BMC.CompanyMasters
Task DeleteCompany(EntityDto<int> input);
[HttpPost]
Task<HttpStatusCodeResult> TokenByCompanyUrl(GetInputUrl input);
Task<bool> GetUrlIsValid(string url);
}
}

2
BCS.BMC/src/BCS.BMC.Application/FirebaseCloudMessaging/Dto/FireStoreNotificationModel.cs
View File

@ -27,5 +27,7 @@ namespace BCS.BMC.FirebaseCloudMessaging.Dto
public bool Status { get; set; }
[FirestoreProperty]
public List<string> UserId { get; set; }
[FirestoreProperty]
public int CompanyId { get; set; }
}
}

8
BCS.BMC/src/BCS.BMC.Application/FirebaseCloudMessaging/Dto/NotificationModel.cs
View File

@ -13,13 +13,8 @@ namespace BCS.BMC.FirebaseCloudMessaging.Dto
[AutoMapTo(typeof (FirebaseCloudMessageDetails))]
public class NotificationModel
{
//[JsonProperty("title")]
//public List<string> Title { get; set; }
//[JsonProperty("body")]
public string FcmToken { get; set; }
//public List<string> Id { get; set; }
public string Message { get; set; }
public DateTime? MessageSentDateTime { get; set; }
@ -28,6 +23,7 @@ namespace BCS.BMC.FirebaseCloudMessaging.Dto
public bool Status { get; set; }
public List<string> UserId { get; set; }
public string CompanyUrl { get; set; }
}

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

@ -267,7 +267,12 @@ namespace BCS.BMC.Controllers
{
return BadRequest("Url Not Found");
}
return Ok("Success");
var result = new
{
CompanyId = company.Id,
};
return Ok(result);
}
[HttpPost]

5
BCS.BMC/src/BCS.BMC.Web.Mvc/Controllers/CompanyMasterController.cs
View File

@ -37,5 +37,10 @@ namespace BCS.BMC.Web.Controllers
return PartialView("_EditModal", output);
}
//public async Task<bool> GetUrlIsValid(string url)
//{
// bool isSuccess = await _companyasterService.GetUrlIsValid(url);
// return isSuccess;
//}
}
}

8
BCS.BMC/src/BCS.BMC.Web.Mvc/Controllers/NotificationController.cs
View File

@ -29,6 +29,7 @@ namespace BCS.BMC.Web.Controllers
private readonly IFirebaseNotificationAppService _notificationService;
private readonly IRepository<FirebaseCloudMessageDetails> _firebaseCloudMessageDetails;
private readonly IRepository<FirebaseToken, int> _firebaseToken;
private readonly IRepository<CompanyMaster, int> _companyMasterService;
//IFirebaseConfig config = new FirebaseConfig
//{
// AuthSecret = "n6DTPQEbpnLahrrk2EYu4bJ2Wd3jCk2N8kocazdI",
@ -37,11 +38,13 @@ namespace BCS.BMC.Web.Controllers
//IFirebaseClient client;
public NotificationController(IFirebaseNotificationAppService notificationService,
IRepository<FirebaseCloudMessageDetails> firebaseCloudMessageDetails,
IRepository<FirebaseToken, int> firebaseToken)
IRepository<FirebaseToken, int> firebaseToken,
IRepository<CompanyMaster, int> companyMasterService)
{
_notificationService = notificationService;
_firebaseCloudMessageDetails = firebaseCloudMessageDetails;
_firebaseToken = firebaseToken;
_companyMasterService = companyMasterService;
}
@ -62,7 +65,7 @@ namespace BCS.BMC.Web.Controllers
{
string path = AppDomain.CurrentDomain.BaseDirectory + @"firechat-57601-firebase-adminsdk-anscp-e04366c4d4.json";
Environment.SetEnvironmentVariable("GOOGLE_APPLICATION_CREDENTIALS", path);
var companyDetails = _companyMasterService.GetAllList().Where(x => x.Url.Trim() == notification.CompanyUrl.Trim()).FirstOrDefault();
try
{
FirestoreDb db = FirestoreDb.Create("firechat-57601");
@ -77,6 +80,7 @@ namespace BCS.BMC.Web.Controllers
data.SenderName = notification.SenderName;
data.Status = notification.Status;
data.UserId = notification.UserId;
data.CompanyId = companyDetails.Id;
await db.Collection("BMC_Notification").Document().SetAsync(data);
int userId = 0;

14
BCS.BMC/src/BCS.BMC.Web.Mvc/Views/CompanyMaster/_CreateModal.cshtml
View File

@ -25,18 +25,20 @@
</ul>*@
<div class="tab-content mt-4">
<div role="tabpanel" class="tab-pane container active" id="create-client-details">
<div class="form-group row required">
<label class="col-md-3 col-form-label">@L("Url")</label>
<div class="col-md-9">
<input type="text" class="form-control" id="Url" name="Url" required maxlength="@AbpUserBase.MaxNameLength">
</div>
@* <input type="submit" value="Check Url" class="download-button" name="submit">*@
</div>
<div class="form-group row required">
<label class="col-md-3 col-form-label">@L("Company")</label>
<div class="col-md-9">
<input type="text" class="form-control" name="CompanyName" required maxlength="@AbpUserBase.MaxUserNameLength" minlength="2">
</div>
</div>
<div class="form-group row required">
<label class="col-md-3 col-form-label">@L("Url")</label>
<div class="col-md-9">
<input type="text" class="form-control" name="Url" required maxlength="@AbpUserBase.MaxNameLength">
</div>
</div>
@* <div class="form-group row required">
<label class="col-md-3 col-form-label">@L("ClientSubDomainName")</label>
<div class="col-md-9">

48
BCS.BMC/src/BCS.BMC.Web.Mvc/wwwroot/view-resources/Views/CompanyMaster/Index.js
View File

@ -84,6 +84,54 @@
$('input[type="checkbox"]', rows).prop('checked', this.checked);
});
//function validateUrl (isValid) {
// var companydetails = _$form.serializeFormToObject();
// abp.ui.setBusy();
// var companyUrl = companydetails.Url;
// abp.notify.info(l('ValidatingUrl'));
// _companyService.urlIsValid(companyUrl);
//}
//_$form.find('.download-button').on('click', (e) => {
// debugger;
// var companydetails = _$form.serializeFormToObject();
// //abp.ui.setBusy();
// var companyUrl = companydetails.Url;
// $.ajax({
// url: abp.appPath + 'CompanyMaster/GetUrlIsValid?url=' + companyUrl,
// type: 'GET',
// data: { url: companyUrl },
// success: function (data) {
// alert('ok');
// console.log(data);
// if (data.result == true) {
// debugger;
// alert('correct');
// // window.location.replace("Management Page.aspx");
// }
// },
// Error: function () {
// alert('error');
// }
// });
// //var companydetails = _$form.serializeFormToObject();
// //abp.ui.setBusy();
// //var companyUrl = companydetails.Url;
// //var data = _companyService.getUrlIsValid(companyUrl);
// //data.done(function (result) {
// // var isSuccess = result;
// //})
// //console.log("Hello world!");
// //console.log('1', data);
// //});
//});
_$form.find('.save-button').on('click', (e) => {
e.preventDefault();