Skip to content

Commit c197ab3

Browse files
bergomi02bergomi02
authored
Merge branch 'develop' into feature/ohid-499_cpbc_license_changes
2 parents 20e1a06 + c8ab0ca commit c197ab3

30 files changed

Lines changed: 301 additions & 153 deletions

‎.github/workflows/build-demo.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ jobs:
3030
prime-docman-
3131
3232
- name: "Login to OpenShift repository"
33-
uses: docker/login-action@v2
33+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
34+
env:
35+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true'
3436
with:
3537
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
3638
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
@@ -69,7 +71,9 @@ jobs:
6971
prime-backend-
7072
7173
- name: "Login to OpenShift repository"
72-
uses: docker/login-action@v2
74+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
75+
env:
76+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true'
7377
with:
7478
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
7579
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
@@ -123,7 +127,9 @@ jobs:
123127
prime-frontend-
124128
125129
- name: "Login to OpenShift repository"
126-
uses: docker/login-action@v2
130+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
131+
env:
132+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true'
127133
with:
128134
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
129135
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}

‎.github/workflows/build-develop.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@ jobs:
3131
prime-docman-
3232
3333
- name: "Login to OpenShift repository"
34-
uses: docker/login-action@v2
34+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
35+
env:
36+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true'
3537
with:
3638
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
3739
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
38-
password: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_PASSWORD}}
40+
password: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_PASSWORD}}
3941

4042
- name: "Build Document Manager image"
4143
run: |
@@ -69,11 +71,13 @@ jobs:
6971
prime-backend-
7072
7173
- name: "Login to OpenShift repository"
72-
uses: docker/login-action@v2
74+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
75+
env:
76+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true'
7377
with:
7478
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
7579
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
76-
password: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_PASSWORD}}
80+
password: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_PASSWORD}}
7781

7882
- name: "Build .NET web API image"
7983
run: |
@@ -125,7 +129,9 @@ jobs:
125129
prime-frontend-
126130
127131
- name: "Login to OpenShift repository"
128-
uses: docker/login-action@v2
132+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
133+
env:
134+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true'
129135
with:
130136
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
131137
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}

‎.github/workflows/build-main.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ jobs:
3030
prime-docman-
3131
3232
- name: "Login to OpenShift repository"
33-
uses: docker/login-action@v2
33+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
34+
env:
35+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true'
3436
with:
3537
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
3638
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
@@ -69,7 +71,9 @@ jobs:
6971
prime-backend-
7072
7173
- name: "Login to OpenShift repository"
72-
uses: docker/login-action@v2
74+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
75+
env:
76+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true'
7377
with:
7478
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
7579
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
@@ -123,7 +127,9 @@ jobs:
123127
prime-frontend-
124128
125129
- name: "Login to OpenShift repository"
126-
uses: docker/login-action@v2
130+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
131+
env:
132+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true'
127133
with:
128134
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
129135
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}

