Merge dev into main — Major Release Updates

.github/ISSUE_TEMPLATE/bug_report.md

@@ -12,6 +12,7 @@ A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -24,15 +25,17 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
 
 **Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+
+- Device: [e.g. iPhone6]
+- OS: [e.g. iOS8.1]
+- Browser [e.g. stock browser, safari]
+- Version [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/dev-otc.yml

@@ -1,8 +1,8 @@
-name:  Build, Test, and Deploy otc (DEV env) services for specific partner
+name: Build, Test, and Deploy otc (DEV env) services for specific partner
 on:
-#  push:
-#    branches:
-#      - dev
+  #  push:
+  #    branches:
+  #      - dev
 
   workflow_dispatch:
     inputs:
@@ -29,10 +29,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-package: jdk
+          distribution: temurin
           java-version: ${{ matrix.java }}
 
       - name: Fetch partners config
@@ -69,7 +68,6 @@ jobs:
           echo "PASSWORD=$PASSWORD" >> $GITHUB_OUTPUT
           echo "ENV_PATH=$ENV_PATH" >> $GITHUB_OUTPUT
           echo "SSH_PORT=$SSH_PORT" >> $GITHUB_OUTPUT
-
       - name: Decrypt data
         id: decrypt_data
 
@@ -107,9 +105,9 @@ jobs:
           echo "password=$server_pass" >> $GITHUB_OUTPUT
 
       - name: Build
-        run:  |
-          mvn -pl common -am  -B -T 1C clean install -Potc
-          mvn -pl wallet,bc-gateway -amd  -B -T 1C clean install -Potc
+        run: |
+          mvn -pl common -am  -B  clean install -Potc
+          mvn -pl wallet,bc-gateway -amd  -B  clean install -Potc
 
       - name: Run Tests
         run: |

.github/workflows/dev.yml

@@ -16,16 +16,15 @@ jobs:
       - name: Checkout Source Code
         uses: actions/checkout@v2
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-package: jdk
+          distribution: temurin
           java-version: ${{ matrix.java }}
-#          cache: maven
+      #          cache: maven
       - name: Build
-        run: mvn -B -T 1C clean install
+        run: mvn -B clean install
       - name: Run Tests
-        run: mvn -B -T 1C -Dskip.unit.tests=false surefire:test
+        run: mvn -B -Dskip.unit.tests=false surefire:test
       - name: Build Docker images
         env:
           TAG: dev

.github/workflows/main-otc.yml

@@ -1,8 +1,8 @@
-name:  Build, Test, and Deploy otc (PRD env) services for specific partner
+name: Build, Test, and Deploy otc (PRD env) services for specific partner
 on:
-#  push:
-#    branches:
-#      - main
+  #  push:
+  #    branches:
+  #      - main
 
   workflow_dispatch:
     inputs:
@@ -29,10 +29,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-package: jdk
+          distribution: temurin
           java-version: ${{ matrix.java }}
 
       - name: Fetch partners config
@@ -107,14 +106,14 @@ jobs:
           echo "password=$server_pass" >> $GITHUB_OUTPUT
 
       - name: Build
-        run:  |
+        run: |
           mvn -pl common -am  -B -T 1C clean install -Potc
           mvn -pl wallet,bc-gateway -amd  -B -T 1C clean install -Potc
 
       - name: Run Tests
         run: |
-          mvn -pl common -am -B -T 1C -Dskip.unit.tests=false surefire:test
-          mvn -pl wallet,bc-gateway -amd  -B -T 1C -Dskip.unit.tests=false surefire:test
+          mvn -pl common -am -B -Dskip.unit.tests=false surefire:test
+          mvn -pl wallet,bc-gateway -amd  -B -Dskip.unit.tests=false surefire:test
 
       - name: Build Docker images
         run: docker compose -f docker-compose-otc.build.yml build

.github/workflows/main.yml

@@ -16,16 +16,15 @@ jobs:
       - name: Checkout Source Code
         uses: actions/checkout@v2
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-package: jdk
+          distribution: temurin
           java-version: ${{ matrix.java }}
-#          cache: maven
+      #          cache: maven
       - name: Build
-        run: mvn -B -T 1C clean install
+        run: mvn -B clean install
       - name: Run Tests
-        run: mvn -B -T 1C -Dskip.unit.tests=false surefire:test
+        run: mvn -B -Dskip.unit.tests=false surefire:test
       - name: Build Docker images
         env:
           TAG: latest

.github/workflows/pr.yml

@@ -15,17 +15,16 @@ jobs:
       - name: Checkout Source Code
         uses: actions/checkout@v2
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: ${{ matrix.java }}
-      - name: Verify Docker
-        run: docker info
       - name: Build
-        run: mvn -B -T 1C clean install -Potc
+        run: mvn -B clean install -Potc
       - name: Run Tests
-        run: mvn -B -T 1C -Dskip.unit.tests=false surefire:test
+        run: mvn -B -Dskip.unit.tests=false surefire:test
+
       - name: Build Docker images
         env:
           TAG: pr
-        run: docker compose -f docker-compose.build.yml build
+        run: docker compose -f docker-compose.build.yml build

.github/workflows/test.yml

@@ -5,7 +5,12 @@ on:
   #    branches:
   #      - dev
   workflow_dispatch:
-
+#    inputs:
+#      partner_name:
+#        type: string
+#        description: 'The name of the partner (provided during workflow execution)'
+#        required: true
+#        default: default
 jobs:
   build:
     runs-on: ubuntu-22.04
@@ -17,10 +22,9 @@ jobs:
       - name: Checkout Source Code
         uses: actions/checkout@v2
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-package: jdk
+          distribution: temurin
           java-version: ${{ matrix.java }}
       #          cache: maven
       - name: Build

.gitignore

@@ -3,7 +3,7 @@ target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/
-
+./api.csv
 ### STS ###
 .apt_generated
 .classpath
@@ -44,3 +44,4 @@ build/
 !/.mvn/
 
 .DS_Store
+realms

README.md

@@ -57,13 +57,12 @@ PANEL_PASS=admin
 BACKEND_USER=admin
 KEYCLOAK_ADMIN_USERNAME=opex
 KEYCLOAK_ADMIN_PASSWORD=hiopex
-SMTP_PASS=x
+SMTP_PASSWORD=x
 API_KEY_CLIENT_SECRET=x
 KEYCLOAK_FRONTEND_URL=http://localhost:8083/auth
 KEYCLOAK_ADMIN_URL=http://localhost:8083/auth
 KEYCLOAK_VERIFY_REDIRECT_URL=http://localhost:8080/verify
 KEYCLOAK_FORGOT_REDIRECT_URL=http://localhost:8080/forgot
-PREFERENCES=preferences-demo.yml
 WHITELIST_REGISTER_ENABLED=true
 WHITELIST_LOGIN_ENABLED=true
 WALLET_BACKUP_ENABLED=false
@@ -77,10 +76,9 @@ TAG=debug
 | BACKEND_USER                                                                                                        | Username used by services to access vault data. Also used as the username for Vault admin panel                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | KEYCLOAK_ADMIN_USERNAME                                                                                             | Username for Keycloak admin panel                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | KEYCLOAK_ADMIN_PASSWORD                                                                                             | Password for Keycloak admin panel                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| SMTP_PASS                                                                                                           | SMTP password used by keycloak to send emails for various operations (e.g. user verification, reset password)                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| SMTP_PASSWORD                                                                                                           | SMTP password used by keycloak to send emails for various operations (e.g. user verification, reset password)                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 | API_KEY_CLIENT_SECRET                                                                                               | In order to access the api key feature, please follow the steps below:</br>1. Go to Keycloak admin panel located at http://localhost:8083/auth/admin/master/console/#/realms/opex/clients <br/>2. Login with the username and password you provided in the `.env` file (KEYCLOAK_ADMIN_USERNAME and KEYCLOAK_ADMIN_PASSWORD)<br/>3. Go to `clients` section on the left menu </br>4. Click on `opex-api-key` client </br>5. In the credentials section, click on `Regenerate Secret` button </br>6. Copy the generated secret and paste it into this section |
 | KEYCLOAK_FRONTEND_URL<br/>KEYCLOAK_ADMIN_URL<br/>KEYCLOAK_VERIFY_REDIRECT_URL<br/>KEYCLOAK_FORGOT_REDIRECT_URL      | Replace `localhost` with your server's IP if you're not running on local machine. Do not change the rest.                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| PREFERENCES                                                                                                         | Points to a file containing seed data used to by modules to initialize their databases. An example of this file is provided and is available inside the root directory (preferences-demo.yml). It's deprecated and will be removed soon                                                                                                                                                                                                                                                                                                                      |
 | WHITELIST_REGISTER_ENABLED                                                                                          | Allows registration only for whitelisted emails                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | WHITELIST_LOGIN_ENABLED                                                                                             | Allows login only for whitelisted emails                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | WALLET_BACKUP_ENABLED                                                                                               | Enables wallet data backup to google drive folder. In order to use this feature, you need to have `drive-key.json` file (obtained from google drive API panel) in the root directory of project                                                                                                                                                                                                                                                                                                                                                              |

accountant/accountant-app/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:11
+FROM eclipse-temurin:17-jdk
 ARG JAR_FILE=target/*.jar
 COPY ${JAR_FILE} app.jar
 ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"]

accountant/accountant-app/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -51,6 +51,10 @@
             <groupId>co.nilin.opex.utility</groupId>
             <artifactId>error-handler</artifactId>
         </dependency>
+        <dependency>
+            <groupId>co.nilin.opex.utility</groupId>
+            <artifactId>interceptors</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-vault-config</artifactId>
@@ -64,10 +68,6 @@
             <artifactId>micrometer-registry-prometheus</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>co.nilin.opex.utility</groupId>
-            <artifactId>preferences</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>

accountant/accountant-app/src/main/kotlin/co/nilin/opex/accountant/app/AccountantApp.kt

@@ -1,7 +1,6 @@
 package co.nilin.opex.accountant.app
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.context.properties.ConfigurationPropertiesScan
 import org.springframework.boot.runApplication
 import org.springframework.context.annotation.ComponentScan