Skip to content

Commit eeda1c1

Browse files
nremondtsuyoshizawa
authored andcommitted
Avoid response where 'expiresIn' could be negative (#107)
Thanks
1 parent 6ad6752 commit eeda1c1

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

scala-oauth2-core/src/main/scala/scalaoauth2/provider/DataHandler.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ trait DataHandler[U] extends AuthorizationHandler[U] with ProtectedResourceHandl
1818
* @param params Additional parameters to add information/restriction on given Access token.
1919
*/
2020
case class AccessToken(token: String, refreshToken: Option[String], scope: Option[String], lifeSeconds: Option[Long], createdAt: Date, params: Map[String, String] = Map.empty[String, String]) {
21-
def isExpired: Boolean = expirationTimeInMilis.exists { expTime =>
22-
expTime <= System.currentTimeMillis
23-
}
21+
def isExpired: Boolean = expiresIn.exists(_ < 0)
2422

25-
def expiresIn: Option[Long] = expirationTimeInMilis map { expTime =>
23+
val expiresIn: Option[Long] = expirationTimeInMilis map { expTime =>
2624
(expTime - System.currentTimeMillis) / 1000
2725
}
2826

0 commit comments

Comments
 (0)