Fix the issue https://github.com/wso2/product-is/issues/21192 #2587
+164
−24
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,6 +35,9 @@ | |
| import java.sql.Timestamp; | ||
| import java.util.Date; | ||
|
|
||
| import static org.wso2.carbon.identity.oauth2.device.constants.Constants.PENDING; | ||
Thumimku marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| import static org.wso2.carbon.identity.oauth2.device.constants.Constants.SLOW_DOWN; | ||
|
|
||
| /** | ||
| * Device flow grant type for Identity Server. | ||
| */ | ||
|
|
@@ -47,11 +50,11 @@ public boolean validateGrant(OAuthTokenReqMessageContext oAuthTokenReqMessageCon | |
| IdentityOAuth2Exception { | ||
|
|
||
| super.validateGrant(oAuthTokenReqMessageContext); | ||
| RequestParameter[] parameters = oAuthTokenReqMessageContext.getOauth2AccessTokenReqDTO().getRequestParameters(); | ||
| String deviceCode = null; | ||
| String clientId = oAuthTokenReqMessageContext.getOauth2AccessTokenReqDTO().getClientId(); | ||
| String deviceStatus; | ||
| DeviceFlowDO deviceFlowDO = null; | ||
|
|
||
| for (RequestParameter parameter : parameters) { | ||
| if (Constants.DEVICE_CODE.equals(parameter.getKey()) && StringUtils.isNotBlank(parameter.getValue()[0])) { | ||
|
|
@@ -64,32 +67,56 @@ public boolean validateGrant(OAuthTokenReqMessageContext oAuthTokenReqMessageCon | |
| log.debug("Getting ready to release token for device_code: " + deviceCode); | ||
| } | ||
|
|
||
| try { | ||
| deviceFlowDO = DeviceFlowPersistenceFactory.getInstance().getDeviceFlowDAO() | ||
| .getAuthenticationDetails(deviceCode, clientId); | ||
| deviceStatus = deviceFlowDO.getStatus(); | ||
| deviceFlowDO.setDeviceCode(deviceCode); | ||
| setLastPollTime(deviceCode); | ||
| } catch (IdentityOAuth2Exception e) { | ||
| deviceStatus = e.getMessage(); | ||
|
There was a problem hiding this comment. we don't need this line right? There was a problem hiding this comment. As we need to pass it here, https://github.com/wso2-extensions/identity-inbound-auth-oauth/pull/2587/files#diff-04c8d9d96bce4315cd10faf6cee77e67804ef26f765ac63eda3f36ab5767b945R80 we need to specify here. There was a problem hiding this comment. this catch block don't get execute after line 76, cause |
||
| setLastPollTime(deviceCode); | ||
| handleInvalidRequests(deviceStatus); | ||
| } | ||
|
|
||
| handleInvalidRequests(deviceStatus, deviceFlowDO); | ||
| if (Constants.AUTHORIZED.equals(deviceStatus)) { | ||
| DeviceFlowPersistenceFactory.getInstance().getDeviceFlowDAO().setDeviceCodeExpired(deviceCode, | ||
| Constants.EXPIRED); | ||
| setPropertiesForTokenGeneration(oAuthTokenReqMessageContext, deviceFlowDO); | ||
| } | ||
| return true; | ||
Thumimku marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| private void setLastPollTime(String deviceCode) | ||
| throws IdentityOAuth2Exception { | ||
|
|
||
| Date date = new Date(); | ||
| Timestamp newPollTime = new Timestamp(date.getTime()); | ||
| DeviceFlowPersistenceFactory.getInstance().getDeviceFlowDAO().setLastPollTime(deviceCode, newPollTime); | ||
| } | ||
|
|
||
| private void handleInvalidRequests(String deviceStatus, DeviceFlowDO deviceFlowDO) | ||
| throws IdentityOAuth2Exception { | ||
|
|
||
| Date date = new Date(); | ||
| if (Constants.NOT_EXIST.equals(deviceStatus)) { | ||
| throw new IdentityOAuth2Exception(DeviceErrorCodes.INVALID_REQUEST, DeviceErrorCodes.INVALID_REQUEST); | ||
| } else if (Constants.EXPIRED.equals(deviceStatus) || isExpiredDeviceCode(deviceFlowDO, date)) { | ||
| throw new IdentityOAuth2Exception(DeviceErrorCodes.SubDeviceErrorCodes.EXPIRED_TOKEN, | ||
| DeviceErrorCodes.SubDeviceErrorCodesDescriptions.EXPIRED_TOKEN); | ||
| } | ||
| } | ||
|
|
||
| private void handleInvalidRequests(String deviceStatus) throws IdentityOAuth2Exception { | ||
|
|
||
| if (PENDING.equals(deviceStatus)) { | ||
| throw new IdentityOAuth2Exception(DeviceErrorCodes.SubDeviceErrorCodes.AUTHORIZATION_PENDING, | ||
| DeviceErrorCodes.SubDeviceErrorCodesDescriptions.AUTHORIZATION_PENDING); | ||
| } else if (SLOW_DOWN.equals(deviceStatus)) { | ||
| throw new IdentityOAuth2Exception(DeviceErrorCodes.SubDeviceErrorCodes.SLOW_DOWN, | ||
| DeviceErrorCodes.SubDeviceErrorCodesDescriptions.SLOW_DOWN); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We already imported
in line 36.
We don't need to import this static constant, we can directly use
Constants.SLOW_DOWN