Skip to content
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.

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

Sts 189 update frontend #190

Merged
merged 24 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a138ea4
STS-189 update to angular10
max402 Apr 9, 2024
03472f7
STS-189 update to angular11
max402 Apr 9, 2024
7596553
STS-189 update to angular12
max402 Apr 9, 2024
9c67d95
STS-189 update to angular13
max402 Apr 9, 2024
12dc44c
STS-189 update to angular14
max402 Apr 9, 2024
75f9525
STS-189 update to angular15
max402 Apr 9, 2024
0fce84d
STS-189 update to angular16
max402 Apr 9, 2024
94c4ca9
STS-189 update to angular17
max402 Apr 9, 2024
0caa48d
STS-189 npm run build fixes
max402 Apr 9, 2024
cb05bec
STS-189 update keycloak
max402 Apr 9, 2024
88b33e4
STS-189 update frontend dependencies
max402 Apr 22, 2024
908a3e5
STS-189 remove travis configs, build client using github actions
max402 Jun 4, 2024
bbd1bed
STS-190 Angular 18, fix custom storage provider
max402 Jul 2, 2024
bc34b81
update version in package-lock
max402 Jul 2, 2024
ba5771a
STS-189 separate github workflow for building frontend
max402 Jul 3, 2024
486949a
STS-189 test build and push frontend image
max402 Jul 3, 2024
307ce30
STS-189 fix "no main manifest attribute, in /opt/sts-secret-server.jar"
max402 Jul 4, 2024
c2fc011
STS-189 fix "no main manifest attribute"
max402 Jul 4, 2024
61c2e90
openshift can't find image. try new tag
max402 Jul 4, 2024
d698fab
disable provenance in docker images
max402 Jul 5, 2024
13c0144
STS-189 fixes in keycloak-storage-provider
max402 Jul 8, 2024
a096508
STS-189 fix interaction between services (correct urls and ports)
max402 Jul 8, 2024
eaf99ba
STS-189 update readme and ports in yaml
max402 Jul 12, 2024
5308212
STS-189 unify moped.json, set login url during docker-compose up
max402 Jul 16, 2024
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
13 changes: 12 additions & 1 deletion .github/workflows/dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ jobs:
with:
name: artifacts

- name: Download artifacts
uses: actions/download-artifact@v4
with:
name: dist
path: sts-client-example

# TODO delete this step after successful testing
- name: Display structure of downloaded files
run: ls -R
Expand All @@ -37,6 +43,7 @@ jobs:
context: ./sts-example
platforms: linux/amd64,linux/arm64
push: true
provenance: false
tags: |
adorsys/sts-example:${{ env.TAG }}
adorsys/sts-example:latest
Expand All @@ -47,6 +54,7 @@ jobs:
context: ./sts-service-component-example
platforms: linux/amd64,linux/arm64
push: true
provenance: false
tags: |
adorsys/sts-service-component-example:${{ env.TAG }}
adorsys/sts-service-component-example:latest
Expand All @@ -57,6 +65,7 @@ jobs:
context: ./sts-client-example
platforms: linux/amd64,linux/arm64
push: true
provenance: false
tags: |
adorsys/sts-client-example:${{ env.TAG }}
adorsys/sts-client-example:latest
Expand All @@ -67,16 +76,18 @@ jobs:
context: ./sts-secret-server
platforms: linux/amd64,linux/arm64
push: true
provenance: false
tags: |
adorsys/sts-secret-server:${{ env.TAG }}
adorsys/sts-secret-server:latest

- name: Build and push 'keycloak-sts-adapter' docker image
uses: docker/build-push-action@v6
with:
context: ./keycloak-sts-adapter
context: ./keycloak-storage-provider
platforms: linux/amd64,linux/arm64
push: true
provenance: false
tags: |
adorsys/keycloak-sts-adapter:${{ env.TAG }}
adorsys/keycloak-sts-adapter:latest
37 changes: 37 additions & 0 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Frontend build
on:
workflow_call:

jobs:

build_node:
name: Build & Test frontend
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./sts-client-example
steps:
- name: Step 1 - Checkout repository code
uses: actions/checkout@v4
with:
sparse-checkout: 'sts-client-example'
sparse-checkout-cone-mode: false

- name: Step 2 - setup node
uses: actions/setup-node@v4
with:
node-version: 20

- run: npm ci

- run: npm run prod

- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: dist
path: |
${{ github.workspace }}/sts-client-example/dist
${{ github.workspace }}/sts-client-example/docker/create_env.json.sh
overwrite: false
if-no-files-found: error
20 changes: 16 additions & 4 deletions .github/workflows/pull-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ on:
- master

jobs:
build:
build-java:
name: Build & Test backend
runs-on: ubuntu-latest
steps:
- name: Step 1 - Checkout repository code
Expand All @@ -22,11 +23,22 @@ jobs:
- name: Step 3 - Build & Test
run: mvn clean verify -ntp

- name: Step 4 - Build client
run: ./scripts/build_client.sh
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: artifacts
path: |
${{ github.workspace }}/**/*.jar
${{ github.workspace }}/**/Dockerfile
overwrite: false
if-no-files-found: error

