Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5880 from sbwalker/dev

Browse Source 
improve new API method signatures
This commit is contained in:
Shaun Walker
2025-12-15 10:29:22 -05:00
committed by GitHub
parent 576d3d0b56 a48dff4a85
commit e34321f727
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Oqtane.Client/Services/UserService.cs
View File

@ -291,12 +291,12 @@ namespace Oqtane.Services
public async Task<bool> ForgotPasswordAsync(string username)
{
return await GetJsonAsync<bool>($"{Apiurl}/forgotpassword?name={username}");
return await GetJsonAsync<bool>($"{Apiurl}/forgotpassword/{WebUtility.UrlEncode(username)}");
}
public async Task<bool> ForgotUsernameAsync(string email)
{
return await GetJsonAsync<bool>($"{Apiurl}/forgotusername?email={email}");
return await GetJsonAsync<bool>($"{Apiurl}/forgotusername/{WebUtility.UrlEncode(email)}");
}
public async Task<User> ResetPasswordAsync(User user, string token)
@ -388,7 +388,7 @@ namespace Oqtane.Services
public async Task<bool> SendLoginLinkAsync(string email)
{
return await GetJsonAsync<bool>($"{Apiurl}/loginlink?email={email}");
return await GetJsonAsync<bool>($"{Apiurl}/loginlink/{WebUtility.UrlEncode(email)}");
}
}
}

17
Oqtane.Server/Controllers/UserController.cs
View File

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Security.Claims;
using System.Security.Policy;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
@ -294,15 +293,15 @@ namespace Oqtane.Controllers
return user;
}
// GET api/<controller>/forgotpassword?name=x
[HttpGet("forgotpassword")]
public async Task<bool> ForgotPassword(string name)
// GET api/<controller>/forgotpassword/x
[HttpGet("forgotpassword/{username}")]
public async Task<bool> ForgotPassword(string username)
{
return await _userManager.ForgotPassword(name);
return await _userManager.ForgotPassword(username);
}
// GET api/<controller>/forgotusername?email=x
[HttpGet("forgotusername")]
// GET api/<controller>/forgotusername/x
[HttpGet("forgotusername/{email}")]
public async Task<bool> ForgotUsername(string email)
{
return await _userManager.ForgotUsername(email);
@ -564,8 +563,8 @@ namespace Oqtane.Controllers
}
}
// GET api/<controller>/loginlink?email=x
[HttpGet("loginlink")]
// GET api/<controller>/loginlink/x
[HttpGet("loginlink/{email}")]
public async Task<bool> SendLoginLink(string email)
{
return await _userManager.SendLoginLink(email);