SOAPUIOS-194-Adding OAuth 1 support. #231
Merged
Conversation
This file contains 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
…//github.com/SmartBear/soapui into SOAPUIOS-194-Add-OAuth1-support
|
@antone-sb any objections? |
antone-sb
suggested changes
Nov 17, 2016
| @@ -40,7 +40,7 @@ public GetOAuthAccessTokenAction(OAuth2Profile target) { | |||
| public void actionPerformed(ActionEvent event) { | |||
| try { | |||
| getOAuthClientFacade().requestAccessToken(target); | |||
| } catch (InvalidOAuth2ParametersException e) { | |||
| } catch (InvalidOAuthParametersException e) { | |||
| UISupport.showErrorMessage("Invalid OAuth 2 parameters: " + e.getMessage()); | |||
There was a problem hiding this comment.
All these string was moved to bundle.
| @@ -40,7 +40,7 @@ public GetOAuthAccessTokenAction(OAuth2Profile target) { | |||
| public void actionPerformed(ActionEvent event) { | |||
| try { | |||
| getOAuthClientFacade().requestAccessToken(target); | |||
| } catch (InvalidOAuth2ParametersException e) { | |||
| } catch (InvalidOAuthParametersException e) { | |||
| UISupport.showErrorMessage("Invalid OAuth 2 parameters: " + e.getMessage()); | |||
| } catch (Exception e) { | |||
| SoapUI.logError(e, "Error retrieving OAuth 2 access token"); | |||
| @@ -40,7 +40,7 @@ public RefreshOAuthAccessTokenAction(OAuth2Profile profile) { | |||
| public void actionPerformed(ActionEvent event) { | |||
| try { | |||
| getOAuthClientFacade().refreshAccessToken(profile); | |||
| } catch (InvalidOAuth2ParametersException e) { | |||
| } catch (InvalidOAuthParametersException e) { | |||
| UISupport.showErrorMessage("Invalid OAuth2 parameters: " + e.getMessage()); | |||
| } catch (Exception e) { | |||
| SoapUI.logError(e, "Error refreshing OAuth 2 access token"); | |||
| @@ -33,6 +33,7 @@ | |||
|
|
|||
| private WebViewBasedBrowserComponent browserComponent; | |||
| private JFrame popupWindow; | |||
| private boolean modal = false; | |||
There was a problem hiding this comment.
Why do you need this variable? It has a setter and this setter is called somewhere, but I don't see how it affects anything in this class.
There was a problem hiding this comment.
This option was deleted.
| return; | ||
| } | ||
| if (getOAuth1ProfileContainer().getOAuth1ProfileNameList().contains(profileName)) { | ||
| UISupport.showErrorMessage("There is already a profile named '" + profileName + "'"); |
| if (!CredentialsConfig.AuthType.O_AUTH_2_0.equals(authType)) { | ||
| authTypeEnum = CredentialsConfig.AuthType.O_AUTH_2_0; | ||
| } else if (CredentialsConfig.AuthType.O_AUTH_1_0.toString().equals(authType)) { | ||
| profileName = dialog.getValue(AuthorizationTypeForm.OAUTH2_PROFILE_NAME_FIELD); |
There was a problem hiding this comment.
Maybe remove 2 from the field name? Looks confusing.
…es. Moving string constants to bundle.
antone-sb
approved these changes
Nov 18, 2016
pavel-shelentsov
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
https://smartbear.atlassian.net/browse/SOAPUIOS-194