Skip to content
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.

Sign up for GitHub

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

Update recovery portal to v2 #4200

Merged
merged 4 commits into from
Oct 18, 2023
Merged

Update recovery portal to v2 #4200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47d530a
Update recovery portal to v2
Rashmini Oct 11, 2023
d11175a
Update file names
Rashmini Oct 15, 2023
6c91fce
Bump framework version
Rashmini Oct 18, 2023
6957fe7
Add changeset
Rashmini Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/quick-kangaroos-drive.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@wso2is/identity-apps-core": patch
---

Update recovery portal for recovery v2 API
10 changes: 5 additions & 5 deletions ...-apps-core/apps/recovery-portal/src/main/webapp/password-recovery-with-claims-options.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.List" %>
<%@ page import="java.util.Map" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.api.PasswordRecoveryApiV1" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.model.passwordrecovery.v1.*" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.api.RecoveryApiV2" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.model.recovery.v2.*" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.api.UsernameRecoveryApi" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.model.*" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.IdentityManagementEndpointConstants" %>
Expand Down Expand Up @@ -93,13 +93,13 @@

RecoveryInitRequest recoveryInitRequest = new RecoveryInitRequest();
recoveryInitRequest.setClaims(claimDTOList);
PasswordRecoveryApiV1 passwordRecoveryApiV1 = new PasswordRecoveryApiV1();
RecoveryApiV2 recoveryApiV2 = new RecoveryApiV2();
try {
Map<String, String> requestHeaders = new HashedMap();
if (recaptchaResponse != null) {
requestHeaders.put("g-recaptcha-response", recaptchaResponse);
}
List<AccountRecoveryType> accountRecoveryTypes = passwordRecoveryApiV1.
List<AccountRecoveryType> accountRecoveryTypes = recoveryApiV2.
initiatePasswordRecovery(recoveryInitRequest, tenantDomain, requestHeaders);
if (accountRecoveryTypes == null) {
request.setAttribute("callback", callback);
Expand All @@ -108,7 +108,7 @@
response);
return;
}
IdentityManagementEndpointUtil.addReCaptchaHeaders(request, passwordRecoveryApiV1.getApiClient().getResponseHeaders());
IdentityManagementEndpointUtil.addReCaptchaHeaders(request, recoveryApiV2.getApiClient().getResponseHeaders());
for (AccountRecoveryType accountRecoveryType : accountRecoveryTypes) {
if (accountRecoveryType.getMode().equals("recoverWithNotifications")) {
isNotificationBasedRecoveryEnabled = true;
Expand Down
10 changes: 5 additions & 5 deletions identity-apps-core/apps/recovery-portal/src/main/webapp/recovery.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.IdentityManagementEndpointUtil" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.ApiException" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.api.UsernameRecoveryApi" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.api.PasswordRecoveryApiV1" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.api.RecoveryApiV2" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.model.Claim" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.model.UserClaim" %>
<%@ page import="org.wso2.carbon.user.core.util.UserCoreUtil" %>
Expand All @@ -35,7 +35,7 @@
<%@ page import="java.util.Map" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.model.Property" %>
<%@ page import="java.net.URLEncoder" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.model.passwordrecovery.v1.*" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.model.recovery.v2.*" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.PreferenceRetrievalClient" %>
<%@ page import="org.wso2.carbon.identity.mgt.endpoint.util.client.PreferenceRetrievalClientException" %>

Expand Down Expand Up @@ -165,14 +165,14 @@
String recoveryCode = request.getParameter("recoveryCode");
String notificationChannel = "";

PasswordRecoveryApiV1 passwordRecoveryApiV1 = new PasswordRecoveryApiV1();
RecoveryApiV2 recoveryApiV2 = new RecoveryApiV2();
if (recoveryOption.equals("SECURITY_QUESTIONS")) {
username = IdentityManagementEndpointUtil.getFullQualifiedUsername(username, tenantDomain, null);
request.setAttribute("callback", callback);
request.setAttribute("sessionDataKey", sessionDataKey);
request.setAttribute("username", username);
session.setAttribute("username", username);
IdentityManagementEndpointUtil.addReCaptchaHeaders(request, passwordRecoveryApiV1.
IdentityManagementEndpointUtil.addReCaptchaHeaders(request, recoveryApiV2.
getApiClient().getResponseHeaders());
request.getRequestDispatcher("challenge-question-request.jsp?username=" + username).forward(request,
response);
Expand All @@ -195,7 +195,7 @@
recoveryRequest.setRecoveryCode(recoveryCode);
try {
Map<String, String> requestHeaders = new HashedMap();
RecoveryResponse recoveryResponse = passwordRecoveryApiV1.recoverPassword(recoveryRequest,
RecoveryResponse recoveryResponse = recoveryApiV2.recoverPassword(recoveryRequest,
tenantDomain, requestHeaders);
notificationChannel = recoveryResponse.getNotificationChannel();
request.setAttribute("callback", callback);
Expand Down
2 changes: 1 addition & 1 deletion identity-apps-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@
<carbon.extension.identity.authenticator.version>3.0.0</carbon.extension.identity.authenticator.version>
<org.wso2.carbon.identity.association.account>5.1.5</org.wso2.carbon.identity.association.account>
<identity.extension.utils>1.0.8</identity.extension.utils>
<carbon.identity.framework.version>5.25.308</carbon.identity.framework.version>
<carbon.identity.framework.version>5.25.402</carbon.identity.framework.version>
<carbon.identity.framework.imp.pkg.version.range>[5.0.0, 7.0.0]</carbon.identity.framework.imp.pkg.version.range>
<identity.organization.management.core.service.version>1.0.0
</identity.organization.management.core.service.version>
Expand Down