Skip to content

Develop branch merge to master#5

Merged
harimohanr merged 4 commits intomasterfrom
develop
Jun 12, 2023
Merged

Develop branch merge to master#5
harimohanr merged 4 commits intomasterfrom
develop

Conversation

@harimohanr
Copy link
Copy Markdown
Contributor

No description provided.

mahimaeg and others added 4 commits June 5, 2023 12:01
* Create README.md

Added new readme.md file

* Update README.md
* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues

* pom.xml cleanup
* Create CONTRIBUTING.md

* Create CODE_OF_CONDUCT.md

* Create COPYING

* Update README.md
* modified .gitignore file

* Delete target directory

* Update .gitignore

* Delete logs directory

public String encrypt(String value) throws Exception {
SecretKey secretKey = new SecretKeySpec(SECRET_KEY.getBytes(StandardCharsets.UTF_8), ALGORITHM);
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");

Check failure

Code scanning / CodeQL

Use of a broken or risky cryptographic algorithm

Cryptographic algorithm [AES/ECB/PKCS5Padding](1) is weak and should not be used.
public String decrypt(String encryptedValue) {
try {
SecretKey secretKey = new SecretKeySpec(SECRET_KEY.getBytes(StandardCharsets.UTF_8), ALGORITHM);
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");

Check failure

Code scanning / CodeQL

Use of a broken or risky cryptographic algorithm

Cryptographic algorithm [AES/ECB/PKCS5Padding](1) is weak and should not be used.
@harimohanr harimohanr merged commit 817f37c into master Jun 12, 2023
harimohanr added a commit that referenced this pull request Dec 14, 2023
* Develop branch merge to master (#5)

* Readme file added (#1)

* Create README.md

Added new readme.md file

* Update README.md

* Removed unnecessary dependencies from pom.xml (#2)

* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues

* pom.xml cleanup

* updated code-of-conduct, copying, contributing, readme (#3)

* Create CONTRIBUTING.md

* Create CODE_OF_CONDUCT.md

* Create COPYING

* Update README.md

* modified .gitignore file (#4)

* modified .gitignore file

* Delete target directory

* Update .gitignore

* Delete logs directory

---------

Co-authored-by: Mahima Elizabeth George <86731974+mahimaeg@users.noreply.github.com>
Co-authored-by: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Co-authored-by: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>

* Feature/dev tomaster (#36)

* Readme file added (#1)

* Create README.md

Added new readme.md file

* Update README.md

* Removed unnecessary dependencies from pom.xml (#2)

* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues

* pom.xml cleanup

* updated code-of-conduct, copying, contributing, readme (#3)

* Create CONTRIBUTING.md

* Create CODE_OF_CONDUCT.md

* Create COPYING

* Update README.md

* modified .gitignore file (#4)

* modified .gitignore file

* Delete target directory

* Update .gitignore

* Delete logs directory

* code smell fixes (#6)

* Added copyright text (#7)

Co-authored-by: Anjana K J <an356996@wipro.com>

* code smell fix (#8)

* code smell fix

* code smell fixes

* Sonarqube reported code smell fix

* done correction for application.properties

* Swagger changes (#9)

* Swagger changes

* Swagger changes

* Code smell fix (#10)

* code smell fixes (#11)

* Create sast-and-package-prod.yml (#12)

* Create sast-and-package-prod.yml

* Update sast-and-package-prod.yml

* Code smell changes (#13)

* Update README.md

* code smell fixes

* Added environment variable

* Added password changes & edit environment variable (#16)

* Added environment variable

* Added password changes

* Passing environment variable

* Passing environment variable (#17)

* Passing environment variable

* Passing environment variable (#19)

* Passing environment variable (#20)

* Passing environment variable

* Passing environment variable

* Workflow change (#21)

* Update sast-and-package-prod.yml

* Update sast-and-package.yml

* CreatedDate filed for Identity (#22)

* CreatedDate filed for Identity

* removed uncommented code

* Send SMS null Id issue (#23)

* CreatedDate filed for Identity

* removed uncommented code

* deleting DB config

* Send SMS Null ID Issue

* mmu cr changes

* update changes

* changes mmu cr

* Update sast-and-package-prod.yml (#26)

* edit api changes

* Identity API cleanup and password masking

* Updated the language option for codeql and added maven test

* Added CodeQl tool to do static code analysis on pull request

* Implementing Basic reverse sync operation

* Fix issue on controller

* Updated the language option for codeql and added maven test

* Added CodeQl tool to do static code analysis on pull request

* Implementing Basic reverse sync operation

* Fix issue on controller

* Identity API cleanup and password masking

* edit api changes

* change made in description of identity controller (#30)

* Multiple beneficiaries sync issue changes for FLW (#31)

Co-authored-by: Devika <de40034072@wipro.com>

* Delete .github/workflows/sast-and-package-prod.yml

* Delete .github/workflows/sast-and-package.yml

* Create package-prod.yml

* Create package.yml

* Create sast.yml

* Use a logger to log this exception (#32)

* Added Pull Request template, added placeholders in properties file, and added admin_local to git ignore (#33)

---------

Co-authored-by: Mahima Elizabeth George <86731974+mahimaeg@users.noreply.github.com>
Co-authored-by: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Co-authored-by: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Co-authored-by: Anjana2310 <134688551+Anjana2310@users.noreply.github.com>
Co-authored-by: Anjana K J <an356996@wipro.com>
Co-authored-by: Harimohan Rajamohanan <30436665+harimohanr@users.noreply.github.com>
Co-authored-by: swetatech24 <sweta.prakash@wipro.com>
Co-authored-by: Anjana <anjana.j28@wipro.com>
Co-authored-by: mukul5947 <133210744+mukul5947@users.noreply.github.com>
Co-authored-by: Indrani Bandyopadhyay <IN40068837@wipro.com>
Co-authored-by: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com>
Co-authored-by: indraniBan <133205641+indraniBan@users.noreply.github.com>
Co-authored-by: Sunil GV <sunil.g@beehyv.com>
Co-authored-by: roopesh-beehyv <118873622+roopesh-beehyv@users.noreply.github.com>
Co-authored-by: helenKaryamsetty <133211481+helenKaryamsetty@users.noreply.github.com>
Co-authored-by: Babacar Ndiaye <babacar.ndiay93@gmail.com>
Co-authored-by: Devika <de40034072@wipro.com>

* Resolved a merge conflict

---------

Co-authored-by: Mahima Elizabeth George <86731974+mahimaeg@users.noreply.github.com>
Co-authored-by: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Co-authored-by: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Co-authored-by: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com>
Co-authored-by: Anjana2310 <134688551+Anjana2310@users.noreply.github.com>
Co-authored-by: Anjana K J <an356996@wipro.com>
Co-authored-by: swetatech24 <sweta.prakash@wipro.com>
Co-authored-by: Anjana <anjana.j28@wipro.com>
Co-authored-by: mukul5947 <133210744+mukul5947@users.noreply.github.com>
Co-authored-by: Indrani Bandyopadhyay <IN40068837@wipro.com>
Co-authored-by: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com>
Co-authored-by: indraniBan <133205641+indraniBan@users.noreply.github.com>
Co-authored-by: Sunil GV <sunil.g@beehyv.com>
Co-authored-by: roopesh-beehyv <118873622+roopesh-beehyv@users.noreply.github.com>
Co-authored-by: helenKaryamsetty <133211481+helenKaryamsetty@users.noreply.github.com>
Co-authored-by: Babacar Ndiaye <babacar.ndiay93@gmail.com>
Co-authored-by: Devika <de40034072@wipro.com>
ravishanigarapu added a commit that referenced this pull request Dec 14, 2023
* Readme file added (#1)

* Create README.md

Added new readme.md file

* Update README.md

* Removed unnecessary dependencies from pom.xml (#2)

* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues

* pom.xml cleanup

* updated code-of-conduct, copying, contributing, readme (#3)

* Create CONTRIBUTING.md

* Create CODE_OF_CONDUCT.md

* Create COPYING

* Update README.md

* modified .gitignore file (#4)

* modified .gitignore file

* Delete target directory

* Update .gitignore

* Delete logs directory

* code smell fixes (#6)

* Added copyright text (#7)

Co-authored-by: Anjana K J <an356996@wipro.com>

* code smell fix (#8)

* code smell fix

* code smell fixes

* Sonarqube reported code smell fix

* done correction for application.properties

* Swagger changes (#9)

* Swagger changes

* Swagger changes

* Code smell fix (#10)

* code smell fixes (#11)

* Create sast-and-package-prod.yml (#12)

* Create sast-and-package-prod.yml

* Update sast-and-package-prod.yml

* Code smell changes (#13)

* Update README.md

* code smell fixes

* Added environment variable

* Added password changes & edit environment variable (#16)

* Added environment variable

* Added password changes

* Passing environment variable

* Passing environment variable (#17)

* Passing environment variable

* Passing environment variable (#19)

* Passing environment variable (#20)

* Passing environment variable

* Passing environment variable

* Workflow change (#21)

* Update sast-and-package-prod.yml

* Update sast-and-package.yml

* CreatedDate filed for Identity (#22)

* CreatedDate filed for Identity

* removed uncommented code

* Send SMS null Id issue (#23)

* CreatedDate filed for Identity

* removed uncommented code

* deleting DB config

* Send SMS Null ID Issue

* mmu cr changes

* update changes

* changes mmu cr

* Update sast-and-package-prod.yml (#26)

* edit api changes

* Identity API cleanup and password masking

* Updated the language option for codeql and added maven test

* Added CodeQl tool to do static code analysis on pull request

* Implementing Basic reverse sync operation

* Fix issue on controller

* Updated the language option for codeql and added maven test

* Added CodeQl tool to do static code analysis on pull request

* Implementing Basic reverse sync operation

* Fix issue on controller

* Identity API cleanup and password masking

* edit api changes

* change made in description of identity controller (#30)

* Multiple beneficiaries sync issue changes for FLW (#31)

Co-authored-by: Devika <de40034072@wipro.com>

* Delete .github/workflows/sast-and-package-prod.yml

* Delete .github/workflows/sast-and-package.yml

* Create package-prod.yml

* Create package.yml

* Create sast.yml

* Use a logger to log this exception (#32)

* Added Pull Request template, added placeholders in properties file, and added admin_local to git ignore (#33)

* Add CI build properties, add pom.xml plugins to tweak build process (#34)

* Add CI build properties, add pom.xml plugins to tweak build process

* Correct .gitignore file names

* http insecure changes (#39)

Co-authored-by: Burdhi. Shivani <BU40088124@wipro.com>

* Merge branch 'master'  (#40)

* Merge branch 'master' of
https://github.com/helenKaryamsetty/Identity-API

* Delete src/main/java/com/iemr/common/identity/utils/CryptoUtil.java

---------

Co-authored-by: KA40094929 <KA40094929@L-158018332.wipro.com>
Co-authored-by: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com>

* Merge conflict resolution prior to develop -> master merge (#42)

* Develop branch merge to master (#5)

* Readme file added (#1)

* Create README.md

Added new readme.md file

* Update README.md

* Removed unnecessary dependencies from pom.xml (#2)

* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues

* pom.xml cleanup

* updated code-of-conduct, copying, contributing, readme (#3)

* Create CONTRIBUTING.md

* Create CODE_OF_CONDUCT.md

* Create COPYING

* Update README.md

* modified .gitignore file (#4)

* modified .gitignore file

* Delete target directory

* Update .gitignore

* Delete logs directory

---------

Co-authored-by: Mahima Elizabeth George <86731974+mahimaeg@users.noreply.github.com>
Co-authored-by: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Co-authored-by: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>

* Feature/dev tomaster (#36)

* Readme file added (#1)

* Create README.md

Added new readme.md file

* Update README.md

* Removed unnecessary dependencies from pom.xml (#2)

* Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues

* pom.xml cleanup

* updated code-of-conduct, copying, contributing, readme (#3)

* Create CONTRIBUTING.md

* Create CODE_OF_CONDUCT.md

* Create COPYING

* Update README.md

* modified .gitignore file (#4)

* modified .gitignore file

* Delete target directory

* Update .gitignore

* Delete logs directory

* code smell fixes (#6)

* Added copyright text (#7)

Co-authored-by: Anjana K J <an356996@wipro.com>

* code smell fix (#8)

* code smell fix

* code smell fixes

* Sonarqube reported code smell fix

* done correction for application.properties

* Swagger changes (#9)

* Swagger changes

* Swagger changes

* Code smell fix (#10)

* code smell fixes (#11)

* Create sast-and-package-prod.yml (#12)

* Create sast-and-package-prod.yml

* Update sast-and-package-prod.yml

* Code smell changes (#13)

* Update README.md

* code smell fixes

* Added environment variable

* Added password changes & edit environment variable (#16)

* Added environment variable

* Added password changes

* Passing environment variable

* Passing environment variable (#17)

* Passing environment variable

* Passing environment variable (#19)

* Passing environment variable (#20)

* Passing environment variable

* Passing environment variable

* Workflow change (#21)

* Update sast-and-package-prod.yml

* Update sast-and-package.yml

* CreatedDate filed for Identity (#22)

* CreatedDate filed for Identity

* removed uncommented code

* Send SMS null Id issue (#23)

* CreatedDate filed for Identity

* removed uncommented code

* deleting DB config

* Send SMS Null ID Issue

* mmu cr changes

* update changes

* changes mmu cr

* Update sast-and-package-prod.yml (#26)

* edit api changes

* Identity API cleanup and password masking

* Updated the language option for codeql and added maven test

* Added CodeQl tool to do static code analysis on pull request

* Implementing Basic reverse sync operation

* Fix issue on controller

* Updated the language option for codeql and added maven test

* Added CodeQl tool to do static code analysis on pull request

* Implementing Basic reverse sync operation

* Fix issue on controller

* Identity API cleanup and password masking

* edit api changes

* change made in description of identity controller (#30)

* Multiple beneficiaries sync issue changes for FLW (#31)

Co-authored-by: Devika <de40034072@wipro.com>

* Delete .github/workflows/sast-and-package-prod.yml

* Delete .github/workflows/sast-and-package.yml

* Create package-prod.yml

* Create package.yml

* Create sast.yml

* Use a logger to log this exception (#32)

* Added Pull Request template, added placeholders in properties file, and added admin_local to git ignore (#33)

---------

Co-authored-by: Mahima Elizabeth George <86731974+mahimaeg@users.noreply.github.com>
Co-authored-by: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Co-authored-by: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Co-authored-by: Anjana2310 <134688551+Anjana2310@users.noreply.github.com>
Co-authored-by: Anjana K J <an356996@wipro.com>
Co-authored-by: Harimohan Rajamohanan <30436665+harimohanr@users.noreply.github.com>
Co-authored-by: swetatech24 <sweta.prakash@wipro.com>
Co-authored-by: Anjana <anjana.j28@wipro.com>
Co-authored-by: mukul5947 <133210744+mukul5947@users.noreply.github.com>
Co-authored-by: Indrani Bandyopadhyay <IN40068837@wipro.com>
Co-authored-by: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com>
Co-authored-by: indraniBan <133205641+indraniBan@users.noreply.github.com>
Co-authored-by: Sunil GV <sunil.g@beehyv.com>
Co-authored-by: roopesh-beehyv <118873622+roopesh-beehyv@users.noreply.github.com>
Co-authored-by: helenKaryamsetty <133211481+helenKaryamsetty@users.noreply.github.com>
Co-authored-by: Babacar Ndiaye <babacar.ndiay93@gmail.com>
Co-authored-by: Devika <de40034072@wipro.com>

* Resolved a merge conflict

---------

Co-authored-by: Mahima Elizabeth George <86731974+mahimaeg@users.noreply.github.com>
Co-authored-by: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Co-authored-by: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Co-authored-by: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com>
Co-authored-by: Anjana2310 <134688551+Anjana2310@users.noreply.github.com>
Co-authored-by: Anjana K J <an356996@wipro.com>
Co-authored-by: swetatech24 <sweta.prakash@wipro.com>
Co-authored-by: Anjana <anjana.j28@wipro.com>
Co-authored-by: mukul5947 <133210744+mukul5947@users.noreply.github.com>
Co-authored-by: Indrani Bandyopadhyay <IN40068837@wipro.com>
Co-authored-by: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com>
Co-authored-by: indraniBan <133205641+indraniBan@users.noreply.github.com>
Co-authored-by: Sunil GV <sunil.g@beehyv.com>
Co-authored-by: roopesh-beehyv <118873622+roopesh-beehyv@users.noreply.github.com>
Co-authored-by: helenKaryamsetty <133211481+helenKaryamsetty@users.noreply.github.com>
Co-authored-by: Babacar Ndiaye <babacar.ndiay93@gmail.com>
Co-authored-by: Devika <de40034072@wipro.com>

---------

Co-authored-by: Mahima Elizabeth George <86731974+mahimaeg@users.noreply.github.com>
Co-authored-by: Sweta Prakash <125380378+swetatech24@users.noreply.github.com>
Co-authored-by: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com>
Co-authored-by: Anjana2310 <134688551+Anjana2310@users.noreply.github.com>
Co-authored-by: Anjana K J <an356996@wipro.com>
Co-authored-by: Harimohan Rajamohanan <30436665+harimohanr@users.noreply.github.com>
Co-authored-by: swetatech24 <sweta.prakash@wipro.com>
Co-authored-by: Anjana <anjana.j28@wipro.com>
Co-authored-by: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com>
Co-authored-by: mukul5947 <133210744+mukul5947@users.noreply.github.com>
Co-authored-by: Indrani Bandyopadhyay <IN40068837@wipro.com>
Co-authored-by: Ravi Shanigarapu <ravi.shanigarapu@wipro.com>
Co-authored-by: devikasuresh20 <57424483+devikasuresh20@users.noreply.github.com>
Co-authored-by: indraniBan <133205641+indraniBan@users.noreply.github.com>
Co-authored-by: Sunil GV <sunil.g@beehyv.com>
Co-authored-by: roopesh-beehyv <118873622+roopesh-beehyv@users.noreply.github.com>
Co-authored-by: Babacar Ndiaye <babacar.ndiay93@gmail.com>
Co-authored-by: Devika <de40034072@wipro.com>
Co-authored-by: Mithun James <drtechie@users.noreply.github.com>
Co-authored-by: bshivani7 <133210639+bshivani7@users.noreply.github.com>
Co-authored-by: Burdhi. Shivani <BU40088124@wipro.com>
Co-authored-by: KA40094929 <KA40094929@L-158018332.wipro.com>
Co-authored-by: Harimohan Rajamohanan <harimohan.rajamohanan@wipro.com>
ravishanigarapu pushed a commit that referenced this pull request Jan 18, 2024
…s - For CHO mobile application (#45)

* 1) Modified beneficiary mapping search.
2) Code refactoring.

* API modification to fetch beneficiaries based on villageId list instead of single Id. (#5)

* Modified API to sync beneficiaries based on villageId list instead of a single villageId.

* 1) Added API to get count of Beneficiaries to be synced from server to App so that progress bar can be implemented. (#7)

---------

Co-authored-by: roopesh-beehyv <118873622+roopesh-beehyv@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants