Fixed bug => load instance private images

client/src/app/instance/home/components/welcome.component.html

 <div class="row align-items-center jumbotron">
     <div class="col-6 col-md-4 order-md-2 mx-auto text-center">
-        <img class="img-fluid mb-3 mb-md-0" src="{{ getLogoSrc() }}" alt="Instance logo">
+        <img class="img-fluid mb-3 mb-md-0" [src]="getLogoSrc() | authImage | async" alt="Instance logo">
     </div>
     <div class="col-md-8 order-md-1 text-justify pr-md-5" [innerHtml]="instance.home_component_config.home_component_text"></div>
 </div>

client/src/app/portal/components/instance-card.component.html

@@ -22,8 +22,12 @@
         </p>
     </div>
     <div class="card-footer bg-transparent text-right">
-        <button [disabled]="!isInstanceAccessible()" routerLink="/instance/{{ instance.name }}" class="btn btn-outline-primary" title="Go to instance">
-            Go to instance
+        <button *ngIf="!isInstanceAccessible()" class="btn btn-outline-danger disabled" title="You are not authorized to access this project">
+            <span class="fa-solid fa-lock"></span> Private
+        </button>
+
+        <button *ngIf="isInstanceAccessible()" routerLink="/instance/{{ instance.name }}" class="btn btn-outline-primary" title="Go to instance">
+            <span *ngIf="!instance.public" class="fa-solid fa-lock-open"></span> Access to the project
         </button>
     </div>
 </div>

client/src/app/shared/components/navbar.component.html

@@ -5,7 +5,7 @@
     </a>
 
     <a *ngIf="instance" routerLink="/instance/{{ instance.name }}" class="navbar-brand">
-        <img src="{{ getLogoHref() }}" alt="Instance logo" />
+        <img [src]="getLogoHref() | authImage | async" alt="Instance logo" />
     </a>
 
     <!-- Right Navigation -->

client/src/app/shared/pipes/auth-image.pipe.ts

+/**
+ * This file is part of Anis Client.
+ *
+ * @copyright Laboratoire d'Astrophysique de Marseille / CNRS
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+import { Pipe, PipeTransform } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+
+@Pipe({ name: 'authImage' })
+export class AuthImagePipe implements PipeTransform {
+    constructor(private http: HttpClient) { }
+
+    async transform(src: string): Promise<string> {
+        try {
+            const imageBlob = await this.http.get(src, { responseType: 'blob' }).toPromise();
+            const reader = new FileReader();
+            return new Promise((resolve, reject) => {
+                reader.onloadend = () => resolve(reader.result as string);
+                reader.readAsDataURL(imageBlob);
+            });
+        } catch {
+            return 'assets/fallback.png';
+        }
+    }
+}

client/src/app/shared/pipes/index.ts

@@ -13,6 +13,7 @@ import { OptionListBySelectPipe } from './option-list-by-select.pipe';
 import { OutputFamilyByIdPipe } from './output-family-by-id.pipe';
 import { DatasetByNamePipe } from './dataset-by-name.pipe';
 import { InstanceByNamePipe } from './instance-by-name.pipe';
+import { AuthImagePipe } from './auth-image.pipe';
 
 export const sharedPipes = [
     DatasetListByFamilyPipe,
@@ -20,5 +21,6 @@ export const sharedPipes = [
     OptionListBySelectPipe,
     OutputFamilyByIdPipe,
     DatasetByNamePipe,
-    InstanceByNamePipe
+    InstanceByNamePipe,
+    AuthImagePipe
 ];

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: 1
+            TOKEN_ENABLED: 0
             TOKEN_JWKS_URL: "http://keycloak:8180/auth/realms/anis/protocol/openid-connect/certs"
             TOKEN_ADMIN_ROLES: anis_admin,superuser
             RMQ_HOST: rmq

server/src/Action/AbstractAction.php

@@ -70,7 +70,7 @@ abstract class AbstractAction
         if (!$this->isAdmin($adminRoles, $roles)) {
             $qb = $this->em->createQueryBuilder();
             $qb->select('d.name')
-                ->from('App\Entity\Group', 'g')
+                ->from('App\Entity\DatasetGroup', 'g')
                 ->join('g.datasets', 'd')
                 ->where($qb->expr()->in('g.role', $roles))
                 ->andWhere($qb->expr()->eq('d.name', ':dname'));

server/src/Action/DatasetListByInstanceAction.php

@@ -92,7 +92,7 @@ final class DatasetListByInstanceAction extends AbstractAction
                         $qb->andWhere($qb->expr()->eq('d.public', 'true'));
                         $qb2 = $this->em->createQueryBuilder();
                         $qb2->select('d2.name')
-                            ->from('App\Entity\Group', 'g')
+                            ->from('App\Entity\DatasetGroup', 'g')
                             ->join('g.datasets', 'd2')
                             ->where($qb2->expr()->in('g.role', $roles));
                         $qb->orWhere($qb->expr()->in('d.name', $qb2->getDQL()));