starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-02-10 21:24:22 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

az: show more tenant info

Browse Source 
Switch to 2020 tenant API; use defaultDomain; put defaultDomain into the
display name.

Consider: not showing the tenant GUID at all?
This commit is contained in:
Dustin L. Howett
2020-04-11 23:07:35 -07:00
committed by Dustin Howett
parent 61f06e7aa5
commit b5e16c27ca
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cascadia/TerminalConnection/AzureConnection.cpp
View File

@@ -284,7 +284,21 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
static std::tuple<utility::string_t, utility::string_t> _crackTenant(const json::value& tenant)
{
auto tenantId{ tenant.at(L"tenantId").as_string() };
std::wstring displayName{ tenant.has_string_field(L"displayName") ? tenant.at(L"displayName").as_string() : static_cast<std::wstring>(RS_(L"AzureUnknownTenantName")) };
std::wstring displayName{};
if (tenant.has_string_field(L"displayName"))
{
displayName = tenant.at(L"displayName").as_string();
}
else
{
displayName = std::wstring{ RS_(L"AzureUnknownTenantName") };
}
if (tenant.has_string_field(L"defaultDomain"))
{
auto defaultDomain{ tenant.at(L"defaultDomain").as_string() };
displayName = wil::str_printf<std::wstring>(L"%.*s, %.*s", displayName.size(), displayName.data(), defaultDomain.size(), defaultDomain.data());
}
return { tenantId, displayName };
}
@@ -832,7 +846,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
// Initialize the request
http_request tenantRequest(L"GET");
tenantRequest.set_request_uri(L"tenants?api-version=2018-01-01");
tenantRequest.set_request_uri(L"tenants?api-version=2020-01-01");
_HeaderHelper(tenantRequest);
// Send the request and return the response as a json value