refactor: replace repeated GET+JSON parsing with reusable getJson helper

- remove network.js

EnvelopeGenerator.Web/Views/Shared/_Layout.cshtml

@@ -57,7 +57,7 @@
     <script src="~/js/app.min.js" asp-append-version="true"></script>
     <script src="~/lib/pspdfkit/dist-2024.3.2/pspdfkit.js"></script>
     <script src="~/js/util.min.js" asp-append-version="true"></script>
-    <script src="~/js/api-service.min.js" asp-append-version="true"></script>
+    <script src="~/js/envelope-api.min.js" asp-append-version="true"></script>
     <script src="~/lib/typed.js@2.1.0/dist/typed.umd.js"></script>
     @await RenderSectionAsync("Scripts", required: false)
     @{

EnvelopeGenerator.Web/bundleconfig.json

@@ -12,9 +12,9 @@
     ]
   },
   {
-    "outputFileName": "wwwroot/js/api-service.min.js",
+    "outputFileName": "wwwroot/js/envelope-api.min.js",
     "inputFiles": [
-      "wwwroot/js/api-service.js"
+      "wwwroot/js/envelope-api.js"
     ]
   },
   {
@@ -29,12 +29,6 @@
       "wwwroot/js/event-binder.js"
     ]
   },
-  {
-    "outputFileName": "wwwroot/js/network.min.js",
-    "inputFiles": [
-      "wwwroot/js/network.js"
-    ]
-  },
   {
     "outputFileName": "wwwroot/js/ui.min.js",
     "inputFiles": [

EnvelopeGenerator.Web/wwwroot/js/api-service.min.js

@@ -1 +0,0 @@
-function sendRequest(n,t,i=undefined){const r={credentials:"include",method:n,headers:{"X-XSRF-TOKEN":env.xsrfToken}};return i!==undefined&&(r.body=JSON.stringify(i),r.headers["Content-Type"]="application/json"),fetch(t,r)}function getRequest(n){return sendRequest("GET",n)}function postRequest(n,t){return sendRequest("POST",n,t)}function redirect(n){window.location.href=n}function signEnvelope(n){return postRequest(`/api/annotation`,n)}function rejectEnvelope(n){return postRequest(url.reject,n)}function shareEnvelope(n,t){return postRequest(url.share,{receiverMail:n,dateValid:t})}function redirRejected(){redirect(url.rejectRedir)}const env={xsrfToken:document.getElementsByName("__RequestVerificationToken")[0].value,envKey:document.querySelector('meta[name="env-key"]').getAttribute("content")},url={reject:`/api/annotation/reject`,rejectRedir:`/envelope/${env.envKey}`,share:`/api/readonly`};

EnvelopeGenerator.Web/wwwroot/js/envelope-api.js

@@ -1,14 +1,14 @@
 //#region parameters
-const env = {
+const env = Object.freeze({
   xsrfToken: document.getElementsByName('__RequestVerificationToken')[0].value,
   envKey: document.querySelector('meta[name="env-key"]').getAttribute('content')
-}
+})
 
-const url = {
+const url = Object.freeze({
   reject: `/api/annotation/reject`,
   rejectRedir: `/envelope/${env.envKey}`,
   share: `/api/readonly`
-};
+});
 //#endregion
 
 //#region request helper methods
@@ -33,7 +33,15 @@ function getRequest(url) {
   return sendRequest('GET', url);
 }
 
-function postRequest(url, body) {
+function getJson(url) {
+  return sendRequest('GET', url).then(res => {
+    if (res.ok)
+      return res.json();
+    throw new Error(`Request failed with status ${res.status}`);
+  });
+}
+
+function postRequest(url, body = undefined) {
   return sendRequest('POST', url, body);
 }
 
@@ -47,6 +55,21 @@ function signEnvelope(annotations) {
   return postRequest(`/api/annotation`, annotations)
 }
 
+async function getAnnotationParams(leftInInch = 0, topInInch = 0, inchToPointFactor = 72) {
+  const annotParams = await getJson("/api/Config/Annotations");
+
+  for (var key in annotParams) {
+    var annot = annotParams[key];
+    annot.width *= inchToPointFactor;
+    annot.height *= inchToPointFactor;
+    annot.left += leftInInch - 0.7;
+    annot.left *= inchToPointFactor;
+    annot.top += topInInch - 0.5;
+    annot.top *= inchToPointFactor;
+  }
+  return annotParams;
+}
+
 function rejectEnvelope(reason) {
   return postRequest(url.reject, reason);
 }
@@ -58,4 +81,24 @@ function shareEnvelope(receiverMail, dateValid) {
 
 function redirRejected() {
   redirect(url.rejectRedir);
+}
+
+async function setLanguage(language) {
+  const hasLang = await getJson('/api/localization/lang')
+    .then(langs => langs.includes(language));
+
+  if (hasLang)
+    postRequest(`/api/localization/lang/${language}`)
+      .then(response => {
+        if (response.redirected)
+          redirect(response.url);
+      });
+}
+
+function logout() {
+  return postRequest(`/auth/logout`)
+    .then(res => {
+      if (res.ok)
+        window.location.href = "/";
+    });
 }

EnvelopeGenerator.Web/wwwroot/js/envelope-api.min.js

@@ -0,0 +1 @@
+function sendRequest(n,t,i=undefined){const r={credentials:"include",method:n,headers:{"X-XSRF-TOKEN":env.xsrfToken}};return i!==undefined&&(r.body=JSON.stringify(i),r.headers["Content-Type"]="application/json"),fetch(t,r)}function getRequest(n){return sendRequest("GET",n)}function getJson(n){return sendRequest("GET",n).then(n=>{if(n.ok)return n.json();throw new Error(`Request failed with status ${n.status}`);})}function postRequest(n,t=undefined){return sendRequest("POST",n,t)}function redirect(n){window.location.href=n}function signEnvelope(n){return postRequest(`/api/annotation`,n)}async function getAnnotationParams(n=0,t=0,i=72){var f,r;const u=await getJson("/api/Config/Annotations");for(f in u)r=u[f],r.width*=i,r.height*=i,r.left+=n-.7,r.left*=i,r.top+=t-.5,r.top*=i;return u}function rejectEnvelope(n){return postRequest(url.reject,n)}function shareEnvelope(n,t){return postRequest(url.share,{receiverMail:n,dateValid:t})}function redirRejected(){redirect(url.rejectRedir)}async function setLanguage(n){const t=await getJson("/api/localization/lang").then(t=>t.includes(n));t&&postRequest(`/api/localization/lang/${n}`).then(n=>{n.redirected&&redirect(n.url)})}function logout(){return postRequest(`/auth/logout`).then(n=>{n.ok&&(window.location.href="/")})}const env=Object.freeze({xsrfToken:document.getElementsByName("__RequestVerificationToken")[0].value,envKey:document.querySelector('meta[name="env-key"]').getAttribute("content")}),url=Object.freeze({reject:`/api/annotation/reject`,rejectRedir:`/envelope/${env.envKey}`,share:`/api/readonly`});

EnvelopeGenerator.Web/wwwroot/js/network.js

@@ -1,64 +0,0 @@
-/**
- * Fetches CSRF Token from page
- */
-function getCsrfToken() {
-    return { 'X-XSRF-TOKEN': document.getElementsByName('__RequestVerificationToken')[0].value }
-}
-
-async function setLanguage(language) {
-
-    const hasLang = await fetch('/api/localization/lang', {
-        method: 'GET',
-        headers: {
-            'Content-Type': 'application/json'
-        }
-    })
-        .then(res => res.json())
-        .then(langs => langs.includes(language))
-        .catch(err => false);
-
-    if (hasLang)
-        return await fetch(`/api/localization/lang/${language}`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' }
-        })
-            .then(response => {
-                if (response.redirected)
-                    window.location.href = response.url;
-                else if (!response.ok)
-                    return Promise.reject('Failed to set language');
-            });
-}
-
-async function logout() {
-    return await fetch(`/auth/logout`, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json'
-        }
-    }).then(res => {
-        if (res.ok)
-            window.location.href = "/";
-    });
-}
-
-
-async function getAnnotationParams(leftInInch = 0, topInInch = 0, inchToPointFactor = 72) {
-
-    const annotParams = await fetch(`${window.location.origin}/api/Config/Annotations`, {
-        credentials: 'include',
-        method: 'GET'
-    })
-        .then(res => res.json());
-
-    for (var key in annotParams) {
-        var annot = annotParams[key];
-        annot.width *= inchToPointFactor;
-        annot.height *= inchToPointFactor;
-        annot.left += leftInInch - 0.7;
-        annot.left *= inchToPointFactor;
-        annot.top += topInInch - 0.5;
-        annot.top *= inchToPointFactor;
-    }
-    return annotParams;
-}

EnvelopeGenerator.Web/wwwroot/js/network.min.js

@@ -1 +0,0 @@
-function getCsrfToken(){return{"X-XSRF-TOKEN":document.getElementsByName("__RequestVerificationToken")[0].value}}async function setLanguage(n){const t=await fetch("/api/localization/lang",{method:"GET",headers:{"Content-Type":"application/json"}}).then(n=>n.json()).then(t=>t.includes(n)).catch(()=>!1);if(t)return await fetch(`/api/localization/lang/${n}`,{method:"POST",headers:{"Content-Type":"application/json"}}).then(n=>{if(n.redirected)window.location.href=n.url;else if(!n.ok)return Promise.reject("Failed to set language")})}async function logout(){return await fetch(`/auth/logout`,{method:"POST",headers:{"Content-Type":"application/json"}}).then(n=>{n.ok&&(window.location.href="/")})}async function getAnnotationParams(n=0,t=0,i=72){var f,r;const u=await fetch(`${window.location.origin}/api/Config/Annotations`,{credentials:"include",method:"GET"}).then(n=>n.json());for(f in u)r=u[f],r.width*=i,r.height*=i,r.left+=n-.7,r.left*=i,r.top+=t-.5,r.top*=i;return u}