From 467694bd9b242c37e07181a9530e4c18dd6a97f2 Mon Sep 17 00:00:00 2001
From: Sebastien DUMETZ <s.dumetz@holusion.com>
Date: Mon, 8 Jul 2024 10:40:06 +0200
Subject: [PATCH] remove /api/v1 prefix in ui routes

---
 source/ui/MainView.ts                    |   1 -
 source/ui/composants/UserLogin.ts        |   2 +-
 source/ui/screens/Admin/AdminArchives.ts |   4 +-
 source/ui/screens/Admin/AdminHome.ts     |   4 +-
 source/ui/screens/Admin/AdminStats.ts    |   4 +-
 source/ui/screens/Admin/UsersList.ts     |   8 +-
 source/ui/screens/FileHistory.ts         | 138 -----------------------
 source/ui/screens/Home.ts                |   2 +-
 source/ui/screens/List.ts                |   4 +-
 source/ui/screens/SceneHistory.ts        |  14 +--
 source/ui/screens/UserSettings.ts        |   2 +-
 source/ui/state/auth.ts                  |   6 +-
 source/ui/state/withScenes.ts            |   2 +-
 13 files changed, 26 insertions(+), 165 deletions(-)
 delete mode 100644 source/ui/screens/FileHistory.ts

diff --git a/source/ui/MainView.ts b/source/ui/MainView.ts
index faf99c08..08b9f789 100644
--- a/source/ui/MainView.ts
+++ b/source/ui/MainView.ts
@@ -14,7 +14,6 @@ import "./composants/navbar/ChangeLocale";
 import "./screens/List";
 import "./screens/Admin";
 import "./screens/SceneHistory";
-import "./screens/FileHistory";
 import "./screens/UserSettings";
 import "./screens/Home"
 import "./composants/Modal";
diff --git a/source/ui/composants/UserLogin.ts b/source/ui/composants/UserLogin.ts
index 49120f37..3e76e59b 100644
--- a/source/ui/composants/UserLogin.ts
+++ b/source/ui/composants/UserLogin.ts
@@ -51,7 +51,7 @@ import Notification from "./Notification";
       ev.preventDefault();
       const username = ev.target["username"].value;
       this.active = true;
