nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 21:18:13 -05:00
Code

[PM-3570] Adjust refresh token lifetimes (#3697)

Browse Source 
* adjust refresh token lifetimes

* fix broken grant delete

* Update ApiClient.cs

---------

Co-authored-by: Matt Bishop <mbishop@bitwarden.com>
This commit is contained in:
Kyle Spearrin 2024-02-08 16:36:15 -05:00 committed by GitHub
parent 9ecc4794fe
commit 707347ce3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Identity/IdentityServer/StaticClientStore.cs
View File

@ -10,8 +10,8 @@ public class StaticClientStore
{ {
ApiClients = new List<Client> ApiClients = new List<Client>
{ {
new ApiClient(globalSettings, BitwardenClient.Mobile, 90, 1), new ApiClient(globalSettings, BitwardenClient.Mobile, 60, 1),
new ApiClient(globalSettings, BitwardenClient.Web, 30, 1), new ApiClient(globalSettings, BitwardenClient.Web, 7, 1),
new ApiClient(globalSettings, BitwardenClient.Browser, 30, 1), new ApiClient(globalSettings, BitwardenClient.Browser, 30, 1),
new ApiClient(globalSettings, BitwardenClient.Desktop, 30, 1), new ApiClient(globalSettings, BitwardenClient.Desktop, 30, 1),
new ApiClient(globalSettings, BitwardenClient.Cli, 30, 1), new ApiClient(globalSettings, BitwardenClient.Cli, 30, 1),

19
src/Infrastructure.EntityFramework/Auth/Repositories/GrantRepository.cs
View File

@ -19,11 +19,7 @@ public class GrantRepository : BaseEntityFrameworkRepository, IGrantRepository
using (var scope = ServiceScopeFactory.CreateScope()) using (var scope = ServiceScopeFactory.CreateScope())
{ {
var dbContext = GetDatabaseContext(scope); var dbContext = GetDatabaseContext(scope);
var query = from g in dbContext.Grants await dbContext.Grants.Where(g => g.Key == key).ExecuteDeleteAsync();
where g.Key == key
select g;
dbContext.Remove(query);
await dbContext.SaveChangesAsync();
} }
} }
@ -32,14 +28,11 @@ public class GrantRepository : BaseEntityFrameworkRepository, IGrantRepository
using (var scope = ServiceScopeFactory.CreateScope()) using (var scope = ServiceScopeFactory.CreateScope())
{ {
var dbContext = GetDatabaseContext(scope); var dbContext = GetDatabaseContext(scope);
var query = from g in dbContext.Grants await dbContext.Grants.Where(g =>
where g.SubjectId == subjectId && g.SubjectId == subjectId &&
g.ClientId == clientId && g.ClientId == clientId &&
g.SessionId == sessionId && g.SessionId == sessionId &&
g.Type == type g.Type == type).ExecuteDeleteAsync();
select g;
dbContext.Remove(query);
await dbContext.SaveChangesAsync();
} }
} }