‎.github/workflows/build-pr.yml‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@ on:
1212
pull_request:
1313
paths-ignore:
1414
- prime-database-backup/**
15-
branches-ignore:
16-
- 'develop'
17-
- 'test'
18-
- 'master'
1915

2016
jobs:
2117
build-document-manager-backend:
18+
name: build-document-manager-backend
2219
runs-on: ubuntu-24.04
2320
environment: Development
2421
steps:
@@ -37,15 +34,17 @@ jobs:
3734
prime-docman-
3835
3936
- name: "Login to OpenShift repository"
40-
uses: docker/login-action@v2
37+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
38+
env:
39+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true'
4140
with:
4241
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
4342
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
4443
password: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_PASSWORD}}
4544

4645
- name: "Get current pull request"
4746
id: PR
48-
uses: 8BitJonny/gh-get-current-pr@2.2.0
47+
uses: 8BitJonny/gh-get-current-pr@4.0.0
4948
with:
5049
github-token: ${{secrets.GITHUB_TOKEN}}
5150
filterOutClosed: true
@@ -64,6 +63,7 @@ jobs:
6463
docker push ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}/${{secrets.OPENSHIFT_LICENSE_PLATE}}-tools/prime-document-manager:pr-${{steps.PR.outputs.number}}
6564
6665
build-backend:
66+
name: build-backend
6767
runs-on: ubuntu-24.04
6868
environment: Development
6969
steps:
@@ -82,14 +82,16 @@ jobs:
8282
prime-backend-
8383
8484
- name: "Login to OpenShift repository"
85-
uses: docker/login-action@v2
85+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
86+
env:
87+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true'
8688
with:
8789
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
8890
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
8991
password: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_PASSWORD}}
9092

9193
- name: "Get current pull request"
92-
uses: 8BitJonny/gh-get-current-pr@2.2.0
94+
uses: 8BitJonny/gh-get-current-pr@4.0.0
9395
id: PR
9496
with:
9597
github-token: ${{secrets.GITHUB_TOKEN}}
@@ -118,6 +120,7 @@ jobs:
118120
docker push ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}/${{secrets.OPENSHIFT_LICENSE_PLATE}}-tools/prime-webapi-backend:pr-${{steps.PR.outputs.number}}
119121
120122
build-frontend:
123+
name: build-frontend
121124
runs-on: ubuntu-latest
122125
environment: Development
123126
defaults:
@@ -145,14 +148,16 @@ jobs:
145148
prime-frontend-
146149
147150
- name: "Login to OpenShift repository"
148-
uses: docker/login-action@v2
151+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
152+
env:
153+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true'
149154
with:
150155
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
151156
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
152157
password: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_PASSWORD}}
153158

154159
- name: "Get current pull request"
155-
uses: 8BitJonny/gh-get-current-pr@2.2.0
160+
uses: 8BitJonny/gh-get-current-pr@4.0.0
156161
id: PR
157162
with:
158163
github-token: ${{secrets.GITHUB_TOKEN}}
@@ -189,6 +194,7 @@ jobs:
189194
docker push ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}/${{secrets.OPENSHIFT_LICENSE_PLATE}}-tools/prime-frontend:pr-${{steps.PR.outputs.number}}
190195
191196
apply-oc-template:
197+
name: apply-oc-template
192198
runs-on: ubuntu-24.04
193199
environment: Development
194200
needs: [build-document-manager-backend, build-frontend, build-backend]
@@ -209,7 +215,7 @@ jobs:
209215
namespace: ${{secrets.OPENSHIFT_LICENSE_PLATE}}-${{secrets.OPENSHIFT_ENVIRONMENT}}
210216

211217
- name: "Get current pull request"
212-
uses: 8BitJonny/gh-get-current-pr@2.2.0
218+
uses: 8BitJonny/gh-get-current-pr@4.0.0
213219
id: PR
214220
with:
215221
github-token: ${{secrets.GITHUB_TOKEN}}

‎.github/workflows/build-test.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ jobs:
3030
prime-docman-
3131
3232
- name: "Login to OpenShift repository"
33-
uses: docker/login-action@v2
33+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
34+
env:
35+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true'
3436
with:
3537
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
3638
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
@@ -69,7 +71,9 @@ jobs:
6971
prime-backend-
7072
7173
- name: "Login to OpenShift repository"
72-
uses: docker/login-action@v2
74+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
75+
env:
76+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true'
7377
with:
7478
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
7579
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
@@ -123,7 +127,9 @@ jobs:
123127
prime-frontend-
124128
125129
- name: "Login to OpenShift repository"
126-
uses: docker/login-action@v2
130+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
131+
env:
132+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: 'true'
127133
with:
128134
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
129135
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}

‎.github/workflows/build-tools.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@v2
2323

2424
- name: "Login to OpenShift repository"
25-
uses: docker/login-action@v1
25+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
2626
with:
2727
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
2828
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
@@ -53,7 +53,7 @@ jobs:
5353
uses: actions/checkout@v2
5454

5555
- name: "Login to OpenShift repository"
56-
uses: docker/login-action@v1
56+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
5757
with:
5858
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
5959
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}
@@ -99,7 +99,7 @@ jobs:
9999
uses: actions/checkout@v2
100100

101101
- name: "Login to OpenShift repository"
102-
uses: docker/login-action@v1
102+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
103103
with:
104104
registry: ${{secrets.OPENSHIFT_IMAGE_REPOSITORY}}
105105
username: ${{secrets.OPENSHIFT_TOOLS_SERVICE_ACCOUNT_USERNAME}}

‎prime-angular-frontend/src/app/app-routing.module.ts‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { AccessDeniedComponent } from '@lib/modules/root-routes/components/acces
66
import { MaintenanceComponent } from '@lib/modules/root-routes/components/maintenance/maintenance.component';
77
import { PageNotFoundComponent } from '@lib/modules/root-routes/components/page-not-found/page-not-found.component';
88
import { HelpComponent } from '@lib/modules/root-routes/components/help/help.component';
9-
import { UnderagedComponent } from '@lib/modules/root-routes/components/underaged/underaged.component';
109

1110
import { AuthRoutes } from '@auth/auth.routes';
1211
import { EnrolmentRoutes } from '@enrolment/enrolment.routes';
@@ -19,6 +18,7 @@ import { SatEformsRoutes } from '@sat/sat-eforms.routes';
1918
import { GisEnrolmentRoutes } from '@gis/gis-enrolment.routes';
2019
import { HealthAuthSiteRegRoutes } from '@health-auth/health-auth-site-reg.routes';
2120
import { PaperEnrolmentRoutes } from '@paper-enrolment/paper-enrolment.routes';
21+
import { NotEligibleComponent } from '@lib/modules/root-routes/components/not-eligible/not-eligible.component';
2222

2323
const routes: Routes = [
2424
{
@@ -70,11 +70,18 @@ const routes: Routes = [
7070
},
7171
{
7272
path: AppRoutes.UNDERAGED,
73-
component: UnderagedComponent,
73+
component: NotEligibleComponent,
7474
data: {
7575
title: 'Underaged'
7676
}
7777
},
78+
{
79+
path: AppRoutes.IDENTITY_INSURANCE_LEVEL,
80+
component: NotEligibleComponent,
81+
data: {
82+
title: 'Identity Insurance Level Not Met'
83+
}
84+
},
7885
{
7986
path: AppRoutes.MAINTENANCE,
8087
component: MaintenanceComponent,
@@ -110,4 +117,4 @@ const routes: Routes = [
110117
imports: [RouterModule.forRoot(routes, { enableTracing: false })],
111118
exports: [RouterModule]
112119
})
113-
export class AppRoutingModule {}
120+
export class AppRoutingModule { }

‎prime-angular-frontend/src/app/app.routes.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
export class AppRoutes {
22
public static DENIED = 'denied';
33
public static UNDERAGED = 'underaged';
4+
public static IDENTITY_INSURANCE_LEVEL = 'identity-insurance-level';
45
public static MAINTENANCE = 'maintenance';
56
public static PAGE_NOT_FOUND = 'page-not-found';
67
public static HELP = 'help';

‎prime-angular-frontend/src/app/core/guards/identity-insurance-level.guard.spec.ts‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import { provideHttpClientTesting } from '@angular/common/http/testing';
2+
import { TestBed } from '@angular/core/testing';
3+
import { RouterTestingModule } from '@angular/router/testing';
4+
import { AuthService } from '@auth/shared/services/auth.service';
5+
import { AppRoutes } from 'app/app.routes';
6+
import { KeycloakService } from 'keycloak-angular';
7+
import { MockAuthService } from 'test/mocks/mock-auth.service';
8+
9+
import { IdentityInsuranceLevelGuard } from './identity-insurance-level.guard';
10+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
11+
import { NotEligibleComponent } from '@lib/modules/root-routes/components/not-eligible/not-eligible.component';
12+
13+
describe('IdentityInsuranceLevelGuard', () => {
14+
let guard: IdentityInsuranceLevelGuard;
15+
16+
beforeEach(() => {
17+
TestBed.configureTestingModule({
18+
imports: [RouterTestingModule.withRoutes([
19+
{
20+
path: AppRoutes.IDENTITY_INSURANCE_LEVEL,
21+
component: NotEligibleComponent
22+
}
23+
])],
24+
providers: [
25+
{
26+
provide: AuthService,
27+
useClass: MockAuthService
28+
},
29+
KeycloakService,
30+
provideHttpClient(withInterceptorsFromDi()),
31+
provideHttpClientTesting()
32+
]
33+
});
34+
guard = TestBed.inject(IdentityInsuranceLevelGuard);
35+
});
36+
37+
it('should be created', () => {
38+
expect(guard).toBeTruthy();
39+
});
40+
});

0 commit comments

Comments
 (0)