fix(frontend): opensearch.xml available under root (#133)

resolves #89

Author: DanielHabenicht

Phonebook.Frontend/.dockerignore

@@ -12,4 +12,5 @@
 !nginx
 !substitute_variables.sh
 !globals.js
-!version.js
+!version.js
+!opensearch.xml

Phonebook.Frontend/Dockerfile

@@ -40,6 +40,7 @@ RUN chmod +x ./substitute_variables.sh
 
 RUN rm /usr/share/nginx/html/index.html
 COPY --from=builder /usr/local/app/dist /usr/share/nginx/html
+COPY ./opensearch.xml /usr/share/nginx/html/opensearch.xml
 
 ENTRYPOINT ["./substitute_variables.sh", "/usr/share/nginx/html", "./substitute_variables.sh", "/etc/nginx"]
 CMD ["nginx"]

Phonebook.Frontend/nginx/nginx.conf

@@ -69,19 +69,19 @@ http {
 
         add_header X-Frame-Options "DENY";
 
-        location /status {
-           stub_status;
+        location = /opensearch.xml {
+           alias /usr/share/nginx/html/opensearch.xml;
         }
 
-        location /ngsw.json {
+        location = /ngsw.json {
              return 404;
         }
 
-        location /de/ngsw.json {
+        location = /de/ngsw.json {
              return 404;
         }
 
-        location /en/ngsw.json {
+        location = /en/ngsw.json {
              return 404;
         }
 
@@ -96,9 +96,6 @@ http {
             try_files $uri $uri/ /en/index.html;
         }
 
-        location /health {
-             return 200;
-        }
 
         location / {
             if ($cookie_lang = "de") {
@@ -110,13 +107,6 @@ http {
             rewrite ^(.*)$ /$lang/$1 redirect;
         }
 
-        # error_page 404 /404.html;
-        #     location = /40x.html {
-        # }
-
-        # error_page 500 502 503 504 /50x.html;
-        #     location = /50x.html {
-        # }
     }
 
     # Catch All
@@ -129,10 +119,14 @@ http {
             return 444;
         }
 
-        location /health {
+        location = /health {
              return 200;
         }
 
+        location = /status {
+           stub_status;
+        }
+
         location / {
         # catch all unless more specific location match
         return 301 $scheme://${SERVER_NAME}$request_uri;

…ebook.Frontend/src/assets/opensearch.xml Phonebook.Frontend/opensearch.xmlPhonebook.Frontend/src/assets/opensearch.xml renamed to Phonebook.Frontend/opensearch.xml Phonebook.Frontend/src/assets/opensearch.xml renamed to Phonebook.Frontend/opensearch.xml

@@ -6,6 +6,7 @@
 The Phonebook. Search for any employee.
   </Description>
   <InputEncoding>UTF-8</InputEncoding>
-  <Image width="16" height="16" type="image/x-icon">${BASE_URL}/favicon.ico</Image>
-  <Url type="text/html" template="${BASE_URL}/search/{searchTerms}"/>
+  <Image width="16" height="16" type="image/x-icon">${BASE_URL}favicon.ico</Image>
+  <Url type="text/html" template="${BASE_URL}search/{searchTerms}"/>
+  <Url type="application/opensearchdescription+xml" rel="self" template="${BASE_URL}opensearch.xml" />
 </OpenSearchDescription>

Phonebook.Frontend/src/index.html

@@ -18,12 +18,7 @@
     </script>
     <base href="/" />
     <!-- Opensearch Compatibility https://stackoverflow.com/questions/7630144/how-to-add-google-chrome-omnibox-search-support-for-your-site -->
-    <link
-      rel="search"
-      type="application/opensearchdescription+xml"
-      title="Phonebook Search"
-      href="assets/opensearch.xml"
-    />
+    <link rel="search" type="application/opensearchdescription+xml" title="Phonebook Search" href="/opensearch.xml" />
 
     <link rel="manifest" href="manifest.webmanifest" />
     <meta name="theme-color" content="#1976d2" />

Phonebook/phonebook/templates/frontend-deployment.yaml

@@ -41,7 +41,7 @@ spec:
             initialDelaySeconds: 6
           env: 
             - name: BASE_URL
-              value: "https://{{ .Values.host }}"
+              value: "https://{{ .Values.host }}/"
             - name: ROOMPLANNINGTOOL_URL
               value: "{{ .Values.roomPlanningToolUrl }}"
             - name: CONTACT_URL