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.

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

fix: ogranization API actualized #49

Merged
merged 5 commits into from
Jul 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions src/Casdoor.Client/CasdoorClient.OrganizationApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,19 @@ public partial class CasdoorClient
return await PostAsJsonAsync(url, newOrganization, cancellationToken);
}

public virtual Task<CasdoorOrganization?> GetOrganizationAsync(string id, CancellationToken cancellationToken = default)
public virtual async Task<CasdoorOrganization?> GetOrganizationAsync(string id, CancellationToken cancellationToken = default)
{
var queryMap = new QueryMapBuilder().Add("id", id).QueryMap;
var url = _options.GetActionUrl("get-organization", queryMap);
return GetFromJsonAsync<CasdoorOrganization>(url, cancellationToken: cancellationToken);
var response = await GetFromJsonAsync<CasdoorResponse>(url, cancellationToken: cancellationToken);
return response.DeserializeData<CasdoorOrganization>();
}

public virtual Task<IEnumerable<CasdoorOrganization>?> GetOrganizationsAsync(string owner, CancellationToken cancellationToken = default)
public virtual async Task<IEnumerable<CasdoorOrganization>?> GetOrganizationsAsync(string owner, CancellationToken cancellationToken = default)
{
var queryMap = new QueryMapBuilder().Add("owner", owner).QueryMap;
var url = _options.GetActionUrl("get-organizations", queryMap);
return GetFromJsonAsync<IEnumerable<CasdoorOrganization>>(url, cancellationToken: cancellationToken);
var response = await GetFromJsonAsync<CasdoorResponse>(url, cancellationToken: cancellationToken);
return response.DeserializeData<IEnumerable<CasdoorOrganization>>();
}
}
8 changes: 6 additions & 2 deletions src/Casdoor.Client/Extensions/CasdoorResponseExtension.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 The Casdoor Authors. All Rights Reserved.
// Copyright 2023 The Casdoor Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,11 @@ public static class CasdoorResponseExtension
{
internal static T? DeserializeData<T>(this CasdoorResponse? response)
{
if (response?.Data is JsonElement element)
if (response?.Status != "ok")
{
throw new CasdoorApiException(response?.Msg);
}
if (response.Data is JsonElement element)
{
return element.Deserialize<T>();
}
Expand Down
Loading