Skip to content

AMM-1186 : Dissable swagger inn prod environment #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ravishanigarapu merged 5 commits into from
Feb 10, 2025
Merged

AMM-1186 : Dissable swagger inn prod environment #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
93b727c
Grievance runtime issues
ravishanigarapu Jan 27, 2025
5e02c35
Dissable swagger in prod environment
ravishanigarapu Jan 27, 2025
c326863
Merge branch 'PSMRI:develop' into develop
ravishanigarapu Jan 27, 2025
37c3c0f
Merge branch 'develop' into develop
ravishanigarapu Feb 10, 2025
465d68f
Login Issue
ravishanigarapu Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/environment/common_ci.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,3 +157,5 @@ 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
3 changes: 3 additions & 0 deletions src/main/environment/common_dev.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,3 +182,6 @@ grievancePassword = <Enter Grievance password>

grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>

springdoc.api-docs.enabled=true
springdoc.swagger-ui.enabled=true
3 changes: 3 additions & 0 deletions src/main/environment/common_example.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,6 @@ grievancePassword = <Enter Grievance password>
grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>

springdoc.api-docs.enabled=true
springdoc.swagger-ui.enabled=true

3 changes: 3 additions & 0 deletions src/main/environment/common_test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,3 +184,6 @@ grievancePassword = <Enter Grievance password>

grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>

springdoc.api-docs.enabled=true
springdoc.swagger-ui.enabled=true
3 changes: 3 additions & 0 deletions src/main/environment/common_uat.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,6 @@ grievancePassword = <Enter Grievance password>

grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>

springdoc.api-docs.enabled=true
springdoc.swagger-ui.enabled=true
5 changes: 3 additions & 2 deletions src/main/java/com/iemr/common/controller/users/IEMRAdminController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,9 @@ public String userAuthenticate(
JSONObject serviceRoleMap = new JSONObject();
JSONArray serviceRoleList = new JSONArray();
JSONObject previlegeObj = new JSONObject();
if (m_User.getUserName() != null && (m_User.getDoLogout() == null || m_User.getDoLogout() == false)
&& (m_User.getWithCredentials() != null || m_User.getWithCredentials() == true)) {
if (m_User.getUserName() != null
&& (m_User.getDoLogout() == null || !m_User.getDoLogout())
&& (m_User.getWithCredentials() != null && m_User.getWithCredentials())) {
Comment on lines +155 to +157
Copy link
Contributor

@coderabbitai coderabbitai bot Feb 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fixed critical logical error in WithCredentials check.

The original condition m_User.getWithCredentials() != null || m_User.getWithCredentials() == true had a logical error that would evaluate to true when WithCredentials is null. The new condition correctly requires both non-null and true value.

String tokenFromRedis = getConcurrentCheckSessionObjectAgainstUser(
m_User.getUserName().trim().toLowerCase());
if (tokenFromRedis != null) {
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,15 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
case "userLogout":
case "swagger-ui.html":
case "index.html":
case "index.css":
case "swagger-initializer.js":
case "swagger-config":
case "swagger-ui-bundle.js":
case "swagger-ui.css":
case "ui":
case "swagger-ui-standalone-preset.js":
case "favicon-32x32.png":
case "favicon-16x16.png":
case "swagger-resources":
case "api-docs":
case "updateBenCallIdsInPhoneBlock":
Expand Down
Loading