Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-05-30 16:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove OAuth2ClientException

Browse Source
This commit is contained in:
Joe Grandja 2018-09-06 13:08:17 -04:00 committed by Rob Winch
parent b3282957a8
commit e56c048db3
2 changed files with 6 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/ClientAuthorizationRequiredException.java
View File

@ -15,6 +15,8 @@
*/
package org.springframework.security.oauth2.client;
import org.springframework.security.oauth2.core.OAuth2AuthorizationException;
import org.springframework.security.oauth2.core.OAuth2Error;
import org.springframework.util.Assert;
/**
@ -25,7 +27,8 @@ import org.springframework.util.Assert;
* @since 5.1
* @see OAuth2AuthorizedClient
*/
public class ClientAuthorizationRequiredException extends OAuth2ClientException {
public class ClientAuthorizationRequiredException extends OAuth2AuthorizationException {
private static final String CLIENT_AUTHORIZATION_REQUIRED_ERROR_CODE = "client_authorization_required";
private final String clientRegistrationId;
/**
@ -34,17 +37,8 @@ public class ClientAuthorizationRequiredException extends OAuth2ClientException
* @param clientRegistrationId the identifier for the client's registration
*/
public ClientAuthorizationRequiredException(String clientRegistrationId) {
this(clientRegistrationId, "Authorization required for Client Registration Id: " + clientRegistrationId);
}
/**
* Constructs a {@code ClientAuthorizationRequiredException} using the provided parameters.
*
* @param clientRegistrationId the identifier for the client's registration
* @param message the detail message
*/
public ClientAuthorizationRequiredException(String clientRegistrationId, String message) {
super(message);
super(new OAuth2Error(CLIENT_AUTHORIZATION_REQUIRED_ERROR_CODE,
"Authorization required for Client Registration Id: " + clientRegistrationId, null));
Assert.hasText(clientRegistrationId, "clientRegistrationId cannot be empty");
this.clientRegistrationId = clientRegistrationId;
}

44
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/OAuth2ClientException.java
View File

@ -1,44 +0,0 @@
/*
* Copyright 2002-2018 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
*
* http://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.client;
/**
* Base exception for OAuth 2.0 Client related errors.
*
* @author Joe Grandja
* @since 5.1
*/
public class OAuth2ClientException extends RuntimeException {
/**
* Constructs an {@code OAuth2ClientException} using the provided parameters.
*
* @param message the detail message
*/
public OAuth2ClientException(String message) {
super(message);
}
/**
* Constructs an {@code OAuth2ClientException} using the provided parameters.
*
* @param message the detail message
* @param cause the root cause
*/
public OAuth2ClientException(String message, Throwable cause) {
super(message, cause);
}
}