Merge pull request #317 from PSMRI/release-3.6.0

Release 3.6.0

Author: 5Amogh

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.iemr.common-API</groupId>
 	<artifactId>common-api</artifactId>
-	<version>3.4.0</version>
+	<version>3.6.0</version>
 	<packaging>war</packaging>
 
 	<name>Common-API</name>
@@ -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>
@@ -257,7 +263,7 @@
 			<artifactId>logback-core</artifactId>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>

src/main/environment/common_ci.properties

@@ -32,6 +32,7 @@ identity-1097-api-url = @env.IDENTITY_1097_API_URL@
 send-sms=@env.SEND_SMS@
 sendSMSUrl = @env.SEND_SMS_URL@
 source-address=@env.SMS_SOURCE_ADDRESS@
+sms-consent-source-address = @env.SMS_CONSENT_SOURCE_ADDRESS@
 sms-username=@env.SMS_USERNAME@
 sms-password=@env.SMS_PASSWORD@
 send-message-url=@env.SMS_MESSAGE_URL@
@@ -40,6 +41,11 @@ 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@
+
 #### Email Configuration
 send-email=@env.SEND_EMAIL@
 spring.mail.host=@env.MAIL_HOST@
@@ -167,8 +173,8 @@ grievancePassword = @env.GRIEVANCE_PASSWORD@
 grievanceUserAuthenticate = @env.GRIEVANCE_USER_AUTHENTICATE@
 grievanceDataSyncDuration = @env.GRIEVANCE_DATA_SYNC_DURATION@
 
-springdoc.api-docs.enabled=false
-springdoc.swagger-ui.enabled=false
+springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
+springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
 
 
 isProduction=@env.IS_PRODUCTION@
@@ -185,4 +191,16 @@ cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@
 
 video-call-url=@env.VIDEO_CALL_URL@
 jibri.output.path=@env.JIBRI_OUTPUT_PATH@
-video.recording.path=@env.VIDEO_RECORDING_PATH@
+video.recording.path=@env.VIDEO_RECORDING_PATH@
+
+platform.feedback.ratelimit.enabled=@env.PLATFORM_FEEDBACK_RATELIMIT_ENABLED@
+platform.feedback.ratelimit.pepper=@env.PLATFORM_FEEDBACK_RATELIMIT_PEPPER@
+platform.feedback.ratelimit.trust-forwarded-for=@env.PLATFORM_FEEDBACK_RATELIMIT_TRUST_FORWARDED_FOR@
+platform.feedback.ratelimit.forwarded-for-header=@env.PLATFORM_FEEDBACK_RATELIMIT_FORWARDED_FOR_HEADER@
+platform.feedback.ratelimit.minute-limit=@env.PLATFORM_FEEDBACK_RATELIMIT_MINUTE_LIMIT@
+platform.feedback.ratelimit.day-limit=@env.PLATFORM_FEEDBACK_RATELIMIT_DAY_LIMIT@
+platform.feedback.ratelimit.user-day-limit=@env.PLATFORM_FEEDBACK_RATELIMIT_USER_DAY_LIMIT@
+platform.feedback.ratelimit.fail-window-minutes=@env.PLATFORM_FEEDBACK_RATELIMIT_FAIL_WINDOW_MINUTES@
+platform.feedback.ratelimit.backoff-minutes=@env.PLATFORM_FEEDBACK_RATELIMIT_BACKOFF_MINUTES@
+generateBeneficiaryIDs-api-url=@env.GEN_BENEFICIARY_IDS_API_URL@
+

src/main/environment/common_docker.properties

@@ -32,6 +32,7 @@ identity-1097-api-url = ${IDENTITY_1097_API_URL}
 send-sms=${SEND_SMS}
 sendSMSUrl = ${SEND_SMS_URL}
 source-address=${SMS_SOURCE_ADDRESS}
+sms-consent-source-address=${SMS_CONSENT_SOURCE_ADDRESS}
 sms-username=${SMS_USERNAME}
 sms-password=${SMS_PASSWORD}
 send-message-url=${SMS_MESSAGE_URL}
@@ -169,8 +170,8 @@ grievancePassword = ${GRIEVANCE_PASSWORD}
 grievanceUserAuthenticate = ${GRIEVANCE_USER_AUTHENTICATE}
 grievanceDataSyncDuration = ${GRIEVANCE_DATA_SYNC_DURATION}
 
-springdoc.api-docs.enabled=false
-springdoc.swagger-ui.enabled=false
+springdoc.api-docs.enabled=${SWAGGER_DOC_ENABLED}
+springdoc.swagger-ui.enabled=${SWAGGER_DOC_ENABLED}
 
 
 isProduction=${IS_PRODUCTION}
@@ -185,6 +186,24 @@ captcha.enable-captcha=${ENABLE_CAPTCHA}
 
 cors.allowed-origins=${CORS_ALLOWED_ORIGINS}
 
+# # Firebase Configuration
+firebase.enabled=${FIREBASE_ENABLE}
+# # if using file
+firebase.credential-file=${FIREBASE_CREDENTIAL}
+
+
 video-call-url=${VIDEO_CALL_URL}
 jibri.output.path={JIBRI_OUTPUT_PATH}
