From dd6026615d891231a5bae061410ca5e92af23af0 Mon Sep 17 00:00:00 2001
From: Janis Blatsios <janis666@gmail.com>
Date: Wed, 12 Jun 2024 22:52:22 +0200
Subject: [PATCH] update gh actions DEPLOY

---
 .github/workflows/deploy.yml                               | 2 +-
 .../expense/all-expenses/all-expenses.component.html       | 2 +-
 src/main/resources/application.properties                  | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index ff1b446..3c1b123 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Maven version
         run: mvn -version
       - name: Build with Maven
-        run: mvn -B package --file pom.xml -Dmaven.test.skip=true
+        run: mvn -B package --file pom.xml -Dmaven.test.skip=true -Djasypt.encryptor.password=${{ secrets.JSPT }} -Dspring.mail.password=${{ secrets.GMAIL_PS }} -Dserver.ssl.key-store-password=${{ secrets.ESESEL }}
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
diff --git a/src/main/frontend/src/app/component/expense/all-expenses/all-expenses.component.html b/src/main/frontend/src/app/component/expense/all-expenses/all-expenses.component.html
index 00999da..8f3ba81 100644
--- a/src/main/frontend/src/app/component/expense/all-expenses/all-expenses.component.html
+++ b/src/main/frontend/src/app/component/expense/all-expenses/all-expenses.component.html
@@ -1,4 +1,4 @@
-@if (!!expenses?.length) {
+@if (!!expenses.length) {
   <table [dataSource]="expenses" class="mat-elevation-z8" mat-table multiTemplateDataRows>
     <ng-container matColumnDef="description">
       <th *matHeaderCellDef mat-header-cell> Opis wydatku</th>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index c5c6d3a..d0a67e0 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -8,7 +8,7 @@ spring.mail.properties.mail.smtp.starttls.enable=true
 spring.banner.location=classpath:banner.txt
 jwt.duration=1
 jwt.secret-key=ENC(cD/Zb7b/kxjvWeMmk1ka+AUkCZOeKfx+UJvxQnC6eGv16N4hNjZhj8gAJ5uluJZ4NlrFY+uQzSA0+1OKDa9AZaSpuKOujChmAoUhpnK93iJ4Bh2FGoQYvgXG0M/QkaAV5XQetJeHX1FZZV/IPaHIzWiBps3mc/rf72NdZaHmyrKQhVcSP6NKY5c4a/o94auV)
-spring.config.import=classpath:application-secrets.properties
+#spring.config.import=classpath:application-secrets.properties:optional
 server.http.port=8090
 server.ssl.enabled=false
 server.servlet.session.cookie.same-site=none
@@ -16,4 +16,7 @@ server.servlet.session.cookie.secure=true
 server.servlet.session.cookie.http-only=true
 spring.jpa.open-in-view=false
 spring.datasource.hikari.auto-commit=false
-spring.threads.virtual.enabled=true
\ No newline at end of file
+spring.threads.virtual.enabled=true
+server.ssl.key-store-type=PKCS12
+server.ssl.key-store=classpath:komornik.data
+server.ssl.key-alias=komornik
\ No newline at end of file