@trismegisto/spine 3.3.1 → 3.3.2

package/fesm2022/trismegisto-spine-layout.mjs

@@ -3,7 +3,7 @@ import { inject, ChangeDetectorRef, ChangeDetectionStrategy, Component, Injectio
 import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
 import * as i3 from '@angular/router';
 import { RouterLink, Router, NavigationEnd, NavigationSkipped, RouterOutlet } from '@angular/router';
-import { firstValueFrom, Subject, filter, take, debounceTime, distinctUntilChanged } from 'rxjs';
+import { firstValueFrom, filter, Subject, take, debounceTime, distinctUntilChanged } from 'rxjs';
 import { MenuButtonComponent, HermesThemeService, HERMES_THEME_CONFIG, HermesSidebarService, HermesToastService, IconComponent, ButtonComponent, SkeletonComponent, TextareaComponent, FloatingWindowComponent, IconButtonComponent, HermesShortcutService, HeaderComponent as HeaderComponent$1, AccountAvatarComponent, CommandPaletteComponent, createPersistedWorkspaceStore, HERMES_WORKSPACE_PERSISTENCE_CONFIG, findPanelTabs, SidebarComponent as SidebarComponent$1, SidebarNodeComponent, HermesI18nService, SegmentedControlComponent, ThemePickerComponent, AlertComponent, BreadcrumbComponent, DrawerComponent, ModalComponent, PaginatorComponent, RichTextComponent, SearchFieldComponent, ShortcutListComponent, TagComponent, CodeInputComponent, InputComponent, RadioComponent, CheckboxComponent, CodeViewerComponent, SelectComponent, AvatarGroupComponent, HERMES_SIDEBAR_CONFIG, ComboboxComponent, SettingsDialogComponent, SettingsRowComponent, SettingsSectionComponent, ToggletipComponent, TooltipDirective, EmptyComponent, LoadingSquareComponent, WorkspaceComponent, ToastStackComponent } from '@trismegisto/angular';
 import { ModalComponent as ModalComponent$1 } from '@trismegisto/spine/modal';
 import { SidePanelComponent } from '@trismegisto/spine/side-panel';
@@ -724,6 +724,26 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.24", ngImpo
             args: [{ providedIn: 'root' }]
         }] });
 
+/**
+ * Manda uma requisição ao argos-admin com o token da sessão em `x-access-token`. Com token na mão, sai na hora (token
+ * vencido é com o interceptor do Orfeu, que troca pelo renovado). Sem token ainda — o cabeçalho, as novidades e a
+ * avaliação chamam a API assim que aparecem, às vezes antes de o Orfeu restaurar a sessão —, espera a sessão ser
+ * aplicada (`isAuth$`) em vez de sair sem token (o servidor respondia "Access token required"). Orfeu sem `isAuth$`, ou
+ * sem `AuthorizationService` (app ou teste sem Orfeu): sai com o que houver.
+ */
+function sendWithSession(auth, send) {
+    const now = auth?.getToken();
+    if (now || !auth)
+        return firstValueFrom(send(tokenHeaders(now)));
+    const session = auth;
+    if (!session.isAuth$ || session.authenticated !== false)
+        return firstValueFrom(send(tokenHeaders(now)));
+    return firstValueFrom(session.isAuth$.pipe(filter(Boolean))).then(() => firstValueFrom(send(tokenHeaders(auth.getToken()))));
+}
+function tokenHeaders(token) {
+    return new HttpHeaders({ 'x-access-token': token ?? '' });
+}
+
 /** Espera depois da entrada (ou do fim da configuração inicial) antes do aviso, para não emendar com ela. */
 const ANNOUNCE_DELAY_MS = 1200;
 /** Quantas das mais recentes a entrada lê: decidem o aviso, a contagem do menu e o card do Início. */
@@ -783,9 +803,6 @@ class SpineNewsService {
         this.announcedKey = `${prefix}_news_announced`;
         this.favoritesKey = `${prefix}_news_favorites`;
     }
