kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve register for updates

Browse Source
This commit is contained in:
Shaun Walker 2021-06-27 18:33:41 -04:00
parent 2433958a0f
commit 8ef83b2de8
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Services/InstallationService.cs
View File

@ -48,7 +48,7 @@ namespace Oqtane.Services
public async Task RegisterAsync(string email) public async Task RegisterAsync(string email)
{ {
await PostAsync($"{ApiUrl}/register?email={WebUtility.UrlEncode(email)}"); await PostJsonAsync($"{ApiUrl}/register?email={WebUtility.UrlEncode(email)}", true);
} }
} }
} }

16
Oqtane.Server/Controllers/InstallationController.cs
View File

@ -17,6 +17,7 @@ using Microsoft.AspNetCore.Http;
using System.Diagnostics; using System.Diagnostics;
using System.Net.Http; using System.Net.Http;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Threading.Tasks;
namespace Oqtane.Controllers namespace Oqtane.Controllers
{ {
@ -44,7 +45,7 @@ namespace Oqtane.Controllers
// POST api/<controller> // POST api/<controller>
[HttpPost] [HttpPost]
public Installation Post([FromBody] InstallConfig config) public async Task<Installation> Post([FromBody] InstallConfig config)
{ {
var installation = new Installation {Success = false, Message = ""}; var installation = new Installation {Success = false, Message = ""};
@ -52,9 +53,9 @@ namespace Oqtane.Controllers
{ {
installation = _databaseManager.Install(config); installation = _databaseManager.Install(config);
if (config.Register) if (installation.Success && config.Register)
{ {
RegisterContact(config.HostEmail); await RegisterContact(config.HostEmail);
} }
} }
else else
@ -206,7 +207,7 @@ namespace Oqtane.Controllers
}); });
} }
private void RegisterContact(string email) private async Task RegisterContact(string email)
{ {
try try
{ {
@ -214,7 +215,8 @@ namespace Oqtane.Controllers
{ {
client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value); client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version)); client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
client.GetAsync(Constants.PackageRegistryUrl + $"/api/registry/contact/?id={_configManager.GetInstallationId()}&email={WebUtility.UrlEncode(email)}"); Uri uri = new Uri(Constants.PackageRegistryUrl + $"/api/registry/contact/?id={_configManager.GetInstallationId()}&email={WebUtility.UrlEncode(email)}");
var response = await client.GetAsync(uri).ConfigureAwait(false);
} }
} }
catch catch
@ -226,9 +228,9 @@ namespace Oqtane.Controllers
// GET api/<controller>/register?email=x // GET api/<controller>/register?email=x
[HttpPost("register")] [HttpPost("register")]
[Authorize(Roles = RoleNames.Host)] [Authorize(Roles = RoleNames.Host)]
public void Register(string email) public async Task Register(string email)
{ {
RegisterContact(email); await RegisterContact(email);
} }
} }
} }