diff --git a/bruno/VoD-System/Auth/Get Google Token.bru b/bruno/VoD-System/Auth/Get Google Token.bru index 0012a20..d810c7e 100644 --- a/bruno/VoD-System/Auth/Get Google Token.bru +++ b/bruno/VoD-System/Auth/Get Google Token.bru @@ -18,9 +18,9 @@ auth:oauth2 { refresh_token_url: client_id: {{google_client_id}} client_secret: {{google_secret}} - scope: profile email + scope: profile email openid state: - pkce: false + pkce: true credentials_placement: body credentials_id: credentials token_placement: header diff --git a/bruno/VoD-System/environments/local.bru b/bruno/VoD-System/environments/local.bru index 9792964..c121ca2 100644 --- a/bruno/VoD-System/environments/local.bru +++ b/bruno/VoD-System/environments/local.bru @@ -1,9 +1,8 @@ vars { base_url: http://localhost:8080/api/v1 - uuid: OswQZ9CRRRasMCMEWZ5uqw + uuid: } vars:secret [ google_client_id, - google_secret, - token + google_secret ] diff --git a/src/main/java/com/ddf/vodsystem/security/JwtService.java b/src/main/java/com/ddf/vodsystem/security/JwtService.java index a9c26e8..d9f860d 100644 --- a/src/main/java/com/ddf/vodsystem/security/JwtService.java +++ b/src/main/java/com/ddf/vodsystem/security/JwtService.java @@ -4,6 +4,7 @@ import java.util.Date; import com.auth0.jwt.JWT; import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; +import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.exceptions.TokenExpiredException; import com.auth0.jwt.interfaces.DecodedJWT; import org.springframework.beans.factory.annotation.Value; @@ -47,7 +48,7 @@ public class JwtService { } return jwt.getClaim(USER_ID_CLAIM).asLong(); - } catch (JwtException | IllegalArgumentException | TokenExpiredException ignored) { + } catch (JwtException | IllegalArgumentException | TokenExpiredException | JWTDecodeException ignored) { return null; } }