Skip to content

Commit 115723b

Browse files
committed
fix: addressing nits
1 parent c1f8a4c commit 115723b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

packages/core/src/auth/sso/ssoAccessTokenProvider.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,16 @@ export abstract class SsoAccessTokenProvider {
119119
)
120120

121121
if (!data || !isExpired(data.token)) {
122-
getLogger().debug(`getToken: token is valid, returning cached token (key=${this.tokenCacheKey})`)
122+
getLogger().debug('Auth: token is valid, returning cached token (key=%s)', this.tokenCacheKey)
123123
return data?.token
124124
}
125125

126126
getLogger().info(
127-
`getToken: bearer token expired (expires at ${data.token.expiresAt}), attempting refresh (key=${this.tokenCacheKey})`
127+
`Auth: bearer token expired (expires at ${data.token.expiresAt}), attempting refresh (key=${this.tokenCacheKey})`
128128
)
129129

130130
if (data.registration && !isExpired(data.registration) && hasProps(data.token, 'refreshToken')) {
131-
getLogger().debug(`getToken: refresh token available, calling refreshToken() (key=${this.tokenCacheKey})`)
131+
getLogger().debug(`Auth: refresh token available, calling refreshToken() (key=${this.tokenCacheKey})`)
132132
// Check if a refresh is already in progress for this token
133133
const existingRefresh = SsoAccessTokenProvider.refreshPromises.get(this.tokenCacheKey)
134134
if (existingRefresh) {
@@ -209,17 +209,17 @@ export abstract class SsoAccessTokenProvider {
209209

210210
try {
211211
const clientInfo = selectFrom(registration, 'clientId', 'clientSecret')
212-
getLogger().debug(`refreshToken: calling OIDC createToken API (key=${this.tokenCacheKey})`)
212+
getLogger().debug(`Auth refreshToken: calling OIDC createToken API (key=${this.tokenCacheKey})`)
213213
const response = await this.oidc.createToken({ ...clientInfo, ...token, grantType: refreshGrantType })
214214

215-
getLogger().debug(`refreshToken: got response, now saving to cache...`)
215+
getLogger().debug(`Auth refreshToken: got response, now saving to cache...`)
216216

217217
const refreshed = this.formatToken(response, registration)
218218
getLogger().debug(`refreshToken: saving refreshed token to cache (key=${this.tokenCacheKey})`)
219219
await this.cache.token.save(this.tokenCacheKey, refreshed)
220220

221221
getLogger().info(
222-
`refreshToken: token refresh successful (key=${this.tokenCacheKey}, new expiry=${response.expiresAt})`
222+
`Auth refreshToken: token refresh successful (key=${this.tokenCacheKey}, new expiry=${response.expiresAt})`
223223
)
224224
telemetry.aws_refreshCredentials.emit({
225225
result: 'Succeeded',
@@ -230,7 +230,7 @@ export abstract class SsoAccessTokenProvider {
230230
return refreshed
231231
} catch (err) {
232232
getLogger().error(
233-
`refreshToken: token refresh failed (key=${this.tokenCacheKey}): ${getErrorMsg(err as unknown as Error)}`
233+
`Auth refreshToken: token refresh failed (key=${this.tokenCacheKey}): ${getErrorMsg(err as unknown as Error)}`
234234
)
235235

236236
if (err instanceof DiskCacheError) {
@@ -247,7 +247,7 @@ export abstract class SsoAccessTokenProvider {
247247
* or at least hint for them to provide the logs in a bug report.
248248
*/
249249
getLogger().warn(
250-
`refreshToken: DiskCacheError during refresh, not invalidating session (key=${this.tokenCacheKey})`
250+
`Auth refreshToken: DiskCacheError during refresh, not invalidating session (key=${this.tokenCacheKey})`
251251
)
252252
void DiskCacheErrorMessage.instance.showMessageThrottled(err)
253253
} else if (!isNetworkError(err)) {

0 commit comments

Comments
 (0)