Remove "Matrix Content Storage"

lib/Auth.js

@@ -14,7 +14,6 @@ import EtherpadAuthProvider from './auth/EtherpadAuthProvider';
  */
 const AuthProviders = {
     matrix: MatrixAuthProvider,
-    matrixContentStorage: MatrixAuthProvider,
     peerTube: PeerTubeAuthProvider,
     etherpad: EtherpadAuthProvider,
 };

next.config.example.js

@@ -8,16 +8,12 @@ module.exports = {
                 baseUrl: 'https://matrix.org',
                 allowCustomHomeserver: true,
             },
-            matrixContentStorage: {
-                baseUrl: 'https://second.matrixserver.org',
-            },
             etherpad: {
                 path: '/write',
                 baseUrl: 'https://pad.riseup.net/p',
                 myPads: {
                     api: 'http://etherpad.localhost/mypads/api',
                     spacesGroupName: '/spaces', // optional, defaults to publicRuntimeConfig.name
-
                 },
             },
         },

pages/_app.js

@@ -3,20 +3,20 @@ import Head from 'next/head';
 import getConfig from 'next/config';
 import { useRouter } from 'next/router';
 
-import '../lib/Internationalization';
-
+import { DefaultLayout } from '../components/layouts/default';
 import { AuthContext, useAuthProvider } from '../lib/Auth';
 import { MatrixContext, useMatrixProvider } from '../lib/Matrix';
+import '../lib/Internationalization';
+
 import '/assets/_globalCss.css';
-import { DefaultLayout } from '../components/layouts/default';
-import MatrixAuthProvider from '../lib/auth/MatrixAuthProvider';
 
 const guestRoutes = ['/', '/login'];
 
 export default function App({ Component, pageProps }) {
     const router = useRouter();
+
     const authData = useAuthProvider();
-    const matrixData = useMatrixProvider(authData.getActiveAuthenticationsByType(MatrixAuthProvider));
+    const matrixData = useMatrixProvider(authData);
 
     let Layout = DefaultLayout;
     if (Component.getLayout) { Layout = Component.getLayout(); }

pages/chat/[[...roomId]].js

@@ -6,7 +6,6 @@ import getConfig from 'next/config';
 import { useRouter } from 'next/router';
 import Link from 'next/link';
 
-import { useAuth } from '../../lib/Auth';
 import { useMatrix } from '../../lib/Matrix';
 import IframeLayout from '../../components/layouts/iframe';
 import { breakpoints } from '../../components/_breakpoints';
@@ -75,12 +74,11 @@ const SidebarListEntry = function({ room }) {
 };
 
 export default function RoomId() {
-    const auth = useAuth();
     const iframe = useRef();
     const router = useRouter();
     const roomId = _.get(router, 'query.roomId.0');
     const { t } = useTranslation('chat');
-    const matrix = useMatrix(auth.getAuthenticationProvider('matrix'));
+    const matrix = useMatrix();
 
     // Injecting custom CSS into the Element <iframe>
     useEffect(() => {

pages/etherpad/[[...roomId]].js

@@ -23,7 +23,7 @@ import CreatePasswordPad from './actions/CreatePasswordPad';
 
 export default function Etherpad() {
     const auth = useAuth();
-    const matrix = useMatrix(auth.getAuthenticationProvider('matrix'));
+    const matrix = useMatrix();
 
     const matrixClient = auth.getAuthenticationProvider('matrix').getMatrixClient();
     const etherpad = auth.getAuthenticationProvider('etherpad');

pages/login.js

@@ -65,8 +65,6 @@ export default function Login() {
     const logAuthenticationStatus = () => {
         console.log('matrix authentication provider status:');
         console.log(auth.getAuthenticationProvider('matrix'));
-        console.log('matrixContentStorage authentication provider status:');
-        console.log(auth.getAuthenticationProvider('matrixContentStorage'));
         console.log('peerTube authentication provider status:');
         console.log(auth.getAuthenticationProvider('peerTube'));
     };