customRedis;
+
+ public void putValue(String key, String value) {
+ customRedis.opsForValue().set(key, value);
+ }
+
+ public void putValueWithExpireTime(String key, String value, long timeout, TimeUnit unit) {
+ RedisClientInfo redisClientInfo = customRedis.getClientList().get(0);
+
+ logger.info(">>>>>>>>>>>>>>> redis client info: " + redisClientInfo);
+ logger.info(">>>>>>>>>>>>>>>>> address: " + redisClientInfo.getAddressPort() );
+
+ customRedis.opsForValue().set(key, value, timeout, unit);
+ }
+
+ public String getValue(String key) {
+ return customRedis.opsForValue().get(key);
+ }
+}
diff --git a/java/user-management/src/main/java/dev/sunbirdrc/utils/UserConstant.java b/java/user-management/src/main/java/dev/sunbirdrc/utils/UserConstant.java
new file mode 100644
index 000000000..41d3a6189
--- /dev/null
+++ b/java/user-management/src/main/java/dev/sunbirdrc/utils/UserConstant.java
@@ -0,0 +1,17 @@
+package dev.sunbirdrc.utils;
+
+public class UserConstant {
+ private UserConstant(){}
+
+ public final static String VERIFY_MAIL_ACTION = "VERIFY_EMAIL";
+ public final static String UPDATE_PASSWORD_ACTION = "UPDATE_PASSWORD";
+ public final static String ADMIN_ROLE = "admin";
+ public final static String ROLL_NO = "roll No";
+ public final static String INSTITUTE_ID = "institute id";
+ public final static String INSTITUTE_NAME = "institute name";
+ public final static String PHONE_NUMBER = "phone no";
+ public final static String STUDENT = "Student";
+
+ public final static String CUSTOM_USER_KEY_SALT = "#UPSMF#";
+ public final static String SECRET_KEY_FACTORY_ALGO = "PBKDF2WithHmacSHA1";
+}
diff --git a/java/user-management/src/main/resources/application.properties b/java/user-management/src/main/resources/application.properties
new file mode 100644
index 000000000..46fb7f5c9
--- /dev/null
+++ b/java/user-management/src/main/resources/application.properties
@@ -0,0 +1,76 @@
+server.port=8001
+
+#keycloak.auth-server-url=http://localhost:8080/auth
+#keycloak.resource=demo-app
+#keycloak.public-client=true
+
+spring.datasource.url=${connectionInfo_uri:jdbc:postgresql://localhost:5432/registry}
+spring.datasource.username=${connectionInfo_username:postgres}
+spring.datasource.password=${connectionInfo_password:postgres}
+
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.hibernate.ddl-auto=update
+
+sunbirdrc.url=${sunbirdrc_url:http://localhost:8081}
+spring.mail.host=smtp.gmail.com
+spring.mail.port=465
+spring.mail.username=upsmf.otp@upsmfac.org
+spring.mail.password=#######
+spring.mail.properties.mail.smtp.ssl.enable = true
+
+# Other properties
+spring.mail.properties.mail.debug=true
+spring.mail.properties.mail.transport.protocol=smtp
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.connectiontimeout=50000000
+spring.mail.properties.mail.smtp.timeout=15000000
+spring.mail.properties.mail.smtp.writetimeout=150000000
+
+# TLS , port 587
+spring.mail.properties.mail.smtp.starttls.enable=true
+
+#Keycloak config
+keycloak.server.url=http://localhost:8080/auth
+keycloak.realm=sunbird-rc
+keycloak.confidential.client.id=admin-api
+keycloak.public.client.id=admin-cli
+keycloak.client.secret=f0b65ce0-b00e-4923-b4cb-ef897ca6f59c
+#keycloak.client.secret=95d172f6-8b9a-4083-b6dc-ddc422ff1c36
+keycloak.username=admin
+keycloak.password=admin
+keycloak.token.url=http://localhost:8080/auth/realms/sunbird-rc/protocol/openid-connect/token
+
+spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:8080/auth/realms/sunbird-rc
+
+#Mail config
+otp.mail.verification.subject = OTP Verification Mail
+otp.mail.verification.personal.name = UPSMF User
+otp.mail.verification.from.address = upsmf.otp@upsmfac.org
+
+custom.user.creation.subject = User Creation Notification
+custom.user.creation.personal.name = UPSM Creator
+custom.user.creation.from.address = upsmf.otp@upsmfac.org
+
+#OTP config - time unit details - SECOND, MINUTE, HOUR, DAY
+otp.ttl.duration=10
+otp.time.unit=HOUR
+
+#Redis Config
+#spring.redis.host=127.0.0.2
+#spring.redis.password=password
+#spring.redis.port=6379
+
+custom.redis.host=127.0.0.1
+custom.redis.port=6379
+
+logging.level.org.springframework.web=TRACE
+logging.level.org.keycloak=TRACE
+
+#server.error.include-message=always
+#server.error.include-binding-errors=always
+
+custom.user.login.url=http://localhost:8001/api/v1/login
+bulk.user.size.limit=10
+
+custom.user.credential.secret.key=dXBzbWZfdXNlcl9jcmVkX3NlY3JldA
+custom.user.cipher.provider.algorithm=AES/CBC/PKCS5Padding
diff --git a/java/user-management/src/main/resources/templates/otp-verification-mail.ftl b/java/user-management/src/main/resources/templates/otp-verification-mail.ftl
new file mode 100644
index 000000000..fd51bd917
--- /dev/null
+++ b/java/user-management/src/main/resources/templates/otp-verification-mail.ftl
@@ -0,0 +1,16 @@
+
+
+ Hi ${userFirstName} ${userLastName}
+
+ Use the following one-time password (OTP) to complete identity verification.
+
+ ${otp}
+
+ If you didn't initiate this action or if you think you received this email by mistake, please contact support@upsmf.com.
+ This OTP will be valid for ${otpDuration} ${timeUnit}
+
+ Regards,
+ ${signature}
+ ${location}
+
+
diff --git a/java/user-management/src/main/resources/templates/user-creation-notification-mail.ftl b/java/user-management/src/main/resources/templates/user-creation-notification-mail.ftl
new file mode 100644
index 000000000..2e6053cd2
--- /dev/null
+++ b/java/user-management/src/main/resources/templates/user-creation-notification-mail.ftl
@@ -0,0 +1,13 @@
+
+
+ Hi ${userFirstName} ${userLastName}
+
+ Your account has been created. Please find below link for login
+
+ ${loginLInk}
+
+
+ Regards,
+ ${signature}
+
+
From 18fb1e751b36230a6f479ab48d95c22020db5404 Mon Sep 17 00:00:00 2001
From: Pawan k <128481755+kumarpawantarento@users.noreply.github.com>
Date: Fri, 18 Aug 2023 19:09:41 +0530
Subject: [PATCH 21/43] digilocker implementation
---
.../registry/config/SecurityConfig.java | 4 +-
.../controller/RegistryEntityController.java | 396 ++++++++++++----
.../digilocker/pulldoc/DocDetailsType.java | 23 +-
.../digilocker/pulldoc/PullDocRequest.java | 19 +
.../service/ElasticSearchService.java | 8 +-
.../registry/service/ICertificateService.java | 2 +-
.../registry/service/ISearchService.java | 12 +-
.../service/impl/CertificateServiceImpl.java | 48 +-
.../registry/util/ClaimRequestClient.java | 29 +-
.../registry/util/DateParsingExample.java | 18 +
.../registry/util/DigiLockerUtils.java | 153 +++++-
.../sunbirdrc/registry/util/DocDetails.java | 22 +-
.../src/main/resources/application.yml | 2 +-
.../resources/public/_schemas/Student.json | 29 +-
.../_schemas/studentForeignVerification.json | 6 +-
.../public/_schemas/studentFromUP.json | 129 ++++--
.../public/_schemas/studentFromUPDegree.json | 435 ++++++++++++++++++
.../public/_schemas/studentGoodStanding.json | 8 +-
.../public/_schemas/studentOutsideUp.json | 29 +-
.../RegistryEntityControllerTest.java | 4 +-
.../config/config.go | 4 +-
.../config/application-default.yml | 6 +-
.../pkg/services/mail_service.go | 7 +-
23 files changed, 1194 insertions(+), 199 deletions(-)
create mode 100644 java/registry/src/main/java/dev/sunbirdrc/registry/util/DateParsingExample.java
create mode 100644 java/registry/src/main/resources/public/_schemas/studentFromUPDegree.json
diff --git a/java/registry/src/main/java/dev/sunbirdrc/registry/config/SecurityConfig.java b/java/registry/src/main/java/dev/sunbirdrc/registry/config/SecurityConfig.java
index a93880853..17488176b 100644
--- a/java/registry/src/main/java/dev/sunbirdrc/registry/config/SecurityConfig.java
+++ b/java/registry/src/main/java/dev/sunbirdrc/registry/config/SecurityConfig.java
@@ -62,10 +62,10 @@ protected void configure(HttpSecurity http) throws Exception {
.antMatchers("/**/invite", "/health", "/error",
"/_schemas/**", "/**/templates/**", "/**/*.json", "/**/verify",
"/swagger-ui", "/**/search", "/**/attestation/**",
- "/api/docs/swagger.json","/api/docs/*.json", "/plugin/**", "/swagger-ui.html")
+ "/api/docs/swagger.json","/api/docs/*.json", "/plugin/**", "/swagger-ui.html","/api/v1/pullUriRequest/*","/api/v1/pullDocUriRequest/*")
.permitAll()
.and()
- .addFilterBefore(schemaFilter, WebAsyncManagerIntegrationFilter.class)
+ //.addFilterBefore(schemaFilter, WebAsyncManagerIntegrationFilter.class)
.authorizeRequests()
.anyRequest()
.authenticated();
diff --git a/java/registry/src/main/java/dev/sunbirdrc/registry/controller/RegistryEntityController.java b/java/registry/src/main/java/dev/sunbirdrc/registry/controller/RegistryEntityController.java
index 84cd13469..49e1c25f4 100644
--- a/java/registry/src/main/java/dev/sunbirdrc/registry/controller/RegistryEntityController.java
+++ b/java/registry/src/main/java/dev/sunbirdrc/registry/controller/RegistryEntityController.java
@@ -10,6 +10,8 @@
import dev.sunbirdrc.pojos.PluginResponseMessage;
import dev.sunbirdrc.pojos.Response;
import dev.sunbirdrc.pojos.ResponseParams;
+import dev.sunbirdrc.registry.dao.Credential;
+import dev.sunbirdrc.registry.dao.Learner;
import dev.sunbirdrc.registry.digilocker.pulldoc.PullDocRequest;
import dev.sunbirdrc.registry.digilocker.pulldoc.PullDocResponse;
import dev.sunbirdrc.registry.digilocker.pulluriresponse.Person;
@@ -23,6 +25,7 @@
import dev.sunbirdrc.registry.middleware.util.Constants;
import dev.sunbirdrc.registry.middleware.util.JSONUtil;
import dev.sunbirdrc.registry.middleware.util.OSSystemFields;
+import dev.sunbirdrc.registry.model.dto.MailDto;
import dev.sunbirdrc.registry.service.FileStorageService;
import dev.sunbirdrc.registry.service.impl.CertificateServiceImpl;
import dev.sunbirdrc.registry.transform.Configuration;
@@ -52,6 +55,7 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
+import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
@@ -63,13 +67,17 @@ public class RegistryEntityController extends AbstractController {
private static final String TRANSACTION_ID = "transactionId";
private static Logger logger = LoggerFactory.getLogger(RegistryEntityController.class);
+
+ @Value("${Logo.imgBaseUri:https://casa.upsmfac.org/UploadedFiles/Student/}")
+ private String imgBaseUri;
@Value("${GCS_SERVICE_URL:https://casa.upsmfac.org/UploadedFiles/Student/}")
public static final String GCS_SERVICE_URL = "http://34.100.212.156:8082/";
@Value("${digilocker_hmackey:}")
- public static final String DIGILOCKER_KEY = "vTV3Jl81kXDOca70TT2+P/YAb5DXnS+DDr/ArlFhow0=";
+ public static final String DIGILOCKER_KEY = "84600d73-e618-4c80-a347-6b51147103ee";
@Autowired
private CertificateServiceImpl certificateService;
-
+ @Value("${Logo.imgFormat:.jpg}")
+ private String imgFormat;
@Autowired
private FileStorageService fileStorageService;
@@ -571,13 +579,14 @@ public ResponseEntity