community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix eval tenant creating issue

Browse Source
This commit is contained in:
Dharmakeerthi Lasantha 2023-04-04 17:47:57 +05:30
parent a9a7a03ebd
commit eeee0ed9d1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/otp/mgt/dao/impl/GenericOTPManagementDAOImpl.java
View File

@ -214,7 +214,7 @@ public class GenericOTPManagementDAOImpl extends AbstractDAOImpl implements OTPM
+ "SET " + "SET "
+ "OTP_TOKEN = ?, " + "OTP_TOKEN = ?, "
+ "CREATED_AT = ?, " + "CREATED_AT = ?, "
+ "IS_EXPIRED = false" + "IS_EXPIRED = false "
+ "WHERE ID = ?"; + "WHERE ID = ?";
try { try {

7
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/otp/mgt/service/OTPManagementServiceImpl.java
View File

@ -91,6 +91,7 @@ public class OTPManagementServiceImpl implements OTPManagementService {
public OneTimePinDTO getRenewedOtpByEmailAndMailType(String email, String emailType) throws OTPManagementException{ public OneTimePinDTO getRenewedOtpByEmailAndMailType(String email, String emailType) throws OTPManagementException{
OneTimePinDTO oneTimePinDTO; OneTimePinDTO oneTimePinDTO;
String newToken = UUID.randomUUID().toString();
try { try {
ConnectionManagerUtil.beginDBTransaction(); ConnectionManagerUtil.beginDBTransaction();
oneTimePinDTO = otpManagementDAO.getOtpDataByEmailAndMailType(email, emailType); oneTimePinDTO = otpManagementDAO.getOtpDataByEmailAndMailType(email, emailType);
@ -100,9 +101,9 @@ public class OTPManagementServiceImpl implements OTPManagementService {
log.error(msg); log.error(msg);
throw new OTPManagementException(msg); throw new OTPManagementException(msg);
} }
otpManagementDAO.restoreOneTimeToken(oneTimePinDTO.getId(), UUID.randomUUID().toString()); otpManagementDAO.restoreOneTimeToken(oneTimePinDTO.getId(), newToken);
ConnectionManagerUtil.commitDBTransaction(); ConnectionManagerUtil.commitDBTransaction();
return oneTimePinDTO;
} catch (DBConnectionException e) { } catch (DBConnectionException e) {
ConnectionManagerUtil.rollbackDBTransaction(); ConnectionManagerUtil.rollbackDBTransaction();
String msg = "Error occurred while getting database connection to validate the given email and email type."; String msg = "Error occurred while getting database connection to validate the given email and email type.";
@ -120,6 +121,8 @@ public class OTPManagementServiceImpl implements OTPManagementService {
} finally { } finally {
ConnectionManagerUtil.closeDBConnection(); ConnectionManagerUtil.closeDBConnection();
} }
oneTimePinDTO.setOtpToken(newToken);
return oneTimePinDTO;
} }
@Override @Override