Merge pull request #85 from appirio-tech/dev

eisbilir · web-flow · commit 7ead25c217ab · 2022-10-12T18:16:19.000+03:00
fix npe
diff --git a/src/main/java/com/appirio/tech/core/service/identity/resource/UserResource.java b/src/main/java/com/appirio/tech/core/service/identity/resource/UserResource.java
@@ -1643,7 +1643,7 @@ public ApiResponse updateUser2fa(
                 && user2faInDb.getDiceEnabled() != null && user2faInDb.getDiceEnabled() == true)) {
             throw new APIRuntimeException(SC_BAD_REQUEST, "You cannot disable mfa");
         }
-        if (user2fa.getMfaEnabled() && user2faInDb.getId() == null) {
+        if (user2faInDb.getId() == null) {
             if (userDao.getEmailCount(userId) > 1) {
                 throw new APIRuntimeException(SC_BAD_REQUEST, "You have multiple accounts registered with same email. Please contact with support.");
             }

Original file line number	Diff line number	Diff line change
`@@ -1643,7 +1643,7 @@ public ApiResponse updateUser2fa(`
`1643`	`1643`	`&& user2faInDb.getDiceEnabled() != null && user2faInDb.getDiceEnabled() == true)) {`
`1644`	`1644`	`throw new APIRuntimeException(SC_BAD_REQUEST, "You cannot disable mfa");`
`1645`	`1645`	`}`
`1646`		`- if (user2fa.getMfaEnabled() && user2faInDb.getId() == null) {`
	`1646`	`+ if (user2faInDb.getId() == null) {`
`1647`	`1647`	`if (userDao.getEmailCount(userId) > 1) {`
`1648`	`1648`	`throw new APIRuntimeException(SC_BAD_REQUEST, "You have multiple accounts registered with same email. Please contact with support.");`
`1649`	`1649`	`}`