Release 3.6.0 #317
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } | ||
|
Comment on lines
+31
to
+61
Contributor
There was a problem hiding this comment. 🧩 Analysis chain🌐 Web query:
💡 Result: Cause
How to fix (pick one)
References
🌐 Web query:
💡 Result: Summary — how @ConditionalOnProperty works and when beans are created:
Sources: Spring Boot API and reference docs for ConditionalOnProperty; community explanation. [1][2][3] 🏁 Script executed: # First, let's examine the actual file to understand the context better
cat -n src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.javaRepository: PSMRI/Common-API Length of output: 2803 Remove Spring does not accept Additionally, the Replace
This ensures deterministic startup behaviour: either a valid bean is created, or startup fails with a clear error message pointing to the actual misconfiguration. 🤖 Prompt for AI Agents |
||
|
|
||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,3 +37,4 @@ public void execute() { | |
| } | ||
|
|
||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" }) | ||
| @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) | ||
| 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) | ||
| 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) | ||
| public String resendConsent(@Param(value = "{\"mobNo\":\"String\"}") @RequestBody String requestOBJ) { | ||
| logger.info(requestOBJ.toString()); | ||
Check noticeCode scanning / SonarCloud Logging should not be vulnerable to injection attacks Low |
||
|
|
||
| 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(); | ||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Repository: PSMRI/Common-API
Length of output: 105
🏁 Script executed:
Repository: PSMRI/Common-API
Length of output: 1352
🏁 Script executed:
Repository: PSMRI/Common-API
Length of output: 127
🏁 Script executed:
Repository: PSMRI/Common-API
Length of output: 5657
🏁 Script executed:
Repository: PSMRI/Common-API
Length of output: 147
🏁 Script executed:
Repository: PSMRI/Common-API
Length of output: 112
🏁 Script executed:
Repository: PSMRI/Common-API
Length of output: 219
🏁 Script executed:
Repository: PSMRI/Common-API
Length of output: 1311
Fix placeholder syntax for video paths and
generateBeneficiaryIDs-api-urlThree properties incorrectly use
{VAR}instead of${VAR}at lines 196, 197, and 209:Spring Boot properties require
${VAR}syntax for environment variable resolution. The{...}pattern will be treated as literal strings and not resolved, breaking Jibri video recording paths and the beneficiary ID generation API URL at runtime. All other environment-driven values in this file correctly use${VAR}.Update to:
🤖 Prompt for AI Agents