Skip to content

Commit 50628fd

Browse files
authored
Fix auto-initialisation logic of credentials (#38)
1 parent c0357ef commit 50628fd

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

apis/platform_common/Credential.cs

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,20 @@ public PlatformRefreshTokenCredential(IAuthorizationCodeFlow flow, string userId
106106

107107
private static PlatformRefreshTokenCredential GetTokenCredentialAutomatically()
108108
{
109+
var serverRefreshToken = Environment.GetEnvironmentVariable("IMPROBABLE_PLATFORM_REFRESH_TOKEN");
110+
if (serverRefreshToken != "")
111+
{
112+
var clientSecrets = new ClientSecrets
113+
{
114+
ClientId = Environment.GetEnvironmentVariable("IMPROBABLE_CLIENT_ID"),
115+
ClientSecret = Environment.GetEnvironmentVariable("IMPROBABLE_CLIENT_SECRET")
116+
};
117+
if (clientSecrets.ClientId != "" && clientSecrets.ClientSecret != "")
118+
{
119+
return new PlatformRefreshTokenCredential(serverRefreshToken, null, null, null, clientSecrets);
120+
}
121+
}
122+
109123
var possibleTokenFiles = new[]
110124
{
111125
Path.Combine(Environment.GetEnvironmentVariable("HOME") ?? "", ".improbable/oauth2/oauth2_refresh_token"),
@@ -126,21 +140,6 @@ private static PlatformRefreshTokenCredential GetTokenCredentialAutomatically()
126140
}
127141
}
128142

129-
// None of the possible token files exists. Last fallback is the credentials set in the environment of server workers.
130-
var serverRefreshToken = Environment.GetEnvironmentVariable("IMPROBABLE_PLATFORM_REFRESH_TOKEN");
131-
if (serverRefreshToken != "")
132-
{
133-
var clientSecrets = new ClientSecrets
134-
{
135-
ClientId = Environment.GetEnvironmentVariable("IMPROBABLE_CLIENT_ID"),
136-
ClientSecret = Environment.GetEnvironmentVariable("IMPROBABLE_CLIENT_SECRET")
137-
};
138-
if (clientSecrets.ClientId != "" && clientSecrets.ClientSecret != "")
139-
{
140-
var credentials = new PlatformRefreshTokenCredential(serverRefreshToken, null, null, null, clientSecrets);
141-
}
142-
}
143-
144143
// Fail if no form of credentials could be found.
145144
throw new NoRefreshTokenFoundException(RefreshTokenNotFoundMessage);
146145
}

0 commit comments

Comments
 (0)