diff --git a/client/src/app/admin/admin-auth.guard.ts b/client/src/app/admin/admin-auth.guard.ts index 07ce850f03c648dd4bac50f338939dfd80f80f2e..d17490155f14febdf8214182d61d2f999b63f768 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 818d27068334f5ac842d1913780cbad8fc896c22..22f1c6d21f082ebaba3c77343d9d1b79463b75fe 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 59fd9a2c03ac12bb4ed174ac0b38f7e17fc639aa..7f1a10309a3e1441119e53d3b7174a5d835937ab 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 591165ba38306129f28b13760beec6c9b345b8a6..1da98024b062e694b4168cf37e6c0952c4d9e714 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 3172ebe30d803d962f581ac165d6825ebd15c5cd..77088f75351fe2a0ec792528e547995a16365b89 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