Skip to content

[ID-819] Logout issue investigation #820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petyos merged 2 commits into from
Dec 8, 2025
Merged

[ID-819] Logout issue investigation #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dda6288
Update CHANGELOG.md
petyos Dec 8, 2025
387d9d2
Log elapsed grace period
petyos Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
"filename": "core/auth/apis.go",
"hashed_secret": "394e3412459f79523e12e1fa95a4cf141ccff122",
"is_verified": false,
"line_number": 2269
"line_number": 2270
}
],
"core/auth/auth.go": [
Expand Down Expand Up @@ -347,5 +347,5 @@
}
]
},
"generated_at": "2025-11-12T08:42:48Z"
"generated_at": "2025-12-08T09:23:30Z"
}
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased
### Changed
- Logout issue investigation [#819](https://github.com/rokwire/core-building-block/issues/819)

## [1.60.3] - 2025-12-01
### Changed
Expand Down
5 changes: 3 additions & 2 deletions core/auth/apis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,9 @@ func (a *Auth) Refresh(refreshToken string, apiKey string, clientVersion *string
}

//now check if we are in the grace period
if !loginSession.IsInRefreshGracePeriod(nil) {
l.Infof("not in grace period, so we cannot allow refresh - %s", masked)
inRefreshGracePeriod, elapsed := loginSession.IsInRefreshGracePeriod(nil)
if !inRefreshGracePeriod {
l.Infof("not in grace period as elapsed is %v, so we cannot allow refresh - %s", elapsed, masked)
return cleanup()
}

Expand Down
8 changes: 5 additions & 3 deletions core/model/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,12 @@ func (ls LoginSession) PreviousRefreshToken() (string, error) {
}

// IsInRefreshGracePeriod return whether the login session is in refresh grace period
func (ls LoginSession) IsInRefreshGracePeriod(now *time.Time) bool {
func (ls LoginSession) IsInRefreshGracePeriod(now *time.Time) (bool, time.Duration) {
loginsSessionsSetting := ls.AppOrg.LoginsSessionsSetting

gracePeriodPolicy := loginsSessionsSetting.RefreshGracePeriodPolicy
if !gracePeriodPolicy.Active {
return false
return false, 0
}

lastRefreshTime := ls.DateCreated
Expand All @@ -242,9 +242,11 @@ func (ls LoginSession) IsInRefreshGracePeriod(now *time.Time) bool {
currentTime := time.Now()
now = &currentTime
}
elapsed := (*now).Sub(lastRefreshTime)
gracePeriodDuration := time.Duration(gracePeriodPolicy.GracePeriod) * time.Second
gracePeriodEndTime := lastRefreshTime.Add(gracePeriodDuration)
return now.Before(gracePeriodEndTime)

return now.Before(gracePeriodEndTime), elapsed
}

// LogInfo gives the information appropriate to be logged for the session
Expand Down