Compare commits

...

3 Commits

Author SHA1 Message Date
Oğuzhan Koral 11937ad7c9 Handle refresh token on catch (#265)
.NET Build and Publish / build (push) Has been cancelled
2025-03-24 13:39:23 +03:00
Adam Hathcock 8210fde69a Merge pull request #264 from specklesystems/oguzhan/parameter-for-app-id-secret
.NET Build and Publish / build (push) Has been cancelled
Chore(accounts): Extract hard coded app as parameter into function
2025-03-20 15:29:50 +00:00
oguzhankoral fa6f90621e Extract hard coded app as parameter into function 2025-03-20 18:18:23 +03:00
+30 -15
View File
@@ -399,8 +399,9 @@ public sealed class AccountManager(
/// <summary>
/// Refetches user and server info for each account
/// </summary>
/// <param name="app"> It is defaultAppId in the server. By default it is "sca" to not break existing parts that this function involves.</param>
/// <returns></returns>
public async Task UpdateAccounts(CancellationToken ct = default)
public async Task UpdateAccounts(CancellationToken ct = default, string app = "sca")
{
// need to ToList() the GetAccounts call or the UpdateObject call at the end of this method
// will not work because sqlite does not support concurrent db calls
@@ -415,16 +416,9 @@ public sealed class AccountManager(
//TODO: once we get a token expired exception from the server use that instead
if (userServerInfo?.activeUser == null || userServerInfo.serverInfo == null)
{
var tokenResponse = await GetRefreshedToken(account.refreshToken, url).ConfigureAwait(false);
userServerInfo = await GetUserServerInfo(tokenResponse.token, url, ct).ConfigureAwait(false);
if (userServerInfo?.activeUser == null || userServerInfo.serverInfo == null)
{
throw new SpeckleException("Could not refresh token");
}
account.token = tokenResponse.token;
account.refreshToken = tokenResponse.refreshToken;
// We were initially was handling refresh token here bc quite a while ago server was returning null
// for activeUser and serverInfo instead of throwing exception. In short, our logic moved into catch block to cover both.
throw new SpeckleException("Token is expired");
}
account.isOnline = true;
@@ -437,7 +431,7 @@ public sealed class AccountManager(
}
catch (Exception ex) when (!ex.IsFatal())
{
account.isOnline = false;
await RefreshAndSetAccountToken(account, app).ConfigureAwait(false);
}
ct.ThrowIfCancellationRequested();
@@ -445,6 +439,27 @@ public sealed class AccountManager(
}
}
/// <summary>
/// Mutates the account with new tokens.
/// </summary>
/// <param name="account"></param>
/// <param name="app"></param>
private async Task RefreshAndSetAccountToken(Account account, string app)
{
try
{
Uri url = new(account.serverInfo.url);
var tokenResponse = await GetRefreshedToken(account.refreshToken, url, app).ConfigureAwait(false);
account.token = tokenResponse.token;
account.refreshToken = tokenResponse.refreshToken;
account.isOnline = true;
}
catch (Exception ex) when (!ex.IsFatal())
{
account.isOnline = false;
}
}
/// <summary>
/// Removes an account
/// </summary>
@@ -766,7 +781,7 @@ public sealed class AccountManager(
}
}
private async Task<TokenExchangeResponse> GetRefreshedToken(string refreshToken, Uri server)
private async Task<TokenExchangeResponse> GetRefreshedToken(string refreshToken, Uri server, string app = "sca")
{
try
{
@@ -774,8 +789,8 @@ public sealed class AccountManager(
var body = new
{
appId = "sca",
appSecret = "sca",
appId = app,
appSecret = app,
refreshToken,
};