-
Notifications
You must be signed in to change notification settings - Fork 6.1k
Make OAuth2AccessToken converters public #7815
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.
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
Closed
nkonev
wants to merge
1
commit into
spring-projects:master
from
nkonev:set-default-bearer-token-type
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
84 changes: 84 additions & 0 deletions
84
...ringframework/security/oauth2/core/http/converter/OAuth2AccessTokenResponseConverter.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Copyright 2002-2020 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.springframework.security.oauth2.core.http.converter; | ||
|
|
||
| import org.springframework.core.convert.converter.Converter; | ||
| import org.springframework.security.oauth2.core.OAuth2AccessToken; | ||
| import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse; | ||
| import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames; | ||
| import org.springframework.util.StringUtils; | ||
|
|
||
| import java.util.*; | ||
|
|
||
| /** | ||
| * A {@link Converter} that converts the provided | ||
| * OAuth 2.0 Access Token Response parameters to an {@link OAuth2AccessTokenResponse}. | ||
| * | ||
| * @author Joe Grandja | ||
| * @author Nikita Konev | ||
| * @since 5.3 | ||
| */ | ||
| public final class OAuth2AccessTokenResponseConverter implements Converter<Map<String, String>, OAuth2AccessTokenResponse> { | ||
| private static final Set<String> TOKEN_RESPONSE_PARAMETER_NAMES = new HashSet<>(Arrays.asList( | ||
| OAuth2ParameterNames.ACCESS_TOKEN, | ||
| OAuth2ParameterNames.EXPIRES_IN, | ||
| OAuth2ParameterNames.REFRESH_TOKEN, | ||
| OAuth2ParameterNames.SCOPE, | ||
| OAuth2ParameterNames.TOKEN_TYPE | ||
| )); | ||
|
|
||
| @Override | ||
| public OAuth2AccessTokenResponse convert(Map<String, String> tokenResponseParameters) { | ||
| String accessToken = tokenResponseParameters.get(OAuth2ParameterNames.ACCESS_TOKEN); | ||
|
|
||
| OAuth2AccessToken.TokenType accessTokenType = null; | ||
| if (OAuth2AccessToken.TokenType.BEARER.getValue().equalsIgnoreCase( | ||
| tokenResponseParameters.get(OAuth2ParameterNames.TOKEN_TYPE))) { | ||
| accessTokenType = OAuth2AccessToken.TokenType.BEARER; | ||
| } | ||
|
|
||
| long expiresIn = 0; | ||
| if (tokenResponseParameters.containsKey(OAuth2ParameterNames.EXPIRES_IN)) { | ||
| try { | ||
| expiresIn = Long.parseLong(tokenResponseParameters.get(OAuth2ParameterNames.EXPIRES_IN)); | ||
| } catch (NumberFormatException ex) { | ||
| } | ||
| } | ||
|
|
||
| Set<String> scopes = Collections.emptySet(); | ||
| if (tokenResponseParameters.containsKey(OAuth2ParameterNames.SCOPE)) { | ||
| String scope = tokenResponseParameters.get(OAuth2ParameterNames.SCOPE); | ||
| scopes = new HashSet<>(Arrays.asList(StringUtils.delimitedListToStringArray(scope, " "))); | ||
| } | ||
|
|
||
| String refreshToken = tokenResponseParameters.get(OAuth2ParameterNames.REFRESH_TOKEN); | ||
|
|
||
| Map<String, Object> additionalParameters = new LinkedHashMap<>(); | ||
| for (Map.Entry<String, String> entry : tokenResponseParameters.entrySet()) { | ||
| if (!TOKEN_RESPONSE_PARAMETER_NAMES.contains(entry.getKey())) { | ||
| additionalParameters.put(entry.getKey(), entry.getValue()); | ||
| } | ||
| } | ||
|
|
||
| return OAuth2AccessTokenResponse.withToken(accessToken) | ||
| .tokenType(accessTokenType) | ||
| .expiresIn(expiresIn) | ||
| .scopes(scopes) | ||
| .refreshToken(refreshToken) | ||
| .additionalParameters(additionalParameters) | ||
| .build(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
...ork/security/oauth2/core/http/converter/OAuth2AccessTokenResponseParametersConverter.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Copyright 2002-2020 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.springframework.security.oauth2.core.http.converter; | ||
|
|
||
| import org.springframework.core.convert.converter.Converter; | ||
| import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse; | ||
| import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames; | ||
| import org.springframework.util.CollectionUtils; | ||
| import org.springframework.util.StringUtils; | ||
|
|
||
| import java.time.Instant; | ||
| import java.time.temporal.ChronoUnit; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * A {@link Converter} that converts the provided {@link OAuth2AccessTokenResponse} | ||
| * to a {@code Map} representation of the OAuth 2.0 Access Token Response parameters. | ||
| * | ||
| * @author Joe Grandja | ||
| * @author Nikita Konev | ||
| * @since 5.3 | ||
| */ | ||
| public final class OAuth2AccessTokenResponseParametersConverter implements Converter<OAuth2AccessTokenResponse, Map<String, String>> { | ||
|
|
||
| @Override | ||
| public Map<String, String> convert(OAuth2AccessTokenResponse tokenResponse) { | ||
| Map<String, String> parameters = new HashMap<>(); | ||
|
|
||
| long expiresIn = -1; | ||
| if (tokenResponse.getAccessToken().getExpiresAt() != null) { | ||
| expiresIn = ChronoUnit.SECONDS.between(Instant.now(), tokenResponse.getAccessToken().getExpiresAt()); | ||
| } | ||
|
|
||
| parameters.put(OAuth2ParameterNames.ACCESS_TOKEN, tokenResponse.getAccessToken().getTokenValue()); | ||
| parameters.put(OAuth2ParameterNames.TOKEN_TYPE, tokenResponse.getAccessToken().getTokenType().getValue()); | ||
| parameters.put(OAuth2ParameterNames.EXPIRES_IN, String.valueOf(expiresIn)); | ||
| if (!CollectionUtils.isEmpty(tokenResponse.getAccessToken().getScopes())) { | ||
| parameters.put(OAuth2ParameterNames.SCOPE, | ||
| StringUtils.collectionToDelimitedString(tokenResponse.getAccessToken().getScopes(), " ")); | ||
| } | ||
| if (tokenResponse.getRefreshToken() != null) { | ||
| parameters.put(OAuth2ParameterNames.REFRESH_TOKEN, tokenResponse.getRefreshToken().getTokenValue()); | ||
| } | ||
| if (!CollectionUtils.isEmpty(tokenResponse.getAdditionalParameters())) { | ||
| for (Map.Entry<String, Object> entry : tokenResponse.getAdditionalParameters().entrySet()) { | ||
| parameters.put(entry.getKey(), entry.getValue().toString()); | ||
| } | ||
| } | ||
|
|
||
| return parameters; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.