-      fetch(`/api/v1/login/${username}/link`, {
+      fetch(`/auth/login/${username}/link`, {
         method: "POST",
       }).then(async (r)=>{
         if(!r.ok){
diff --git a/source/ui/screens/Admin/AdminArchives.ts b/source/ui/screens/Admin/AdminArchives.ts
index 17c70c20..fab900b7 100644
--- a/source/ui/screens/Admin/AdminArchives.ts
+++ b/source/ui/screens/Admin/AdminArchives.ts
@@ -47,7 +47,7 @@ interface User {
     
     fetchScenes() : void{
         this.loading = true;
-        fetch("/api/v1/scenes?access=none")
+        fetch("/scenes?access=none")
         .then(HttpError.okOrThrow)
         .then(async (r)=>{
             this.list = (await r.json()).scenes;
@@ -61,7 +61,7 @@ interface User {
 
     onDeleteScene = (ev :MouseEvent, s :Scene)=>{
         ev.preventDefault();
-        fetch(`/api/v1/scenes/${s.name}?archive=false`, {
+        fetch(`/scenes/${s.name}?archive=false`, {
             headers: {"Content-Type": "application/json"},
             method: "DELETE"
         }).then(HttpError.okOrThrow)
diff --git a/source/ui/screens/Admin/AdminHome.ts b/source/ui/screens/Admin/AdminHome.ts
index 3c35f5ba..50bc01b2 100644
--- a/source/ui/screens/Admin/AdminHome.ts
+++ b/source/ui/screens/Admin/AdminHome.ts
@@ -18,7 +18,7 @@ export class TestmailModalBody extends i18n(LitElement){
   protected render(): unknown {
     let onsend  = ()=>{
       this.state = "sending";
-      fetch("/api/v1/admin/mailtest", {method: "POST"}).then(async (r)=>{
+      fetch("/admin/mailtest", {method: "POST"}).then(async (r)=>{
         let msg = await r.text();
         if(r.ok){
           this.state = "OK: "+msg;
@@ -73,7 +73,7 @@ export default class AdminHomeScreen extends i18n(LitElement) {
         <h3>${this.t("ui.tools")}</h3>
           <ul>
               <li>
-                  <a  download href="/api/v1/scenes?format=zip">${this.t("ui.downloadZip")}</a>
+                  <a  download href="/scenes?format=zip">${this.t("ui.downloadZip")}</a>
               </li>
               <li>
                 <a href="" @click=${(e)=>{
diff --git a/source/ui/screens/Admin/AdminStats.ts b/source/ui/screens/Admin/AdminStats.ts
index 18b73fe7..b206c7df 100644
--- a/source/ui/screens/Admin/AdminStats.ts
+++ b/source/ui/screens/Admin/AdminStats.ts
@@ -22,7 +22,7 @@ export default class AdminStatsScreen extends i18n(LitElement) {
   scenes :{mtime:string, name:string}[] =[];
 
   fetchStats(){
-    fetch("/api/v1/admin/stats", {
+    fetch("/admin/stats", {
       headers:{"Accept":"application/json"}
     }).then(async r=>{
       let b = await r.json();
@@ -35,7 +35,7 @@ export default class AdminStatsScreen extends i18n(LitElement) {
   }
 
   fetchScenes(){
-    fetch("/api/v1/scenes", {
+    fetch("/scenes", {
       headers:{"Accept":"application/json"}
     }).then(async r=>{
       let b = await r.json();
diff --git a/source/ui/screens/Admin/UsersList.ts b/source/ui/screens/Admin/UsersList.ts
index 750b81e5..9a2c986c 100644
--- a/source/ui/screens/Admin/UsersList.ts
+++ b/source/ui/screens/Admin/UsersList.ts
@@ -46,7 +46,7 @@ interface User {
     
     fetchUsers() : void{
         this.loading = true;
-        fetch("/api/v1/users")
+        fetch("/users")
         .then(HttpError.okOrThrow)
         .then(async (r)=>{
             this.list = await r.json();
@@ -65,7 +65,7 @@ interface User {
         (ev.target as HTMLFormElement).reset();
         Modal.close();
         console.log("create user : ", username, password, isAdministrator, email);
-        fetch("/api/v1/users", {
+        fetch("/users", {
             method: "POST",
             headers: {"Content-Type": "application/json"},
             body: JSON.stringify({username, password, isAdministrator, email})
@@ -81,7 +81,7 @@ interface User {
     }
     onDeleteUser = (ev :MouseEvent, u :User)=>{
         ev.preventDefault();
-        fetch(`/api/v1/users/${u.uid}`, {
+        fetch(`/users/${u.uid}`, {
             headers: {"Content-Type": "application/json"},
             method: "DELETE"
         }).then(HttpError.okOrThrow)
@@ -180,7 +180,7 @@ interface User {
         </div>`;
     }
     createLoginLink(u :User){
-        fetch(`/api/v1/login/${u.username}/link`, {
+        fetch(`/auth/login/${u.username}/link`, {
             method: "GET",
             headers: {
                 "Content-Type": "text/plain"
diff --git a/source/ui/screens/FileHistory.ts b/source/ui/screens/FileHistory.ts
deleted file mode 100644
index 52ba8980..00000000
--- a/source/ui/screens/FileHistory.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-
-import { css, customElement, property, html, TemplateResult, LitElement } from "lit-element";
-import Notification from "../composants/Notification";
-
-import "../composants/Spinner";
-import "../composants/Size";
-import HttpError from "../state/HttpError";
-
-interface Scene{
-  name :string;
-  id :number;
-  ctime :Date;
-  author_id :number;
-  author :string;
-  state :0|1;
-}
-interface FileProps extends Scene{
-  type :"article"|"image"|"glb";
-  mtime :Date;
-  size :number;
-  hash :string|null;
-  generation :number;
-}
-
-/**
- * Main UI view for the Voyager Explorer application.
- */
- @customElement("file-history")
- export default class FileHistory extends LitElement
- {
-    @property()
-    scene :string;
-    @property()
-    type :"article"|"image"|"glb";
-    @property()
-    name :string;
-
-    @property({attribute: false})
-    history : FileProps[];
-
-    @property({attribute: false})
-    working :number = 0;
-
-    constructor()
-    {
-        super();
-    }
-    createRenderRoot() {
-        return this;
-    }
-      
-    public connectedCallback(): void {
-        super.connectedCallback();
-        this.fetchHistory()
-    }
-
-    
-    async fetchHistory(){
-      return fetch(`/api/v1/scenes/${this.scene}/files/${this.name}/history`).then(async (r)=>{
-        if(!r.ok) throw new Error(`[${r.status}]: ${r.statusText}`);
-        this.history = ((await r.json()) as FileProps[]);
-        console.log("File History : ", this.history);
-      }).catch((e)=> {
-        console.error(e);
-        Notification.show(`Failed to fetch file history : ${e.message}`, "error");
-      });
-    }
-
-    activate = (ev :Event)=>{
-      ev.preventDefault();
-      let target :HTMLInputElement = ev.target as HTMLInputElement;
-      let id = target.name;
-      let checked = target.checked;
-      this.working++;
-      target.disabled = true;
-      fetch(`/api/v1/files/${id}`, {method:"PATCH", headers:{"Content-Type":"application/json"}, body: JSON.stringify({state: checked?0: 1})})
-      .then(HttpError.okOrThrow)
-      .catch(e=>{
-        Notification.show(`Failed to ${checked?"enable":"disable"} ${this.name}: ${e.message}`, "error")
-        target.checked = !checked;
-      })
-      .finally(()=>{
-        this.working--;
-        target.disabled = false;
-      });
-    }
-
-    protected render() :TemplateResult {
-        if(!this.history){
-            return html`<div style="margin-top:10vh"><spin-loader visible></spin-loader></div>`;
-        }
-
-        return html`
-        <h1>${this.name}</h1>
-        <div style="display:flex;flex-wrap:wrap;">
-          <div style="flex-grow: 1; min-width:300px;">
-            <h3>scene: ${this.scene}</h3>
-            <h3>Type: ${this.type}</h3>
-            <h3>${this.history.length} version${(1 < this.history.length?"s":"")}
-          </div>
-          <div style="min-width:300px;">
-            <h2>Historique</h2>
-            <div style="position:relative;">
-              <div style="position: absolute;top: 0;right:0;z-index:2;overflow: hidden;width:${this.working?"auto":"0"}">
-                <span style="font-size:0.8rem; color: var(--color-secondary)">saving...</span>
-              </div>
-              <table class="list-table">
-                <thead>
-                  <tr>
-                    <th>name</th>
-                    <th>mtime</th>
-                    <th>size</th>
-                    <th>author</th>
-                    <th></th>
-                  </tr>
-                </thead>
-                <tbody>
-                ${this.history.map(m=>html`<tr>
-                    <td style="font-family:monospace;">${m.id}</td>
-                    <td>${new Date(m.ctime).toLocaleString()}</td>
-                    <td>${((m.hash)? html`<b-size .b=${m.size}></b-size>` : html`<ui-icon name="trash"></ui-icon>`)}</td>
-                    <td>${m.author}</td>
-                    <td>
-                      <ui-button class="btn-restore" name="${m.generation}" text="Restore" @click=${this.onRestore}></ui-button>
-                    </td>
-                </tr>`)}
-                </tbody>
-              </table>
-            </div>
-          </div>
-        </div>
-      </div>
-      `;
-    }
-    onRestore = (e:MouseEvent)=>{
-      Notification.show(`Failed to restore to generation : ${(e.target as HTMLButtonElement).name}`)
-    }
- }
\ No newline at end of file
diff --git a/source/ui/screens/Home.ts b/source/ui/screens/Home.ts
index fb125219..da7d643e 100644
--- a/source/ui/screens/Home.ts
+++ b/source/ui/screens/Home.ts
@@ -111,7 +111,7 @@ interface Upload{
                 setError({code: xhr.status, message: xhr.statusText});
             }
 
-            xhr.open('POST', as_scenes? `/api/v1/scenes`:`/api/v1/scenes/${name}`);
+            xhr.open('POST', as_scenes? `/scenes`:`/scenes/${name}`);
             xhr.send(file);
         })();
     }
diff --git a/source/ui/screens/List.ts b/source/ui/screens/List.ts
index 06dbda83..b7c60807 100644
--- a/source/ui/screens/List.ts
+++ b/source/ui/screens/List.ts
@@ -108,7 +108,7 @@ interface Upload{
                 setError({code: xhr.status, message: xhr.statusText});
             }
     
-            xhr.open('POST', as_scenes? `/api/v1/scenes`:`/api/v1/scenes/${name}`);
+            xhr.open('POST', as_scenes? `/scenes`:`/scenes/${name}`);
             xhr.send(file);
         })();
     }
@@ -173,7 +173,7 @@ interface Upload{
                     ${(this.selection.length)?html`
                     <div class="section">
                         <h4 style="margin-top:0">${this.t("ui.tools")}</h4>
-                        <a class="btn btn-main btn-icon" download href="/api/v1/scenes?${
+                        <a class="btn btn-main btn-icon" download href="/scenes?${
                             this.selection.map(name=>`name=${encodeURIComponent(name)}`).join("&")
                             }&format=zip">
                             Download Zip
diff --git a/source/ui/screens/SceneHistory.ts b/source/ui/screens/SceneHistory.ts
index 03b489ed..b7c42b95 100644
--- a/source/ui/screens/SceneHistory.ts
+++ b/source/ui/screens/SceneHistory.ts
@@ -118,7 +118,7 @@ class SceneVersion{
     
     async fetchScene(){
       const signal = this.#c.signal;
-      await fetch(`/api/v1/scenes/${encodeURIComponent(this.name)}`, {signal}).then(async (r)=>{
+      await fetch(`/scenes/${encodeURIComponent(this.name)}`, {signal}).then(async (r)=>{
         if(!r.ok) throw new Error(`[${r.status}]: ${r.statusText}`);
         let body = await r.json();
         if(signal.aborted) return;
@@ -132,7 +132,7 @@ class SceneVersion{
 
     async fetchPermissions(){
       const signal = this.#c.signal;
-      await fetch(`/api/v1/scenes/${encodeURIComponent(this.name)}/permissions`, {signal}).then(async (r)=>{
+      await fetch(`/auth/access/${encodeURIComponent(this.name)}`, {signal}).then(async (r)=>{
         if(!r.ok) throw new Error(`[${r.status}]: ${r.statusText}`);
         let body = await r.json();
         if(signal.aborted) return;
@@ -146,7 +146,7 @@ class SceneVersion{
     
     async fetchHistory(){
       const signal = this.#c.signal;
-      await fetch(`/api/v1/scenes/${encodeURIComponent(this.name)}/history`, {signal}).then(async (r)=>{
+      await fetch(`/history/${encodeURIComponent(this.name)}`, {signal}).then(async (r)=>{
         if(!r.ok) throw new Error(`[${r.status}]: ${r.statusText}`);
         let body = await r.json();
         if(signal.aborted) return;
@@ -205,7 +205,7 @@ class SceneVersion{
                   <ui-icon name="edit"></ui-icon>  ${this.t("ui.editScene")}
                 </a>`:null}
                 <a class="btn btn-main" style="margin-top:10px" href=${`/ui/scenes/${scene}/view`}><ui-icon name="eye"></ui-icon>  ${this.t("ui.viewScene")}</a>
-                <a class="btn btn-main" style="margin-top:10px" download href="/api/v1/scenes/${scene}?format=zip"><ui-icon name="save"></ui-icon> ${this.t("ui.downloadScene")}</a>
+                <a class="btn btn-main" style="margin-top:10px" download href="/scenes/${scene}?format=zip"><ui-icon name="save"></ui-icon> ${this.t("ui.downloadScene")}</a>
               </div>
             </div>
             <div style="min-width:300px;" class="section">
@@ -320,7 +320,7 @@ class SceneVersion{
       console.log("Restore : ", i);
       Notification.show(`Restoring to ${i.name}#${i.generation}...`, "info");
       this.versions = null;
-      fetch(`/api/v1/scenes/${encodeURIComponent(this.name)}/history/`, {
+      fetch(`/history/${encodeURIComponent(this.name)}/`, {
         method: "POST",
         headers: {"Content-Type": "application/json"},
         body: JSON.stringify(i)
@@ -334,7 +334,7 @@ class SceneVersion{
 
     async grant(username :string, access :AccessRights["access"]){
       if(access == "none" && username != "default") access = null;
-      let p = fetch(`/api/v1/scenes/${encodeURIComponent(this.name)}/permissions`, {
+      let p = fetch(`/auth/access${encodeURIComponent(this.name)}`, {
         method: "PATCH",
         headers:{"Content-Type":"application/json"},
         body: JSON.stringify({username:username, access:access})
@@ -389,7 +389,7 @@ class SceneVersion{
           header: this.t("ui.renameScene"),
           body: html`<div style="display:block;position:relative;padding-top:110px"><spin-loader visible></spin-loader></div>`,
         });
-        fetch(`/api/v1/scenes/${encodeURIComponent(this.name)}`, {
+        fetch(`/scenes/${encodeURIComponent(this.name)}`, {
           method:"PATCH",
           headers:{"Content-Type":"application/json"},
           body: JSON.stringify({name})
diff --git a/source/ui/screens/UserSettings.ts b/source/ui/screens/UserSettings.ts
index 9cdc93bb..5b6315f1 100644
--- a/source/ui/screens/UserSettings.ts
+++ b/source/ui/screens/UserSettings.ts
@@ -99,7 +99,7 @@ export default class UserSettings extends i18n(withUser(LitElement)) {
     if(!Object.keys(patch).length){
       return Notification.show("Nothing to change", "info");
     }
-    fetch(`/api/v1/users/${this.user.uid}`, {
+    fetch(`/users/${this.user.uid}`, {
       method: "PATCH",
       headers: {
         "Content-Type": "application/json",
diff --git a/source/ui/state/auth.ts b/source/ui/state/auth.ts
index c182d3d1..0e3824d2 100644
--- a/source/ui/state/auth.ts
+++ b/source/ui/state/auth.ts
@@ -18,7 +18,7 @@ export function setSession(s ?:UserSession){
 }
 
 export async function doLogin(username :string, password :string) :Promise<void>{
-  await fetch("/api/v1/login", {
+  await fetch("/auth/login", {
     method: "POST",
     headers:{
       "Content-Type":"application/json",
@@ -35,7 +35,7 @@ export async function doLogin(username :string, password :string) :Promise<void>
 }
 
 export async function updateLogin(){
-  let r = await fetch("/api/v1/login", {
+  let r = await fetch("/auth/login", {
     method : "GET",
     headers:{"Accept": "application/json"}
   });
@@ -46,7 +46,7 @@ export async function updateLogin(){
 }
 
 export async function doLogout(){
-  let r = await fetch("/api/v1/logout", {
+  let r = await fetch("/auth/logout", {
     method : "POST",
     headers:{"Accept": "application/json"}
   });
diff --git a/source/ui/state/withScenes.ts b/source/ui/state/withScenes.ts
index a2d5109f..7703acf1 100644
--- a/source/ui/state/withScenes.ts
+++ b/source/ui/state/withScenes.ts
@@ -105,7 +105,7 @@ export function withScenes<T extends Constructor<LitElement>>(baseClass:T) : T &
       this.#loading.abort();
       this.#loading = new AbortController();
 
-      let url = new URL("/api/v1/scenes", window.location.href);
+      let url = new URL("/scenes", window.location.href);
       url.searchParams.set("orderBy", this.orderBy);
       url.searchParams.set("orderDirection", this.orderDirection);