From 106b04a760ea2142d9456d101b7937af32c813cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Agneray?= <francois.agneray@lam.fr>
Date: Thu, 19 May 2022 16:32:41 +0200
Subject: [PATCH] Fixed bugs auth guards
---
client/src/app/admin/admin-auth.guard.ts | 2 +-
.../app/admin/instance/components/instance-form.component.ts | 2 +-
client/src/app/instance/instance-auth.guard.ts | 2 +-
client/src/app/instance/search/search-auth.guard.ts | 2 +-
docker-compose.yml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/client/src/app/admin/admin-auth.guard.ts b/client/src/app/admin/admin-auth.guard.ts
index 07ce850f..d1749015 100644
--- a/client/src/app/admin/admin-auth.guard.ts
+++ b/client/src/app/admin/admin-auth.guard.ts
@@ -40,7 +40,7 @@ export class AdminAuthGuard implements CanActivate {
// If user is authenticated and authorized so admin changes to true
let admin = false;
- if (!isAuthenticated) {
+ if (isAuthenticated) {
for (let i = 0; i < this.config.adminRoles.length; i++) {
admin = userRoles.includes(this.config.adminRoles[i]);
if (admin) break;
diff --git a/client/src/app/admin/instance/components/instance-form.component.ts b/client/src/app/admin/instance/components/instance-form.component.ts
index 818d2706..22f1c6d2 100644
--- a/client/src/app/admin/instance/components/instance-form.component.ts
+++ b/client/src/app/admin/instance/components/instance-form.component.ts
@@ -38,7 +38,7 @@ export class InstanceFormComponent implements OnInit {
public: new FormControl(true, [Validators.required]),
portal_logo: new FormControl(''),
design_color: new FormControl('#7AC29A', [Validators.required]),
- design_background_color: new FormControl('#7AC29A', [Validators.required]),
+ design_background_color: new FormControl('#FFFFFF', [Validators.required]),
design_logo: new FormControl(''),
design_favicon: new FormControl(''),
home_component: new FormControl('WelcomeComponent', [Validators.required]),
diff --git a/client/src/app/instance/instance-auth.guard.ts b/client/src/app/instance/instance-auth.guard.ts
index 59fd9a2c..7f1a1030 100644
--- a/client/src/app/instance/instance-auth.guard.ts
+++ b/client/src/app/instance/instance-auth.guard.ts
@@ -50,7 +50,7 @@ export class InstanceAuthGuard implements CanActivate {
// If user is authenticated and authorized so accessible changes to true
let accessible = false;
- if (!isAuthenticated) {
+ if (isAuthenticated) {
accessible = instanceGroupList
.filter(instanceGroup => instanceGroup.instances.includes(instance.name))
.filter(instanceGroup => userRoles.includes(instanceGroup.role))
diff --git a/client/src/app/instance/search/search-auth.guard.ts b/client/src/app/instance/search/search-auth.guard.ts
index 591165ba..1da98024 100644
--- a/client/src/app/instance/search/search-auth.guard.ts
+++ b/client/src/app/instance/search/search-auth.guard.ts
@@ -64,7 +64,7 @@ export class SearchAuthGuard implements CanActivate {
// If user is authenticated and authorized so accessible changes to true
let accessible = false
- if (!isAuthenticated) {
+ if (isAuthenticated) {
accessible = datasetGroupList
.filter(datasetGroup => datasetGroup.datasets.includes(dataset.name))
.filter(datasetGroup => userRoles.includes(datasetGroup.role))
diff --git a/docker-compose.yml b/docker-compose.yml
index 3172ebe3..77088f75 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,7 +35,7 @@ services:
SSO_AUTH_URL: "http://localhost:8180/auth"
SSO_REALM: "anis"
SSO_CLIENT_ID: "anis-client"
- TOKEN_ENABLED: 0
+ TOKEN_ENABLED: 1
TOKEN_JWKS_URL: "http://keycloak:8180/auth/realms/anis/protocol/openid-connect/certs"
TOKEN_ADMIN_ROLES: anis_admin,superuser
RMQ_HOST: rmq
--
GitLab