Remove consentedToken column exist check #2941
There are no files selected for viewing
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
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 |
|---|---|---|
|
|
@@ -665,16 +665,15 @@ private static AccessTokenDO createNewTokenBean(OAuthAuthzReqMessageContext oaut | |
| newTokenBean.setGrantType(grantType); | ||
| /* If the existing token is available, the consented token flag will be extracted from that. Otherwise, | ||
| from the current grant. */ | ||
| if (existingTokenBean != null) { | ||
| newTokenBean.setIsConsentedToken(existingTokenBean.isConsentedToken()); | ||
Thisara-Welmilla marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } else { | ||
| if (OIDCClaimUtil.isConsentBasedClaimFilteringApplicable(grantType)) { | ||
| newTokenBean.setIsConsentedToken(true); | ||
Thisara-Welmilla marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
| oauthAuthzMsgCtx.setConsentedToken(newTokenBean.isConsentedToken()); | ||
|
|
||
| newTokenBean.setAccessToken(getNewAccessToken(oauthAuthzMsgCtx, oauthIssuerImpl)); | ||
| setRefreshTokenDetails(oauthAuthzMsgCtx, oAuthAppBean, existingTokenBean, newTokenBean, oauthIssuerImpl, | ||
| timestamp); | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -182,12 +182,7 @@ private void insertAccessToken(String accessToken, String consumerKey, AccessTok | |
|
|
||
| String sql; | ||
|
|
||
| sql = SQLQueries.INSERT_OAUTH2_ACCESS_TOKEN_WITH_IDP_NAME_WITH_CONSENTED_TOKEN; | ||
Thisara-Welmilla marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| sql = OAuth2Util.getTokenPartitionedSqlByUserStore(sql, userDomain); | ||
| String sqlAddScopes = OAuth2Util.getTokenPartitionedSqlByUserStore(SQLQueries.INSERT_OAUTH2_TOKEN_SCOPE, | ||
| userDomain); | ||
|
|
@@ -266,20 +261,12 @@ private void insertAccessToken(String accessToken, String consumerKey, AccessTok | |
| } | ||
| } | ||
|
|
||
| insertTokenPrepStmt.setString(20, Boolean.toString(accessTokenDO.isConsentedToken())); | ||
| insertTokenPrepStmt.setString(21, authenticatedIDP); | ||
| // Set tenant ID of the IDP by considering it is same as appTenantID. | ||
| insertTokenPrepStmt.setInt(22, appTenantId); | ||
| insertTokenPrepStmt.setString(23, getPersistenceProcessor().getProcessedClientId(consumerKey)); | ||
| insertTokenPrepStmt.setInt(24, appTenantId); | ||
|
|
||
| insertTokenPrepStmt.executeUpdate(); | ||
Thisara-Welmilla marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
|
|
@@ -560,9 +547,7 @@ public AccessTokenDO getLatestAccessToken(String consumerKey, AuthenticatedUser | |
| String subjectIdentifier = resultSet.getString(10); | ||
| String grantType = resultSet.getString(11); | ||
| String isConsentedToken = StringUtils.EMPTY; | ||
| isConsentedToken = resultSet.getString(12); | ||
| // data loss at dividing the validity period but can be neglected | ||
| AuthenticatedUser user = OAuth2Util.createAuthenticatedUser(authzUser, userDomain, | ||
| tenantDomain, authenticatedIDP); | ||
|
|
@@ -612,50 +597,30 @@ private String getLatestAccessTokenQuerySQL(Connection connection) throws SQLExc | |
|
|
||
| String sql; | ||
Thisara-Welmilla marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| if (connection.getMetaData().getDriverName().contains("MySQL") | ||
| || connection.getMetaData().getDriverName().contains(FrameworkConstants.H2) | ||
| || connection.getMetaData().getDriverName().contains(FrameworkConstants.MARIA_DB)) { | ||
| sql = SQLQueries. | ||
| GET_LATEST_ACCESS_TOKEN_WITH_CONSENTED_TOKEN_BY_CLIENT_ID_USER_SCOPE_IDP_NAME_MYSQL; | ||
| } else if (connection.getMetaData().getDatabaseProductName().contains("DB2")) { | ||
| sql = SQLQueries. | ||
| GET_LATEST_ACCESS_TOKEN_WITH_CONSENTED_TOKEN_BY_CLIENT_ID_USER_SCOPE_IDP_NAME_DB2SQL; | ||
| } else if (connection.getMetaData().getDriverName().contains("MS SQL")) { | ||
| sql = SQLQueries. | ||
| GET_LATEST_ACCESS_TOKEN_WITH_CONSENTED_TOKEN_BY_CLIENT_ID_USER_SCOPE_IDP_NAME_MSSQL; | ||
| } else if (connection.getMetaData().getDriverName().contains("Microsoft")) { | ||
| sql = SQLQueries. | ||
| GET_LATEST_ACCESS_TOKEN_WITH_CONSENTED_TOKEN_BY_CLIENT_ID_USER_SCOPE_IDP_NAME_MSSQL; | ||
| } else if (connection.getMetaData().getDriverName().contains("PostgreSQL")) { | ||
| sql = SQLQueries. | ||
| GET_LATEST_ACCESS_TOKEN_WITH_CONSENTED_TOKEN_BY_CLIENT_ID_USER_SCOPE_IDP_NAME_POSTGRESQL; | ||
| } else if (connection.getMetaData().getDriverName().contains("Informix")) { | ||
| // Driver name = "IBM Informix JDBC Driver for IBM Informix Dynamic Server" | ||
| sql = SQLQueries. | ||
| GET_LATEST_ACCESS_TOKEN_WITH_CONSENTED_TOKEN_BY_CLIENT_ID_USER_SCOPE_IDP_NAME_INFORMIX; | ||
| } else { | ||
| sql = SQLQueries. | ||
| GET_LATEST_ACCESS_TOKEN_WITH_CONSENTED_TOKEN_BY_CLIENT_ID_USER_SCOPE_IDP_NAME_ORACLE; | ||
| } | ||
|
|
||
| return sql; | ||
|
|
@@ -964,12 +929,8 @@ public AccessTokenDO getAccessToken(String accessTokenIdentifier, boolean includ | |
| if (includeExpired) { | ||
| sql = SQLQueries.RETRIEVE_ACTIVE_EXPIRED_ACCESS_TOKEN_IDP_NAME; | ||
| } else { | ||
| sql = SQLQueries.RETRIEVE_ACTIVE_ACCESS_TOKEN_IDP_NAME_WITH_CONSENTED_TOKEN; | ||
| isConsentedColumnDataFetched = true; | ||
|
|
||
| } | ||
|
|
||
|
|
@@ -2028,11 +1989,9 @@ public void invalidateAndCreateNewAccessToken(String oldAccessTokenId, String to | |
| boolean tokenUpdateSuccessful; | ||
| Connection connection = IdentityDatabaseUtil.getDBConnection(true); | ||
| try { | ||
| // Check whether the previous token is issued for a consent required grant or not. | ||
| boolean isPreviousTokenConsented = isPreviousTokenConsented(connection, oldAccessTokenId); | ||
| accessTokenDO.setIsConsentedToken(isPreviousTokenConsented); | ||
Thisara-Welmilla marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // update existing token as inactive | ||
| updateAccessTokenState(connection, oldAccessTokenId, tokenState, tokenStateId, userStoreDomain, grantType); | ||
|
|
||
|
|
@@ -3172,32 +3131,25 @@ public Set<AccessTokenDO> getAccessTokensByBindingRef(String bindingRef) throws | |
| public void updateTokenIsConsented(String tokenId, boolean isConsentedGrant) | ||
| throws IdentityOAuth2Exception { | ||
|
|
||
| if (log.isDebugEnabled()) { | ||
| log.debug("Updating the token's last issued grant type for token with id: " + tokenId + " to: " + | ||
| isConsentedGrant); | ||
| } | ||
|
|
||
| String sql = SQLQueries.UPDATE_TOKEN_CONSENTED_TOKEN; | ||
| try (Connection connection = IdentityDatabaseUtil.getDBConnection(true)) { | ||
| try (PreparedStatement prepStmt = connection.prepareStatement(sql)) { | ||
| prepStmt.setString(1, Boolean.toString(isConsentedGrant)); | ||
| prepStmt.setString(2, tokenId); | ||
| prepStmt.executeUpdate(); | ||
| IdentityDatabaseUtil.commitTransaction(connection); | ||
Thisara-Welmilla marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } catch (SQLException e) { | ||
| IdentityDatabaseUtil.rollbackTransaction(connection); // ToDo add the exception here | ||
| throw new IdentityOAuth2Exception("Error while updating the access token.", e); | ||
Thisara-Welmilla marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } catch (SQLException e) { | ||
| throw new IdentityOAuth2Exception("Error while updating Access Token with ID: " + tokenId + | ||
| " to last issued grant type : ", e); | ||
| } | ||
| } | ||
|
|
||
|
|
||
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 |
|---|---|---|
|
|
@@ -904,15 +904,6 @@ public class SQLQueries { | |
| + " TOKEN_BINDING_REF, AUTHORIZED_ORGANIZATION, CONSENTED_TOKEN) SELECT ?,?,ID,?,?,?,?,?,?,?,?,?,?,?,?,?," + | ||
| "?,?,?,?,? FROM IDN_OAUTH_CONSUMER_APPS WHERE CONSUMER_KEY=? AND TENANT_ID = ?"; | ||
|
|
||
| public static final String INSERT_OAUTH2_ACCESS_TOKEN_WITH_IDP_NAME_WITH_CONSENTED_TOKEN = | ||
| "INSERT INTO IDN_OAUTH2_ACCESS_TOKEN (ACCESS_TOKEN, REFRESH_TOKEN, CONSUMER_KEY_ID, AUTHZ_USER, " + | ||
| "TENANT_ID, USER_DOMAIN, TIME_CREATED, REFRESH_TOKEN_TIME_CREATED, VALIDITY_PERIOD, " + | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -470,7 +470,6 @@ protected void activate(ComponentContext context) { | |
| } | ||
|
|
||
| boolean isConsentedTokenColumnAvailable = checkConsentedTokenColumnAvailable(); | ||
Thisara-Welmilla marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (log.isDebugEnabled()) { | ||
| if (isConsentedTokenColumnAvailable) { | ||
| log.debug("CONSENTED_TOKEN column is available in IDN_OAUTH2_ACCESS_TOKEN table. Hence setting " + | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -206,11 +206,6 @@ public static boolean isConsentedTokenColumnEnabled() { | |
| return consentedTokenColumnEnabled; | ||
| } | ||
|
|
||
| public static RegistryService getRegistryService() { | ||
|
|
||
| return registryService; | ||
|
|
||
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.