BCS.BMC/src/BCS.BMC.Application/CompanyMasters/CompanyMasterAppService.cs

@@ -36,8 +36,7 @@ using System.Net.Http;
 using System.Net.Http.Headers;
 using Newtonsoft.Json;
 using Abp.Json;
-using System.Diagnostics;
+
-using static Grpc.Core.Metadata;
 
 namespace BCS.BMC.CompanyMasters
 {
@@ -126,10 +125,10 @@ 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;
+                             select m;
             
             var entity = input.MapTo<CompanyMaster>();
             // entity.TenantId = AbpSession.TenantId;
@@ -148,7 +147,7 @@ namespace BCS.BMC.CompanyMasters
                 }
             }
             entity.DomainName = host;
-            if (company == null || company.Count() == 0)
+            if (company == null  || company.Count() == 0)
             {
                 companyId = await _companyMaster.InsertAndGetIdAsync(entity);
             }
@@ -159,53 +158,6 @@ namespace BCS.BMC.CompanyMasters
             return companyId;
         }
 
-        public async Task<ValidUrlResponseDto> UrlIsValid(string url)
-        {
-            bool istrue = false;
-            var entity= new ValidUrlResponseDto();
-            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
-                    {
-                        entity.IsSuccess = true;
-                        Uri uri = new Uri(url, UriKind.Absolute);
-                        var host = uri.Host;
-
-                        if (host.Split('.').Length > 2)
-                        {
-                            int lastIndex = host.LastIndexOf(".");
-                            int index = host.LastIndexOf(".", lastIndex - 1);
-                            var subdomain = host.Substring(0, index);
-                            if (subdomain != "www")
-                            {
-                                entity.TenantName = subdomain;
-                            }
-                        }
-                    }
-                    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));
-                        istrue = false;
-                    }
-                    
-                }
-                
-            }         
-            catch (Exception ex)
-            {
-                // log.Error(String.Format("Could not test url {0}.", url), ex);
-            }
-            return entity;
-        }
         protected async Task Update(CreateOrUpdateCompanyMasterInput input)
         {
             var entity = await _companyMaster.FirstOrDefaultAsync(x => x.Id == input.Id);
@@ -265,7 +217,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);
             }

BCS.BMC/src/BCS.BMC.Application/CompanyMasters/Dto/ValidUrlResponseDto.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BCS.BMC.CompanyMasters.Dto
-{
-    public class ValidUrlResponseDto
-    {
-        public bool IsSuccess { get; set; }
-        public string TenantName { get; set; }
-    }
-}

BCS.BMC/src/BCS.BMC.Application/CompanyMasters/ICompanyMasterAppService.cs

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

BCS.BMC/src/BCS.BMC.Application/FirebaseCloudMessaging/Dto/FireStoreNotificationModel.cs

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

BCS.BMC/src/BCS.BMC.Application/FirebaseCloudMessaging/Dto/NotificationModel.cs

@@ -13,8 +13,13 @@ namespace BCS.BMC.FirebaseCloudMessaging.Dto
     [AutoMapTo(typeof (FirebaseCloudMessageDetails))]
     public class NotificationModel
     {
-        public string FcmToken { get; set; }
 
+
+        //[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; }
 
@@ -23,8 +28,7 @@ namespace BCS.BMC.FirebaseCloudMessaging.Dto
 
         public bool Status { get; set; }
         public List<string> UserId { get; set; }
-        public string CompanyUrl { get; set; }
+
-        public string ScheduleGenerationId { get; set; }
     }
 
     //[AutoMapFrom(typeof(NotificationModel))]

BCS.BMC/src/BCS.BMC.Core/Localization/SourceFiles/BMC.xml

@@ -126,7 +126,5 @@
 	  <text name="CompanyMaster">Company Master</text>
 	  <text name="Url">Url</text>	  
 	  <text name="Id">Id</text>
-    <text name="CreateNewCompany">Create New Company</text>
-    <text name="EditCompany">Edit Company</text>
   </texts>
 </localizationDictionary>

BCS.BMC/src/BCS.BMC.Web.Core/Controllers/TokenAuthController.cs

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

BCS.BMC/src/BCS.BMC.Web.Mvc/Controllers/CompanyMasterController.cs

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

BCS.BMC/src/BCS.BMC.Web.Mvc/Controllers/NotificationController.cs

@@ -29,7 +29,6 @@ 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",
@@ -38,13 +37,11 @@ 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;
         }
 
 
@@ -65,7 +62,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");
@@ -80,8 +77,6 @@ namespace BCS.BMC.Web.Controllers
                 data.SenderName = notification.SenderName;
                 data.Status = notification.Status;
                 data.UserId = notification.UserId;
-                data.CompanyId = companyDetails.Id;
-                data.ScheduleGenerationId = notification.ScheduleGenerationId;
                 await db.Collection("BMC_Notification").Document().SetAsync(data);
 
                 int userId = 0;

BCS.BMC/src/BCS.BMC.Web.Mvc/Views/CompanyMaster/_CreateModal.cshtml

@@ -12,7 +12,7 @@
 <div class="modal fade" id="ClientMasterCreateModal" tabindex="-1" role="dialog" aria-labelledby="UserCreateModalLabel" data-backdrop="static">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
