feat: introduce Etherpad.js and implement in /etherpad

medienhaus · Sep 13, 2023 · 4293872 · 4293872
1 parent 17956c2
commit 4293872
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/lib/Etherpad.js b/lib/Etherpad.js
@@ -0,0 +1,5 @@
+import getConfig from 'next/config';
+
+const path = getConfig().publicRuntimeConfig.authProviders.etherpad.path || '/etherpad';
+
+export { path };
diff --git a/pages/etherpad/[[...roomId]].js b/pages/etherpad/[[...roomId]].js
@@ -20,15 +20,14 @@ import CreateAnonymousPad from './actions/CreateAnonymousPad';
 import AddExistingPad from './actions/AddExistingPad';
 import CreateAuthoredPad from './actions/CreateAuthoredPad';
 import CreatePasswordPad from './actions/CreatePasswordPad';
+import { path as etherpadPath } from '../../lib/Etherpad';
 
 export default function Etherpad() {
     const auth = useAuth();
     const matrix = useMatrix();
 
     const matrixClient = auth.getAuthenticationProvider('matrix').getMatrixClient();
     const etherpad = auth.getAuthenticationProvider('etherpad');
-    // we check if there is a custom path name defined and if so remove any forbidden url characters from the string
-    const path = getConfig().publicRuntimeConfig.authProviders.etherpad.path || '/etherpad';
 
     const { t } = useTranslation('etherpad');
     const router = useRouter();
@@ -149,7 +148,7 @@ export default function Etherpad() {
 
         await syncServerPadsAndSet();
 
-        router.push(path);
+        router.push(etherpadPath);
         setIsDeletingPad(false);
     };
 
@@ -192,16 +191,16 @@ export default function Etherpad() {
             <IframeLayout.Sidebar>
                 { !matrix.serviceSpaces.etherpad ? (
                     <>
-                        <h2>{ getConfig().publicRuntimeConfig.authProviders.etherpad.path }</h2>
+                        <h2>{ etherpadPath }</h2>
                         <LoadingSpinner />
                     </>
                 ) : (
                     <>
                         <ServiceSubmenu
-                            title={<h2>{ getConfig().publicRuntimeConfig.authProviders.etherpad.path }</h2>}
+                            title={<h2>{ etherpadPath }</h2>}
                             subheadline={t('What would you like to do?')}
                             items={submenuItems} />
-                        { getConfig().publicRuntimeConfig.authProviders.etherpad.myPads?.api && !serverPads && <ErrorMessage>{ t('Can\'t connect to the provided {{path}} server. Please try again later.', { path: path }) }</ErrorMessage> }
+                        { getConfig().publicRuntimeConfig.authProviders.etherpad.myPads?.api && !serverPads && <ErrorMessage>{ t('Can\'t connect to the provided {{path}} server. Please try again later.', { path: etherpadPath }) }</ErrorMessage> }
                         <ServiceTable>
                             { matrix.spaces.get(matrix.serviceSpaces.etherpad).children?.map(writeRoomId => {
                                 return <EtherpadListEntry

diff --git a/pages/etherpad/actions/AddExistingPad.js b/pages/etherpad/actions/AddExistingPad.js
@@ -6,6 +6,7 @@ import { useTranslation } from 'react-i18next';
 import Form from '../../../components/UI/Form';
 import ErrorMessage from '../../../components/UI/ErrorMessage';
 import LoadingSpinnerInline from '../../../components/UI/LoadingSpinnerInline';
+import { path as etherpadPath } from '../../../lib/Etherpad';
 
 export default function AddExistingPad({ callbackDone, createWriteRoom }) {
     const router = useRouter();
@@ -30,7 +31,7 @@ export default function AddExistingPad({ callbackDone, createWriteRoom }) {
         setPadLink('');
         setIsLoading(false);
 
-        router.push(`${getConfig().publicRuntimeConfig.authProviders.etherpad.path}/${roomId}`);
+        router.push(`${etherpadPath}/${roomId}`);
     };
 
     return (

diff --git a/pages/etherpad/actions/CreateAnonymousPad.js b/pages/etherpad/actions/CreateAnonymousPad.js
@@ -5,6 +5,7 @@ import getConfig from 'next/config';
 
 import Form from '../../../components/UI/Form';
 import LoadingSpinnerInline from '../../../components/UI/LoadingSpinnerInline';
+import { path as etherpadPath } from '../../../lib/Etherpad';
 
 export default function CreateAnonymousPad({ callbackDone, createWriteRoom }) {
     const router = useRouter();
@@ -29,7 +30,7 @@ export default function CreateAnonymousPad({ callbackDone, createWriteRoom }) {
         setPadName('');
 
         // Forward the user and show the newly created pad
-        router.push(`${getConfig().publicRuntimeConfig.authProviders.etherpad.path}/${roomId}`);
+        router.push(`${etherpadPath}/${roomId}`);
     };
 
     return (

diff --git a/pages/etherpad/actions/CreateAuthoredPad.js b/pages/etherpad/actions/CreateAuthoredPad.js
@@ -6,6 +6,7 @@ import { useTranslation } from 'react-i18next';
 import Form from '../../../components/UI/Form';
 import LoadingSpinnerInline from '../../../components/UI/LoadingSpinnerInline';
 import { useAuth } from '../../../lib/Auth';
+import { path as etherpadPath } from '../../../lib/Etherpad';
 
 export default function CreateAuthoredPad({ callbackDone, createWriteRoom }) {
     const router = useRouter();
@@ -27,7 +28,7 @@ export default function CreateAuthoredPad({ callbackDone, createWriteRoom }) {
         }
         const link = getConfig().publicRuntimeConfig.authProviders.etherpad.baseUrl + '/' + padId;
         const roomId = await createWriteRoom(link, padName);
-        router.push(`${getConfig().publicRuntimeConfig.authProviders.etherpad.path}/${roomId}`);
+        router.push(`${etherpadPath}/${roomId}`);
 
         callbackDone && callbackDone();
         setPadName('');

diff --git a/pages/etherpad/actions/CreatePasswordPad.js b/pages/etherpad/actions/CreatePasswordPad.js
@@ -6,6 +6,7 @@ import { useTranslation } from 'react-i18next';
 import Form from '../../../components/UI/Form';
 import LoadingSpinnerInline from '../../../components/UI/LoadingSpinnerInline';
 import { useAuth } from '../../../lib/Auth';
+import { path as etherpadPath } from '../../../lib/Etherpad';
 
 export default function CreatePasswordPad({ callbackDone, createWriteRoom }) {
     const router = useRouter();
@@ -24,7 +25,7 @@ export default function CreatePasswordPad({ callbackDone, createWriteRoom }) {
         const padId = await etherpad.createPad(padName, 'private', password);
         const link = getConfig().publicRuntimeConfig.authProviders.etherpad.baseUrl + '/' + padId;
         const roomId = await createWriteRoom(link, padName);
-        router.push(`${getConfig().publicRuntimeConfig.authProviders.etherpad.path}/${roomId}`);
+        router.push(`${etherpadPath}/${roomId}`);
 
         callbackDone && callbackDone();
         setPadName('');