feat: generate authenticated url (#1471)

* refactor: extract info component

* feat: generate authenticated url

* refactor: add companion select

* refactor: ensure behaviour across environments

apps/client/src/common/api/session.ts

@@ -12,3 +12,16 @@ export async function getInfo(): Promise<GetInfo> {
   const res = await axios.get(`${sessionPath}/info`);
   return res.data;
 }
+
+/**
+ * HTTP request to get a pre-authenticated URL
+ */
+export async function generateUrl(
+  baseUrl: string,
+  path: string,
+  lock: boolean,
+  authenticate: boolean,
+): Promise<string> {
+  const res = await axios.post(`${sessionPath}/url`, { baseUrl, path, lock, authenticate });
+  return res.data.url;
+}

apps/client/src/common/components/info/Info.module.scss

@@ -0,0 +1,16 @@
+.infoLabel {
+  display: flex;
+  align-items: center;
+  gap: $element-spacing;
+  padding: 1rem;
+  margin-bottom: 1rem;
+
+  background-color: $gray-1100;
+  border-radius: 2px;
+  font-size: $inner-section-text-size;
+
+  svg {
+    font-size: 1.5rem;
+    color: $info-blue;
+  }
+}

apps/client/src/common/components/info/Info.tsx

@@ -0,0 +1,13 @@
+import { PropsWithChildren } from 'react';
+import { IoAlertCircle } from '@react-icons/all-files/io5/IoAlertCircle';
+
+import style from './Info.module.scss';
+
+export default function Info({ children }: PropsWithChildren) {
+  return (
+    <div className={style.infoLabel}>
+      <IoAlertCircle />
+      {children}
+    </div>
+  );
+}

apps/client/src/common/components/view-params-editor/ViewParamsEditor.module.scss

@@ -8,23 +8,6 @@
   }
 }
 
-.infoLabel {
-  display: flex;
-  align-items: center;
-  gap: $element-spacing;
-  padding: 1rem;
-  margin-bottom: 1rem;
-
-  background-color: $gray-1100;
-  border-radius: 2px;
-  font-size: $inner-section-text-size;
-
-  svg {
-    font-size: 1.5rem;
-    color: $info-blue;
-  }
-}
-
 .sectionList {
   display: flex;
   flex-direction: column;

apps/client/src/common/components/view-params-editor/ViewParamsEditor.tsx

@@ -11,9 +11,9 @@ import {
   DrawerOverlay,
   useDisclosure,
 } from '@chakra-ui/react';
-import { IoAlertCircle } from '@react-icons/all-files/io5/IoAlertCircle';
 
 import useViewSettings from '../../../common/hooks-query/useViewSettings';
+import Info from '../info/Info';
 
 import { ViewOption } from './types';
 import ViewParamsSection from './ViewParamsSection';
@@ -132,12 +132,7 @@ export default function ViewParamsEditor({ viewOptions }: EditFormDrawerProps) {
         </DrawerHeader>
 
         <DrawerBody>
-          {viewSettings.overrideStyles && (
-            <div className={style.infoLabel}>
-              <IoAlertCircle />
-              This view style is being modified by a custom CSS file. <br />
-            </div>
-          )}
+          {viewSettings.overrideStyles && <Info>This view style is being modified by a custom CSS file.</Info>}
           <form id='edit-params-form' onSubmit={onParamsFormSubmit} className={style.sectionList}>
             {viewOptions.map((section) => (
               <ViewParamsSection

apps/client/src/common/utils/__tests__/linkUtils.test.ts

@@ -0,0 +1,17 @@
+import { linkToOtherHost } from '../linkUtils';
+
+describe('linkToOTherHost', () => {
+  it('should handle electron links', () => {
+    const serverUrl = 'http://localhost:4001';
+    const baseUri = '';
+    const destination = linkToOtherHost('192.168.10.166', 'path', serverUrl, baseUri);
+    expect(destination).toBe('http://192.168.10.166:4001/path');
+  });
+
+  it('should handle ontime cloud links', () => {
+    const serverUrl = 'https://cloud.getontime.no/user-hash';
+    const baseUri = 'user-hash';
+    const destination = linkToOtherHost('cloud.getontime.no', 'path', serverUrl, baseUri);
+    expect(destination).toBe('https://cloud.getontime.no/user-hash/path');
+  });
+});

apps/client/src/common/utils/linkUtils.ts

@@ -18,23 +18,32 @@ export function openLink(url: string) {
 
 /**
  * Handles opening external links
- * @param event
- * @param location
+ * serverUrl and baseURI are used for testing
  */
-export function handleLinks(event: MouseEvent, location: string) {
+export function handleLinks(
+  event: MouseEvent,
+  location: string,
+  externalServerUrl: string = serverURL,
+  externalBaseURI: string = baseURI,
+) {
   // we handle the link manually
   event.preventDefault();
 
-  const destination = new URL(serverURL);
-  destination.pathname = baseURI ? `${baseURI}/${location}` : location;
+  const destination = new URL(externalServerUrl);
+  destination.pathname = externalBaseURI ? `${externalBaseURI}/${location}` : location;
   openLink(destination.toString());
 }
 
-export function linkToOtherHost(host: string, path?: string) {
-  const destination = new URL(serverURL);
+export function linkToOtherHost(
+  host: string,
+  path?: string,
+  externalServerUrl: string = serverURL,
+  externalBaseURI: string = baseURI,
+) {
+  const destination = new URL(externalServerUrl);
   destination.hostname = host;
   if (path) {
-    destination.pathname = baseURI ? `${baseURI}/${path}` : path;
+    destination.pathname = externalBaseURI ? `${externalBaseURI}/${path}` : path;
   }
   return destination.toString();
 }