-            @await Html.PartialAsync("~/Views/Shared/Modals/_ModalHeader.cshtml", new ModalHeaderViewModel(L("CreateNewCompany")))
+           @* @await Html.PartialAsync("~/Views/Shared/Modals/_ModalHeader.cshtml", new ModalHeaderViewModel(L("CreateNewUser")))*@
             <form name="clientMasterCreateForm" role="form" class="form-horizontal">
                 <div class="modal-body">
                     @*<ul class="nav nav-tabs" role="tablist">
@@ -26,20 +26,18 @@
                     <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-2 col-form-label">@L("Url")</label>
+                                <label class="col-md-3 col-form-label">@L("Company")</label>
-                                <div class="col-md-8">
+                                <div class="col-md-9">
-                                    <input type="text" class="form-control" id="Url" name="Url" required>
+                                    <input type="text" class="form-control" name="CompanyName" required maxlength="@AbpUserBase.MaxUserNameLength" minlength="2">
-                                </div>
-                                <input type="submit" value="Check Url" class="btn btn-secondary btn-sm download-button" name="submit">
-                            </div>
-
-                            <div class="form-group row" id="div_CompanyName" style="visibility : hidden">
-                                <label class="col-md-2 col-form-label">@L("Company")</label>
-                                <div class="col-md-8">
-                                    <input type="text" class="form-control" name="CompanyName" id="CompanyName" readonly>
                                 </div>
                             </div>
-                            @* <div class="form-group row required">
+                            <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">
                                     <input type="text" class="form-control" name="ClientSubDomainName" required maxlength="@AbpUserBase.MaxSurnameLength">

BCS.BMC/src/BCS.BMC.Web.Mvc/Views/CompanyMaster/_EditModal.cshtml

@@ -6,7 +6,7 @@
 @{
     Layout = null;
 }
-@await Html.PartialAsync("~/Views/Shared/Modals/_ModalHeader.cshtml", new ModalHeaderViewModel(L("EditCompany")))
+
 <form name="EditCompanyForm" role="form" class="form-horizontal">
     <input type="hidden" name="Id" value="@Model.Id" />
     <input type="hidden" name="DomainName" value="@Model.DomainName" />
@@ -23,20 +23,18 @@
         </ul>*@
         <div class="tab-content mt-4">
             <div role="tabpanel" class="tab-pane container active" id="edit-company-details">
-                <div class="form-group row required">
-                    <label class="col-md-3 col-form-label">@L("Url")</label>
-                    <div class="col-md-9">
-                        <input id="url" type="text" class="form-control" name="Url" value="@Model.Url" required maxlength="@AbpUserBase.MaxUserNameLength" minlength="2">
-                    </div>
-                </div>
-
                 <div class="form-group row required">
                     <label class="col-md-3 col-form-label">@L("Company")</label>
                     <div class="col-md-9">
                         <input id="CompanyName" type="text" class="form-control" name="CompanyName" value="@Model.CompanyName" required maxlength="@AbpUserBase.MaxUserNameLength" minlength="2">
                     </div>
                 </div>
-               
+                <div class="form-group row required">
+                    <label class="col-md-3 col-form-label">@L("Domain")</label>
+                    <div class="col-md-9">
+                        <input id="url" type="text" class="form-control" name="Url" value="@Model.Url" required maxlength="@AbpUserBase.MaxUserNameLength" minlength="2">
+                    </div>
+                </div>
            @*     <div class="form-group row required">
                     <label class="col-md-3 col-form-label">@L("ClientSubDomainName")</label>
                     <div class="col-md-9">

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

@@ -1,9 +1,9 @@
 (function ($) {
     var _companyService = abp.services.app.companyMaster
-    l = abp.localization.getSource('BMC'),
+       l = abp.localization.getSource('BMC'),
-        _$modal = $('#ClientMasterCreateModal'),
+    _$modal = $('#ClientMasterCreateModal'),
         _$form = _$modal.find('form'),
-        _$table = $('#CompanyMasterTable');
+           _$table = $('#CompanyMasterTable');
 
     var _$companyTable = _$table.DataTable({
         paging: true,
@@ -47,7 +47,7 @@
                 targets: 3,
                 data: 'url',
                 sortable: false           
-            }, {
+            },{
                 targets: 4,
                 data: 'domainName',
                 sortable: false
@@ -56,7 +56,7 @@
                 targets: 5,
                 data: 'subDomainName',
                 sortable: false
-            }, {
+            },{
                 targets: 6,
                 data: null,
                 sortable: false,
@@ -84,21 +84,6 @@
         $('input[type="checkbox"]', rows).prop('checked', this.checked);
     });
 
-    _$form.find('.download-button').on('click', (e) => {
-        e.preventDefault();
-        var companydetails = _$form.serializeFormToObject();
-        //abp.ui.setBusy();
-        var companyUrl = companydetails.Url;
-
-        abp.notify.info(l('ValidatingUrl'));
-        var data = _companyService.urlIsValid(companyUrl);
-        data.done(function (result) {
-            $('#div_CompanyName').attr("style", "visibility : visible");
-            $('#CompanyName').val(result.tenantName);
-        });
-    })
-
-
     _$form.find('.save-button').on('click', (e) => {
         e.preventDefault();