3.3.0

pom.xml

@@ -111,6 +111,12 @@
 
 			</exclusions>
 		</dependency>
+
+		<dependency>
+			<groupId>com.google.firebase</groupId>
+			<artifactId>firebase-admin</artifactId>
+			<version>9.4.3</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>

src/main/environment/common_ci.properties

@@ -40,6 +40,13 @@ send-message-url=@env.SMS_MESSAGE_URL@
 start-sms-scheduler=true
 cron-scheduler-sms=0 0/1 * * * ? *
 
+# Firebase Configuration
+firebase.enabled=@env.FIREBASE_ENABLE@
+# if using file
+firebase.credential-file=@env.FIREBASE_CREDENTIAL@
+# for CI/CD
+firebase.credential-base64=@env.CREDENTIAL_BASE64@
+
 #### Email Configuration
 send-email=@env.SEND_EMAIL@
 spring.mail.host=@env.MAIL_HOST@

src/main/environment/common_docker.properties

@@ -178,4 +178,11 @@ captcha.secret-key=${CAPTCHA_SECRET_KEY}
 captcha.verify-url=${CAPTCHA_VERIFY_URL}
 captcha.enable-captcha=${ENABLE_CAPTCHA}
 
-cors.allowed-origins=${CORS_ALLOWED_ORIGINS}
+cors.allowed-origins=${CORS_ALLOWED_ORIGINS}
+
+# Firebase Configuration
+firebase.enabled=${FIREBASE_ENABLE}
+# if using file
+firebase.credential-file=${FIREBASE_CREDENTIAL}
+# for CI/CD
+firebase.credential-base64=${CREDENTIAL_BASE64}

src/main/java/com/iemr/common/CommonApplication.java

@@ -21,11 +21,16 @@
 */
 package com.iemr.common;
 
+import com.google.auth.oauth2.GoogleCredentials;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.messaging.FirebaseMessaging;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
@@ -36,6 +41,8 @@
 import com.iemr.common.data.users.User;
 import com.iemr.common.utils.IEMRApplBeans;
 
+import java.io.IOException;
+
 @SpringBootApplication
 @EnableScheduling
 public class CommonApplication extends SpringBootServletInitializer {
@@ -73,4 +80,6 @@ public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factor
 		return template;
 	}
 
+
 }
+

src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java

@@ -0,0 +1,57 @@
+package com.iemr.common.config.firebase;
+
+import com.google.auth.oauth2.GoogleCredentials;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.messaging.FirebaseMessaging;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.Base64;
+
+@Configuration
+public class FirebaseMessagingConfig {
+
+    @Value("${firebase.enabled:false}")
+    private boolean firebaseEnabled;
+
+    @Value("${firebase.credential-file:}")
+    private String firebaseCredentialFile;
+
+    @Value("${firebase.credential-base64:}")
+    private String firebaseCredentialBase64;
+
+    @Bean
+    public FirebaseMessaging firebaseMessaging() throws IOException {
+        if (!firebaseEnabled) {
+            throw new IllegalStateException("Firebase is disabled");
+        }
+
+        GoogleCredentials credentials;
+
+        if (!firebaseCredentialBase64.isBlank()) {
+            byte[] decoded = Base64.getDecoder().decode(firebaseCredentialBase64);
+            credentials = GoogleCredentials.fromStream(new ByteArrayInputStream(decoded));
+        } else if (!firebaseCredentialFile.isBlank()) {
+            credentials = GoogleCredentials.fromStream(
+                new ClassPathResource(firebaseCredentialFile).getInputStream()
+            );
+        } else {
+            throw new IllegalStateException("No Firebase credentials provided");
+        }
+
+        FirebaseOptions options = FirebaseOptions.builder()
+                .setCredentials(credentials)
+                .build();
+
+        FirebaseApp firebaseApp = FirebaseApp.getApps().isEmpty()
+                ? FirebaseApp.initializeApp(options)
+                : FirebaseApp.getInstance();
+
+        return FirebaseMessaging.getInstance(firebaseApp);
+    }
+}

src/main/java/com/iemr/common/controller/beneficiaryConsent/BeneficiaryConsentController.java