-video.recording.path={VIDEO_RECORDING_PATH}
+video.recording.path={VIDEO_RECORDING_PATH}
+
+# Platform Feedback module
+platform.feedback.ratelimit.enabled=${PLATFORM_FEEDBACK_RATELIMIT_ENABLED}
+platform.feedback.ratelimit.pepper=${PLATFORM_FEEDBACK_RATELIMIT_PEPPER}
+platform.feedback.ratelimit.trust-forwarded-for=${PLATFORM_FEEDBACK_RATELIMIT_TRUST_FORWARDED_FOR}
+platform.feedback.ratelimit.forwarded-for-header=${PLATFORM_FEEDBACK_RATELIMIT_FORWARDED_FOR_HEADER}
+platform.feedback.ratelimit.minute-limit=${PLATFORM_FEEDBACK_RATELIMIT_MINUTE_LIMIT}
+platform.feedback.ratelimit.day-limit=${PLATFORM_FEEDBACK_RATELIMIT_DAY_LIMIT}
+platform.feedback.ratelimit.user-day-limit=${PLATFORM_FEEDBACK_RATELIMIT_USER_DAY_LIMIT}
+platform.feedback.ratelimit.fail-window-minutes=${PLATFORM_FEEDBACK_RATELIMIT_FAIL_WINDOW_MINUTES}
+platform.feedback.ratelimit.backoff-minutes=${PLATFORM_FEEDBACK_RATELIMIT_BACKOFF_MINUTES}
+generateBeneficiaryIDs-api-url={GEN_BENEFICIARY_IDS_API_URL}

src/main/environment/common_example.properties

@@ -208,3 +208,21 @@ captcha.enable-captcha=true
 
 cors.allowed-origins=http://localhost:*
 
+# ---Platform Feedback module ---
+# Rate limiter OFF locally (no Redis required)
+platform.feedback.ratelimit.enabled=true
+platform.feedback.ratelimit.pepper=dev-pepper-123   # dummy
+
+# trust forwarded-for locally is harmless (localhost only)
+platform.feedback.ratelimit.trust-forwarded-for=false
+platform.feedback.ratelimit.forwarded-for-header=X-Forwarded-For
+
+# Optional overrides (not needed if disabled)
+platform.feedback.ratelimit.minute-limit=10
+platform.feedback.ratelimit.day-limit=100
+platform.feedback.ratelimit.user-day-limit=50
+platform.feedback.ratelimit.fail-window-minutes=5
+platform.feedback.ratelimit.backoff-minutes=15
+
+### generate Beneficiary IDs URL
+generateBeneficiaryIDs-api-url=/generateBeneficiaryController/generateBeneficiaryIDs

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

@@ -29,7 +29,6 @@
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.client.RestTemplate;
 

src/main/java/com/iemr/common/config/CorsConfig.java

@@ -11,16 +11,16 @@ public class CorsConfig implements WebMvcConfigurer {
 
     @Value("${cors.allowed-origins}")
     private String allowedOrigins;
-
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
                 .allowedOriginPatterns(
                         Arrays.stream(allowedOrigins.split(","))
                                 .map(String::trim)
                                 .toArray(String[]::new))
-                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
-                .allowedHeaders("*")
+                .allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")
+                .allowedHeaders("Authorization", "Content-Type", "Accept", "Jwttoken",
+                                "serverAuthorization", "ServerAuthorization", "serverauthorization", "Serverauthorization")
                 .exposedHeaders("Authorization", "Jwttoken")
                 .allowCredentials(true)
                 .maxAge(3600);

src/main/java/com/iemr/common/config/RedisConfig.java

@@ -33,6 +33,7 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.iemr.common.data.users.User;
+import org.springframework.data.redis.core.StringRedisTemplate;
 
 @Configuration
 public class RedisConfig {
@@ -57,4 +58,10 @@ public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factor
 		return template;
 	}
 
+	// new bean for rate limiting & counters
+    @Bean
+    public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory factory) {
+        return new StringRedisTemplate(factory);
+    }
+
 }

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

@@ -0,0 +1,65 @@
+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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+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.FileInputStream;
+import java.io.IOException;
+import java.util.Base64;
+
+@Configuration
+public class FirebaseMessagingConfig {
+    private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
+
+    @Value("${firebase.enabled:false}")
+    private boolean firebaseEnabled;
+
+    @Value("${firebase.credential-file:}")
+    private String firebaseCredentialFile;
+
+
+    @Bean
+    @ConditionalOnProperty(name = "firebase.enabled", havingValue = "true")
+    public FirebaseMessaging firebaseMessaging() throws IOException {
+        if (!firebaseEnabled) {
+            logger.error("⚠️ Firebase disabled by config");
+            return null;
+        }
+
+        try {
+            if (firebaseCredentialFile == null || firebaseCredentialFile.isBlank()) {
+                logger.error("⚠️ No Firebase credentials path provided");
+                return null; // don't throw, app will still start
+            }
+
+            GoogleCredentials credentials = GoogleCredentials.fromStream(
+                    new ClassPathResource(firebaseCredentialFile).getInputStream()
+            );
+            FirebaseOptions options = FirebaseOptions.builder()
+                    .setCredentials(credentials)
+                    .build();
+
+            FirebaseApp firebaseApp = FirebaseApp.getApps().isEmpty()
+                    ? FirebaseApp.initializeApp(options)
+                    : FirebaseApp.getInstance();
+
+            return FirebaseMessaging.getInstance(firebaseApp);
+
+        } catch (Exception e) {
+            logger.error("⚠️ Firebase init failed: " + e.getMessage());
+            return null; // keep app running
+        }
+
+    }
+
+}

src/main/java/com/iemr/common/config/quartz/ScheduleForGrievanceDataSync.java

@@ -37,3 +37,4 @@ public void execute() {
 	}
 
 }
+

src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java

@@ -103,6 +103,7 @@ public class BeneficiaryRegistrationController {
 	private BeneficiaryOccupationService beneficiaryOccupationService;
 	private GovtIdentityTypeService govtIdentityTypeService;
 
+
 	@Autowired
 	public void setBenRelationshipTypeService(BenRelationshipTypeService benRelationshipTypeService) {
 		this.benRelationshipTypeService = benRelationshipTypeService;