- name: Step 5 - Upload coverage reports to Codecov
- name: Step 4 - Upload coverage reports to Codecov
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
verbose: true

build-frontend:
uses: ./.github/workflows/frontend.yml
secrets: inherit
9 changes: 5 additions & 4 deletions .github/workflows/push-in-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ jobs:
- name: Step 3 - Build & Test
run: mvn clean verify -ntp

- name: Step 4 - Build client
run: ./scripts/build_client.sh

- name: Step 5 - Upload coverage reports to Codecov
uses: codecov/codecov-action@v4
with:
Expand All @@ -38,4 +35,8 @@ jobs:
GPG_EXECUTABLE: gpg
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}
GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}

build-frontend:
uses: ./.github/workflows/frontend.yml
secrets: inherit
13 changes: 7 additions & 6 deletions .github/workflows/push-with-v-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- v*

jobs:
build:
build-java:
runs-on: ubuntu-latest
steps:
- name: Step 1 - Checkout repository code
Expand All @@ -28,20 +28,21 @@ jobs:
GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}

- name: Step 4 - Build client
run: ./scripts/build_client.sh

- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: artifacts
path: |
${{ github.workspace }}/**/*.jar
${{ github.workspace }}/**/Dockerfile
overwrite: true
overwrite: false
if-no-files-found: error

build-frontend:
uses: ./.github/workflows/frontend.yml
secrets: inherit

dockerhub:
needs: build
needs: [build-java, build-frontend]
uses: ./.github/workflows/dockerhub.yml
secrets: inherit
52 changes: 0 additions & 52 deletions .travis.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .travis/build.sh

This file was deleted.

10 changes: 0 additions & 10 deletions .travis/codecov_bash.sh

This file was deleted.

4 changes: 0 additions & 4 deletions .travis/deploy-snapshot.sh

This file was deleted.

5 changes: 0 additions & 5 deletions .travis/deploy.sh

This file was deleted.

4 changes: 0 additions & 4 deletions .travis/maven_deploy.sh

This file was deleted.

16 changes: 7 additions & 9 deletions dev.docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
version: '3.1'
services:
keycloak:
build: ./keycloak-storage-provider
image: "local/keycloak-sts-adapter:latest"
environment:
KEYCLOAK_PASSWORD: admin123
KEYCLOAK_USER: admin
KEYCLOAK_ADMIN: admin
KEYCLOAK_ADMIN_PASSWORD: admin123
DEBUG: 'true'
DEBUG_PORT: '*:8787'
ports:
- "8080:8080"
- "8180:8180"
- "8787:8787"
command:
- "start-dev"
- "start-dev --http-port 8180"
networks:
- sts_network

post_process:
image: adorsys/keycloak-config-cli:5.12.0-22.0.4
volumes:
- ./keycloak-config/dev:/config
environment:
KEYCLOAK_PASSWORD: admin123
KEYCLOAK_USER: admin
KEYCLOAK_URL: http://keycloak:8080/
KEYCLOAK_ADMIN : admin
KEYCLOAK_ADMIN_PASSWORD : admin123
KEYCLOAK_URL: http://keycloak:8180/
KEYCLOAK_AVAILABILITYCHECK_ENABLED: true
IMPORT_FILES_LOCATIONS: /config/*
SPRING_PROFILES_INCLUDE : debug
Expand All @@ -40,7 +38,7 @@ services:
MONGO_INITDB_ROOT_USERNAME: root
MONGO_INITDB_ROOT_PASSWORD: example
volumes:
- mongodata:/data/db"
- mongodata:/data/db
ports:
- 27017:27017
networks:
Expand Down
1 change: 0 additions & 1 deletion hub.docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.1'
services:
keycloak:
image: adorsys/keycloak-sts-adapter:latest
Expand Down
12 changes: 6 additions & 6 deletions keycloak-config/moped.json → keycloak-config/dev/moped.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"priority": 0,
"flowAlias": "ad browser forms",
"userSetupAllowed": false,
"autheticatorFlow": true
"authenticatorFlow": true
}
]
},
Expand All @@ -35,14 +35,14 @@
"requirement": "REQUIRED",
"priority": 0,
"userSetupAllowed": false,
"autheticatorFlow": false
"authenticatorFlow": false
},
{
"authenticator": "auth-otp-form",
"requirement": "OPTIONAL",
"requirement": "ALTERNATIVE",
"priority": 1,
"userSetupAllowed": false,
"autheticatorFlow": false
"authenticatorFlow": false
}
]
},
Expand All @@ -58,7 +58,7 @@
"requirement": "REQUIRED",
"priority": 20,
"userSetupAllowed": false,
"autheticatorFlow": false
"authenticatorFlow": false
}
]
}
Expand Down Expand Up @@ -159,7 +159,7 @@
"${stsLoginUrl}"
],
"stsLoginUrl": [
"http://localhost:8888/login"
"http://host.docker.internal:8887/login"
],
"evictionHour": [
"0"
Expand Down
Loading