Don't update tokens when it's not required

stanriders · Jul 1, 2024 · bd2f34b · bd2f34b
1 parent a2c13c7
commit bd2f34b
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 13 deletions.
diff --git a/backend/Mutualify/Controllers/ApiController.cs b/backend/Mutualify/Controllers/ApiController.cs
@@ -86,7 +86,7 @@ public async Task RefreshFriends()
         {
             try
             {
-                await _usersService.Update(_claim);
+                await _usersService.Update(_claim, true);
                 await _relationsService.UpdateRelations(_claim);
             }
             catch (HttpRequestException e)

diff --git a/backend/Mutualify/Jobs/UserRelationsUpdateJob.cs b/backend/Mutualify/Jobs/UserRelationsUpdateJob.cs
@@ -64,7 +64,7 @@ public async Task Run(PerformContext context, CancellationToken token)
                     _logger.LogInformation("[{JobId}] ({Current}/{Total}) Updating {Id}...", jobId, i+1,
                         userUpdateQueue.Count, userId);
 
-                await _usersService.Update(userId);
+                await _usersService.Update(userId, true);
                 await _relationsService.UpdateRelations(userId);
             }
             catch (AggregateException e)

diff --git a/backend/Mutualify/Jobs/UserUpdateJob.cs b/backend/Mutualify/Jobs/UserUpdateJob.cs
@@ -46,6 +46,7 @@ public async Task Run(PerformContext context, CancellationToken token)
 
         var userUpdateQueue = await _databaseContext.Users.AsNoTracking()
             .Where(x=> x.UpdatedAt == null || x.UpdatedAt < DateTime.UtcNow.AddDays(-1))
+            .OrderByDescending(x=> x.FollowerCount)
             .Select(x => x.Id)
             .ToListAsync(cancellationToken: token);
 
@@ -68,7 +69,7 @@ public async Task Run(PerformContext context, CancellationToken token)
                 }
 #endif
 
-                await _usersService.Update(userId);
+                await _usersService.Update(userId, false);
             }
             catch (AggregateException e)
             {

diff --git a/backend/Mutualify/Services/Interfaces/IUsersService.cs b/backend/Mutualify/Services/Interfaces/IUsersService.cs
@@ -10,7 +10,7 @@ public interface IUsersService
         Task<StatsContract> GetStats();
         Task<RankingsContract> GetFollowerLeaderboard(int offset);
         Task<int> GetFollowerLeaderboardRanking(int userId);
-        Task Update(int userId);
+        Task Update(int userId, bool useTokens);
         Task ToggleFriendlistAccess(int userId, bool allow);
     }
 }
diff --git a/backend/Mutualify/Services/UsersService.cs b/backend/Mutualify/Services/UsersService.cs
@@ -3,6 +3,7 @@
 using Mutualify.Database;
 using Mutualify.Database.Models;
 using Mutualify.OsuApi.Interfaces;
+using Mutualify.OsuApi.Models;
 using Mutualify.Services.Interfaces;
 
 namespace Mutualify.Services
@@ -95,7 +96,7 @@ public async Task<int> GetFollowerLeaderboardRanking(int userId)
                 .SingleOrDefaultAsync();
         }
 
-        public async Task Update(int userId)
+        public async Task Update(int userId, bool useTokens)
         {
             var user = await _databaseContext.Users.FindAsync(userId);
             if (user is null)
@@ -105,16 +106,36 @@ public async Task Update(int userId)
                 return;
             }
 
-            var token = await _databaseContext.Tokens.FindAsync(userId);
-            if (token is not null && token.ExpiresOn <= DateTime.UtcNow.AddDays(1))
-            {
-                // refresh close-to-expiration tokens
-                _logger.LogInformation("User {UserId} tokens are close to expiration ({ExpiresOn} <= {Threshold}), updating...", token.UserId, token.ExpiresOn, DateTime.UtcNow.AddDays(1));
+            OsuUser? osuUser;
 
-                await RefreshToken(token);
+            // todo: refactor into a separate method?
+            if (useTokens)
+            {
+                var token = await _databaseContext.Tokens.FindAsync(userId);
+                if (token is not null)
+                {
+                    if (token.ExpiresOn <= DateTime.UtcNow.AddDays(1))
+                    {
+                        // refresh close-to-expiration tokens
+                        _logger.LogInformation(
+                            "User {UserId} tokens are close to expiration ({ExpiresOn} <= {Threshold}), updating...",
+                            token.UserId, token.ExpiresOn, DateTime.UtcNow.AddDays(1));
+
+                        await RefreshToken(token);
+                    }
+                    osuUser = await _osuApiDataService.GetUser(token.AccessToken);
+                }
+                else
+                {
+                    // no token - update using app's token
+                    osuUser = await _osuApiDataService.GetUser(userId);
+                }
+            }
+            else
+            {
+                osuUser = await _osuApiDataService.GetUser(userId);
             }
 
-            var osuUser = await _osuApiDataService.GetUser(userId);
             if (osuUser is null)
             {
                 return;
@@ -155,7 +176,7 @@ private async Task RefreshToken(Token token)
                 token.ExpiresOn = DateTime.UtcNow.AddSeconds(newToken.ExpiresIn);
 
                 _databaseContext.Tokens.Update(token);
-                _logger.LogInformation("Updated tokens for user {UserId}", token.UserId);
+                _logger.LogInformation("Updated tokens for user {UserId}, new token expiration: {ExpiresOn}", token.UserId, token.ExpiresOn);
             }
             else
             {