Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: changed permissions get methods so owner can be specified #65

Merged
merged 2 commits into from
Aug 31, 2023
Merged

fix: changed permissions get methods so owner can be specified #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4af66d9
fix: changed permissions get methods so owner can be specified
d1mak3 Aug 30, 2023
ed4facd
fix: fix typo and specified owner in methods that used _options.Organ…
d1mak3 Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Casdoor.AspNetCore/CasdoorIdentity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public async Task<IdentityResult> DeleteAsync(CasdoorUser user, CancellationToke
/// <returns></returns>
public async Task<CasdoorUser> FindByIdAsync(string userId, CancellationToken cancellationToken)
{
return await _casdoorClient.GetUseByIdrAsync(userId, cancellationToken);
return await _casdoorClient.GetUserByIdAsync(userId, cancellationToken: cancellationToken);
}
/// <summary>
/// Finds and returns a user, if any, who has the specified normalized user name.
Expand All @@ -72,7 +72,7 @@ public async Task<CasdoorUser> FindByIdAsync(string userId, CancellationToken ca
/// <returns></returns>
public async Task<CasdoorUser> FindByNameAsync(string normalizedUserName, CancellationToken cancellationToken)
{
return await _casdoorClient.GetUserAsync(normalizedUserName, cancellationToken);
return await _casdoorClient.GetUserAsync(normalizedUserName, cancellationToken: cancellationToken);
}
/// <summary>
/// Gets the normalized user name for the specified user.
Expand Down
8 changes: 4 additions & 4 deletions src/Casdoor.Client/Abstractions/ICasdoorUserClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ namespace Casdoor.Client;

public interface ICasdoorUserClient
{
public Task<IEnumerable<CasdoorUser>?> GetUsersAsync(CancellationToken cancellationToken = default);
public Task<IEnumerable<CasdoorUser>?> GetSortedUsersAsync(string sorter, int limit, CancellationToken cancellationToken = default);
public Task<CasdoorUser?> GetUserAsync(string name, CancellationToken cancellationToken = default);
public Task<CasdoorUser?> GetUserByEmailAsync(string email, CancellationToken cancellationToken = default);
public Task<IEnumerable<CasdoorUser>?> GetUsersAsync(string? owner = null, CancellationToken cancellationToken = default);
public Task<IEnumerable<CasdoorUser>?> GetSortedUsersAsync(string sorter, int limit, string? owner = null, CancellationToken cancellationToken = default);
public Task<CasdoorUser?> GetUserAsync(string name, string? owner = null, CancellationToken cancellationToken = default);
public Task<CasdoorUser?> GetUserByEmailAsync(string email, string? owner = null, CancellationToken cancellationToken = default);
public Task<CasdoorResponse?> AddUserAsync(CasdoorUser user, CancellationToken cancellationToken = default);
public Task<CasdoorResponse?> UpdateUserAsync(CasdoorUser user, IEnumerable<string> propertyNames, CancellationToken cancellationToken = default );
public Task<CasdoorResponse?> DeleteUserAsync(string name, CancellationToken cancellationToken = default);
Expand Down
8 changes: 4 additions & 4 deletions src/Casdoor.Client/CasdoorClient.PermissionApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ public partial class CasdoorClient
return await PostAsJsonAsync(url, permission, cancellationToken);
}

public virtual async Task<IEnumerable<CasdoorPermission>?> GetPermissionsAsync(CancellationToken cancellationToken = default)
public virtual async Task<IEnumerable<CasdoorPermission>?> GetPermissionsAsync(string? owner = null, CancellationToken cancellationToken = default)
{
var queryMap = new QueryMapBuilder().Add("owner", _options.OrganizationName).QueryMap;
var queryMap = new QueryMapBuilder().Add("owner", owner ?? _options.OrganizationName).QueryMap;
string url = _options.GetActionUrl("get-permissions", queryMap);
var result = await _httpClient.GetFromJsonAsync<CasdoorResponse?>(url, cancellationToken: cancellationToken);
return result.DeserializeData<IEnumerable<CasdoorPermission>?>();
}

public virtual async Task<IEnumerable<CasdoorPermission>?> GetPermissionsByRoleAsync(string name, CancellationToken cancellationToken = default)
public virtual async Task<IEnumerable<CasdoorPermission>?> GetPermissionsByRoleAsync(string name, string? owner = null, CancellationToken cancellationToken = default)
{
var queryMap = new QueryMapBuilder().Add("id", $"{_options.OrganizationName}/{name}").QueryMap;
var queryMap = new QueryMapBuilder().Add("id", $"{owner ?? _options.OrganizationName}/{name}").QueryMap;
string url = _options.GetActionUrl("get-permissions-by-role", queryMap);
var result = await _httpClient.GetFromJsonAsync<CasdoorResponse?>(url, cancellationToken: cancellationToken);
return result.DeserializeData<IEnumerable<CasdoorPermission>?>();
Expand Down
39 changes: 21 additions & 18 deletions src/Casdoor.Client/CasdoorClient.UserApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,42 +18,45 @@ namespace Casdoor.Client;

public partial class CasdoorClient
{
public virtual async Task<IEnumerable<CasdoorUser>?> GetUsersAsync(CancellationToken cancellationToken = default)
public virtual async Task<IEnumerable<CasdoorUser>?> GetUsersAsync(string? owner = null, CancellationToken cancellationToken = default)
{
var queryMap = new QueryMapBuilder().Add("owner", _options.OrganizationName).QueryMap;
var queryMap = new QueryMapBuilder().Add("owner", owner ?? _options.OrganizationName).QueryMap;
string url = _options.GetActionUrl("get-users", queryMap);
var result = await _httpClient.GetFromJsonAsync<CasdoorResponse?>(url, cancellationToken: cancellationToken);
return result.DeserializeData<IEnumerable<CasdoorUser>?>();
}

public virtual async Task<IEnumerable<CasdoorUser>?> GetSortedUsersAsync(string sorter, int limit, CancellationToken cancellationToken = default)
public virtual async Task<IEnumerable<CasdoorUser>?> GetSortedUsersAsync(string sorter, int limit, string? owner = null, CancellationToken cancellationToken = default)
{
var queryMap = new QueryMapBuilder()
.Add("owner", _options.OrganizationName)
.Add("owner", owner ?? _options.OrganizationName)
.Add("sorter", sorter)
.Add("limit", limit.ToString()).QueryMap;
string url = _options.GetActionUrl("get-sorted-users", queryMap);
var result = await _httpClient.GetFromJsonAsync<CasdoorResponse?>(url, cancellationToken: cancellationToken);
return result.DeserializeData<IEnumerable<CasdoorUser>?>();
}

public virtual async Task<CasdoorUser?> GetUserAsync(string name, CancellationToken cancellationToken = default)
public virtual async Task<CasdoorUser?> GetUserAsync(string name, string? owner = null, CancellationToken cancellationToken = default)
{
var queryMap = new QueryMapBuilder().Add("id", $"{_options.OrganizationName}/{name}").QueryMap;
var queryMap = new QueryMapBuilder().Add("id", $"{owner ?? _options.OrganizationName}/{name}").QueryMap;
string url = _options.GetActionUrl("get-user", queryMap);
var result = await _httpClient.GetFromJsonAsync<CasdoorResponse?>(url, cancellationToken: cancellationToken);
return result.DeserializeData<CasdoorUser?>();
}

public virtual async Task<CasdoorUser?> GetUseByIdrAsync(string id, CancellationToken cancellationToken = default)
public virtual async Task<CasdoorUser?> GetUserByIdAsync(string id, string? owner = null, CancellationToken cancellationToken = default)
{
var queryMap = new QueryMapBuilder().Add("id", id).QueryMap;
var queryMap = new QueryMapBuilder()
.Add("userId", id)
.Add("owner", owner ?? _options.OrganizationName)
.QueryMap;
string url = _options.GetActionUrl("get-user", queryMap);
var result = await _httpClient.GetFromJsonAsync<CasdoorResponse?>(url, cancellationToken: cancellationToken);
var result = await GetFromJsonAsync<CasdoorResponse?>(url, cancellationToken: cancellationToken);
return result.DeserializeData<CasdoorUser?>();
}

public virtual async Task<CasdoorUser?> GetUserByEmailAsync(string email, CancellationToken cancellationToken = default)
public virtual async Task<CasdoorUser?> GetUserByEmailAsync(string email, string? owner = null, CancellationToken cancellationToken = default)
{
var queryMap = new QueryMapBuilder()
.Add("owner", _options.OrganizationName)
Expand All @@ -64,32 +67,32 @@ public partial class CasdoorClient
}

public virtual Task<CasdoorResponse?> AddUserAsync(CasdoorUser user, CancellationToken cancellationToken = default)
=> ModifyUserAsync("add-user", user, null, cancellationToken);
=> ModifyUserAsync("add-user", user, null, cancellationToken: cancellationToken);

public virtual Task<CasdoorResponse?> UpdateUserAsync(CasdoorUser user, IEnumerable<string> propertyNames, CancellationToken cancellationToken = default)
=> ModifyUserAsync("update-user", user, propertyNames, cancellationToken);
=> ModifyUserAsync("update-user", user, propertyNames, cancellationToken: cancellationToken);

public virtual async Task<CasdoorResponse?> DeleteUserAsync(string name, CancellationToken cancellationToken = default)
{
CasdoorUser? user = await GetUserAsync(name, cancellationToken);
CasdoorUser? user = await GetUserAsync(name, cancellationToken: cancellationToken);
if (user is null)
{
return null;
}
return await ModifyUserAsync("delete-user", user, null, cancellationToken);
return await ModifyUserAsync("delete-user", user, null, cancellationToken: cancellationToken);
}

public virtual async Task<CasdoorResponse?> CheckUserPasswordAsync(string name, CancellationToken cancellationToken = default)
{
CasdoorUser? user = await GetUserAsync(name, cancellationToken);
CasdoorUser? user = await GetUserAsync(name, cancellationToken: cancellationToken);
if (user is null)
{
return null;
}
return await ModifyUserAsync("check-user-password", user, null, cancellationToken);
return await ModifyUserAsync("check-user-password", user, null, cancellationToken: cancellationToken);
}

private Task<CasdoorResponse?> ModifyUserAsync(string action, CasdoorUser user, IEnumerable<string>? columns, CancellationToken cancellationToken = default)
private Task<CasdoorResponse?> ModifyUserAsync(string action, CasdoorUser user, IEnumerable<string>? columns, string? owner = null, CancellationToken cancellationToken = default)
{
var queryMapBuilder = new QueryMapBuilder().Add("id", $"{user.Owner}/{user.Name}");

Expand All @@ -100,7 +103,7 @@ public partial class CasdoorClient
queryMapBuilder.Add("columns", columnsValue);
}

user.Owner = _options.OrganizationName;
user.Owner = owner ?? _options.OrganizationName;
string url = _options.GetActionUrl(action, queryMapBuilder.QueryMap);
return PostAsJsonAsync(url, user, cancellationToken);
}
Expand Down
Loading