From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/security/model/token/RefreshToken.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/security/model/token/RefreshToken.java b/src/main/java/com/moral/security/model/token/RefreshToken.java
index 0f67cd0..1fe5a83 100644
--- a/src/main/java/com/moral/security/model/token/RefreshToken.java
+++ b/src/main/java/com/moral/security/model/token/RefreshToken.java
@@ -30,7 +30,6 @@
* @param signingKey
*
* @throws BadCredentialsException
- * @throws JwtExpiredTokenException
*
* @return
*/
@@ -38,7 +37,7 @@
Jws<Claims> claims = token.parseClaims(signingKey);
List<String> scopes = claims.getBody().get("scopes", List.class);
- if (scopes == null || scopes.isEmpty()
+ if (scopes == null || scopes.isEmpty()
|| !scopes.stream().filter(scope -> Scopes.REFRESH_TOKEN.authority().equals(scope)).findFirst().isPresent()) {
return Optional.empty();
}
--
Gitblit v1.8.0