-    get headers() {
-        return new HttpHeaders({ 'x-access-token': this.auth?.getToken() ?? '' });
-    }
     /** Relê as mais recentes; qualquer falha deixa a lista vazia (o item some em vez de mostrar um erro sem contexto). */
     async refresh() {
         if (!this.available)
@@ -800,14 +817,14 @@ class SpineNewsService {
     }
     /** Uma página da lista (`page` a partir de 1). Falha propaga: o painel mostra o erro com "Tentar de novo". */
     page(page, limit) {
-        return firstValueFrom(this.http.get(`${this.adminApi}/me/news`, {
-            headers: this.headers,
+        return sendWithSession(this.auth, (headers) => this.http.get(`${this.adminApi}/me/news`, {
+            headers,
             params: { page, limit },
         }));
     }
     /** Uma novidade com o corpo. */
     detail(id) {
-        return firstValueFrom(this.http.get(`${this.adminApi}/me/news${urlPath `/${id}`}`, { headers: this.headers }));
+        return sendWithSession(this.auth, (headers) => this.http.get(`${this.adminApi}/me/news${urlPath `/${id}`}`, { headers }));
     }
     /**
      * Chamado uma vez pelo layout na entrada: lê as mais recentes, espera a configuração inicial se decidir (e terminar,
@@ -964,9 +981,6 @@ class SpineRatingsService {
     get url() {
         return `${this.adminApi}/me/ratings`;
     }
-    get headers() {
-        return new HttpHeaders({ 'x-access-token': this.auth?.getToken() ?? '' });
-    }
     /** "Avaliar o {app}": abre a janela (ou troca o conteúdo dela) para a ferramenta. */
     openApp() {
         if (this.enabled)
@@ -1001,7 +1015,7 @@ class SpineRatingsService {
     }
     /** Média e total da ferramenta (`GET /me/ratings/summary`); quem mostra trata a falha. */
     async loadAppAverage() {
-        const res = await firstValueFrom(this.http.get(`${this.url}/summary`, { headers: this.headers }));
+        const res = await sendWithSession(this.auth, (headers) => this.http.get(`${this.url}/summary`, { headers }));
         const out = { average: res?.average ?? null, total: res?.total ?? 0 };
         this.appAverage.set(out);
         return out;
@@ -1011,7 +1025,7 @@ class SpineRatingsService {
         const params = { scope: target.scope };
         if (target.scope === 'screen')
             params['screen'] = target.screenPath ?? '';
-        const res = await firstValueFrom(this.http.get(this.url, { headers: this.headers, params }));
+        const res = await sendWithSession(this.auth, (headers) => this.http.get(this.url, { headers, params }));
         return res?.rating ?? null;
     }
     /** Cria ou atualiza a avaliação (nota 0 a 10); comentário vazio vai como `null`. */
@@ -1021,7 +1035,7 @@ class SpineRatingsService {
             body['screen_path'] = target.screenPath ?? '';
             body['screen_label'] = target.screenLabel ?? null;
         }
-        const res = await firstValueFrom(this.http.put(this.url, body, { headers: this.headers }));
+        const res = await sendWithSession(this.auth, (headers) => this.http.put(this.url, body, { headers }));
         this.ratedNow.update((set) => new Set(set).add(keyOf(target)));
         if (target.scope === 'app') {
             this.appRated.set(true);
@@ -6162,21 +6176,18 @@ class SpineSuggestionsService {
     url(strings, ...ids) {
         return `${this.adminApi}/me/suggestions${urlPath(strings, ...ids)}`;
     }
-    get headers() {
-        return new HttpHeaders({ 'x-access-token': this.auth.getToken() ?? '' });
-    }
     create(draft) {
-        return firstValueFrom(this.http.post(this.url ``, draft, { headers: this.headers }));
+        return sendWithSession(this.auth, (headers) => this.http.post(this.url ``, draft, { headers }));
     }
     /** As minhas, da mais nova; `status` filtra uma coluna. */
-    mine(opts) {
+    async mine(opts) {
         let params = new HttpParams().set('limit', opts.limit).set('offset', opts.offset);
         if (opts.status)
             params = params.set('status', opts.status);
-        return firstValueFrom(this.http.get(this.url ``, { headers: this.headers, params }));
+        return sendWithSession(this.auth, (headers) => this.http.get(this.url ``, { headers, params }));
     }
     /** "Sugestões do app": as de todas as pessoas no app (menos recusadas e arquivadas), com filtros e paginação. */
-    all(query) {
+    async all(query) {
         let params = new HttpParams().set('limit', query.limit).set('offset', query.offset);
         if (query.status)
             params = params.set('status', query.status);
@@ -6186,24 +6197,24 @@ class SpineSuggestionsService {
             params = params.set('screen', query.screen);
         if (query.sort)
             params = params.set('sort', query.sort);
-        return firstValueFrom(this.http.get(this.url `/all`, { headers: this.headers, params }));
+        return sendWithSession(this.auth, (headers) => this.http.get(this.url `/all`, { headers, params }));
     }
     /** Os comentários públicos de uma sugestão (o detalhe só de leitura), do mais novo. */
-    comments(id, page) {
+    async comments(id, page) {
         const params = new HttpParams().set('limit', page.limit).set('offset', page.offset);
-        return firstValueFrom(this.http.get(this.url `/${id}/comments`, { headers: this.headers, params }));
+        return sendWithSession(this.auth, (headers) => this.http.get(this.url `/${id}/comments`, { headers, params }));
     }
     /** As ainda abertas da tela, de qualquer pessoa: o modal oferece apoiar em vez de repetir. */
     async byScreen(path) {
         const params = new HttpParams().set('path', path);
-        const res = await firstValueFrom(this.http.get(this.url `/screen`, { headers: this.headers, params }));
+        const res = await sendWithSession(this.auth, (headers) => this.http.get(this.url `/screen`, { headers, params }));
         return res.suggestions ?? [];
     }
     vote(id) {
-        return firstValueFrom(this.http.post(this.url `/${id}/vote`, {}, { headers: this.headers }));
+        return sendWithSession(this.auth, (headers) => this.http.post(this.url `/${id}/vote`, {}, { headers }));
     }
     unvote(id) {
-        return firstValueFrom(this.http.delete(this.url `/${id}/vote`, { headers: this.headers }));
+        return sendWithSession(this.auth, (headers) => this.http.delete(this.url `/${id}/vote`, { headers }));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.24", ngImport: i0, type: SpineSuggestionsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.24", ngImport: i0, type: SpineSuggestionsService, providedIn: 'root' }); }