starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-02-07 05:39:46 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

az: rename state handlers from _XHelper to _RunXState

Browse Source
This commit is contained in:
Dustin L. Howett
2020-04-12 22:28:46 -07:00
committed by Dustin Howett
parent a1de8c37b0
commit 2fe5f66ea3
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -321,32 +321,32 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
// or allow them to login with a different account or allow them to remove the saved settings
case AzureState::AccessStored:
{
RETURN_IF_FAILED(_AccessHelper());
RETURN_IF_FAILED(_RunAccessState());
break;
}
// User has no saved connection settings or has opted to login with a different account
// Azure authentication happens here
case AzureState::DeviceFlow:
{
RETURN_IF_FAILED(_DeviceFlowHelper());
RETURN_IF_FAILED(_RunDeviceFlowState());
break;
}
// User has multiple tenants in their Azure account, they need to choose which one to connect to
case AzureState::TenantChoice:
{
RETURN_IF_FAILED(_TenantChoiceHelper());
RETURN_IF_FAILED(_RunTenantChoiceState());
break;
}
// Ask the user if they want to save these connection settings for future logins
case AzureState::StoreTokens:
{
RETURN_IF_FAILED(_StoreHelper());
RETURN_IF_FAILED(_RunStoreState());
break;
}
// Connect to Azure, we only get here once we have everything we need (tenantID, accessToken, refreshToken)
case AzureState::TermConnecting:
{
RETURN_IF_FAILED(_ConnectHelper());
RETURN_IF_FAILED(_RunConnectState());
break;
}
// We are connected, continuously read from the websocket until its closed
@@ -402,7 +402,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
// - S_FALSE if there are no stored credentials
// - S_OK if the user opts to login with a stored set of credentials or login with a different account
// - E_FAIL if the user closes the tab
HRESULT AzureConnection::_AccessHelper()
HRESULT AzureConnection::_RunAccessState()
{
bool oldVersionEncountered = false;
auto vault = PasswordVault();
@@ -545,7 +545,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
// Return value:
// - E_FAIL if the user closes the tab, does not authenticate in time or has no tenants in their Azure account
// - S_OK otherwise
HRESULT AzureConnection::_DeviceFlowHelper()
HRESULT AzureConnection::_RunDeviceFlowState()
{
// Initiate device code flow
const auto deviceCodeResponse = _GetDeviceCode();
@@ -594,7 +594,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
// Return value:
// - E_FAIL if the user closes the tab
// - S_OK otherwise
HRESULT AzureConnection::_TenantChoiceHelper()
HRESULT AzureConnection::_RunTenantChoiceState()
{
try
{
@@ -651,7 +651,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
// Return value:
// - E_FAIL if the user closes the tab
// - S_OK otherwise
HRESULT AzureConnection::_StoreHelper()
HRESULT AzureConnection::_RunStoreState()
{
_WriteStringWithNewline(_formatResWithColoredUserInputOptions(USES_RESOURCE(L"AzureStorePrompt"), USES_RESOURCE(L"AzureUserEntry_Yes"), USES_RESOURCE(L"AzureUserEntry_No")));
// Wait for user input
@@ -685,7 +685,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
// Return value:
// - E_FAIL if the user has not set up their cloud shell yet
// - S_OK after successful connection
HRESULT AzureConnection::_ConnectHelper()
HRESULT AzureConnection::_RunConnectState()
{
// Get user's cloud shell settings
const auto settingsResponse = _GetCloudShellUserSettings();

10
src/cascadia/TerminalConnection/AzureConnection.h
View File

@@ -47,11 +47,11 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
wil::unique_handle _hOutputThread;
DWORD _OutputThread();
HRESULT _AccessHelper();
HRESULT _DeviceFlowHelper();
HRESULT _TenantChoiceHelper();
HRESULT _StoreHelper();
HRESULT _ConnectHelper();
HRESULT _RunAccessState();
HRESULT _RunDeviceFlowState();
HRESULT _RunTenantChoiceState();
HRESULT _RunStoreState();
HRESULT _RunConnectState();
const utility::string_t _loginUri{ U("https://login.microsoftonline.com/") };
const utility::string_t _resourceUri{ U("https://management.azure.com/") };