@@ -0,0 +1,118 @@
+/*
+ * AMRIT – Accessible Medical Records via Integrated Technology
+ * Integrated EHR (Electronic Health Records) Solution
+ *
+ * Copyright (C) "Piramal Swasthya Management and Research Institute"
+ *
+ * This file is part of AMRIT.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+package com.iemr.common.controller.beneficiaryConsent;
+
+import com.iemr.common.data.beneficiaryConsent.BeneficiaryConsentRequest;
+import com.iemr.common.service.beneficiaryOTPHandler.BeneficiaryOTPHandler;
+import com.iemr.common.utils.mapper.InputMapper;
+import com.iemr.common.utils.response.OutputResponse;
+import io.lettuce.core.dynamic.annotation.Param;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.ws.rs.core.MediaType;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping(value = { "/beneficiaryConsent" },headers ="Authorization" )
+@RestController
+public class BeneficiaryConsentController {
+    final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Autowired
+    private BeneficiaryOTPHandler beneficiaryOTPHandler;
+
+    @Operation(summary = "Send Consent")
+    @RequestMapping(value = "/sendConsent", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+    public String sendConsent(@Param(value = "{\"mobNo\":\"String\"}") @RequestBody String requestOBJ) {
+
+        OutputResponse response = new OutputResponse();
+
+        try {
+            BeneficiaryConsentRequest obj = InputMapper.gson().fromJson(requestOBJ, BeneficiaryConsentRequest.class);
+
+            String success = beneficiaryOTPHandler.sendOTP(obj); // method name unchanged if internal logic still uses 'OTP'
+            logger.info(success.toString());
+            response.setResponse(success);
+
+
+        } catch (Exception e) {
+            response.setError(500, "error : " + e);
+        }
+        return response.toString();
+    }
+
+    @Operation(summary = "Validate Consent")
+    @RequestMapping(value = "/validateConsent", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+    public String validateConsent(@Param(value = "{\"mobNo\":\"String\",\"otp\":\"Integer\"}") @RequestBody String requestOBJ) {
+
+        OutputResponse response = new OutputResponse();
+
+        try {
+            BeneficiaryConsentRequest obj = InputMapper.gson().fromJson(requestOBJ, BeneficiaryConsentRequest.class);
+
+            JSONObject responseOBJ = beneficiaryOTPHandler.validateOTP(obj);
+            if (responseOBJ != null)
+                response.setResponse(responseOBJ.toString());
+            else
+                response.setError(500, "failure");
+
+        } catch (Exception e) {
+            logger.error("error in validating Consent : " + e);
+            response.setError(500, "error : " + e);
+        }
+        return response.toString();
+    }
+
+    @Operation(summary = "Resend Consent")
+    @RequestMapping(value = "/resendConsent", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+    public String resendConsent(@Param(value = "{\"mobNo\":\"String\"}") @RequestBody String requestOBJ) {
+        logger.info(requestOBJ.toString());
+
+        OutputResponse response = new OutputResponse();
+
+        try {
+            BeneficiaryConsentRequest obj = InputMapper.gson().fromJson(requestOBJ, BeneficiaryConsentRequest.class);
+
+            String success = beneficiaryOTPHandler.resendOTP(obj);
+            logger.info(success.toString());
+
+            if (success.contains("otp"))
+                response.setResponse(success);
+            else
+                response.setError(500, "failure");
+
+        } catch (Exception e) {
+            logger.error("error in re-sending Consent : " + e);
+            response.setError(500, "error : " + e);
+        }
+        return response.toString();
+    }
+
+
+}
+
+

src/main/java/com/iemr/common/controller/firebaseNotification/FirebaseNotificationController.java

@@ -0,0 +1,61 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology
+* Integrated EHR (Electronic Health Records) Solution
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute"
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology
+*/
+package com.iemr.common.controller.firebaseNotification;
+
+import com.iemr.common.model.notification.NotificationMessage;
+import com.iemr.common.model.notification.UserToken;
+import com.iemr.common.service.firebaseNotification.FirebaseNotificationService;
+import com.iemr.common.utils.exception.IEMRException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping(value= "/firebaseNotification",headers = "Authorization")
+public class FirebaseNotificationController {
+    final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Autowired
+    FirebaseNotificationService firebaseNotificationService;
+
+    @RequestMapping(value = "sendNotification",method = RequestMethod.POST)
+    public String sendNotificationByToken(@RequestBody NotificationMessage notificationMessage){
+        return firebaseNotificationService.sendNotification(notificationMessage);
+    }
+
+    @RequestMapping(value = "updateToken",method = RequestMethod.POST)
+    public String  updateToken(@RequestBody UserToken userToken){
+        return firebaseNotificationService.updateToken(userToken);
+    }
+
+    @RequestMapping(value = "getToken",method = RequestMethod.GET,headers = "Authorization")
+    public String  getUserToken() throws IEMRException {
+
+        return  firebaseNotificationService.getUserToken();
+    }
+
+
+}

src/main/java/com/iemr/common/controller/otp/OTPGateway.java

@@ -53,14 +53,16 @@
 	@Operation(summary = "Send OTP")
 	@RequestMapping(value = "/sendOTP", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String sendOTP(@Param(value = "{\"mobNo\":\"String\"}") @RequestBody String requestOBJ) {
+		logger.info(requestOBJ.toString());
 
 		OutputResponse response = new OutputResponse();
 
 		try {
 			OTPRequestParsor obj = InputMapper.gson().fromJson(requestOBJ, OTPRequestParsor.class);
 
 			String success = otpHandler.sendOTP(obj);
-			if (success.equalsIgnoreCase("success"))
+			logger.info(success.toString());
+			if (success.contains("otp"))
 				response.setResponse(success);
 			else
 				response.setError(5000, "failure");
@@ -98,14 +100,17 @@
 	@Operation(summary = "Resend OTP")
 	@RequestMapping(value = "/resendOTP", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String resendOTP(@Param(value = "{\"mobNo\":\"String\"}") @RequestBody String requestOBJ) {
+		logger.info(requestOBJ.toString());
 
 		OutputResponse response = new OutputResponse();
 
 		try {
 			OTPRequestParsor obj = InputMapper.gson().fromJson(requestOBJ, OTPRequestParsor.class);
 
 			String success = otpHandler.resendOTP(obj);
-			if (success.equalsIgnoreCase("success"))
+			logger.info(success.toString());
+
+			if (success.contains("otp"))
 				response.setResponse(success);
 			else
 				response.setError(5000, "failure");

src/main/java/com/iemr/common/controller/users/IEMRAdminController.java

@@ -567,7 +567,7 @@ public String getLoginResponse(HttpServletRequest request) {
 				}
 
 				// Extract user ID from the JWT token
-				String userId = jwtUtil.getUserIdFromToken(jwtToken);
+				String userId = jwtUtil.extractUserId(jwtToken);
 
 				// Get user details and prepare response
 				User user = iemrAdminUserServiceImpl.getUserById(Long.parseLong(userId));

src/main/java/com/iemr/common/data/beneficiaryConsent/BeneficiaryConsentRequest.java

@@ -0,0 +1,12 @@
+package com.iemr.common.data.beneficiaryConsent;
+
+import lombok.Data;
+
+@Data
+public class BeneficiaryConsentRequest {
+    private String mobNo;
+    private int otp;
+    private String userName;
+    private String  designation;
+
+}