Merge pull request #1141 from dm3-org/cleanupAfterRedisMigration

Remove redis from backend
dm3-org · Sep 23, 2024 · b3446fe · b3446fe
2 parents 5797454 + bbb9844
commit b3446fe
Show file tree

Hide file tree

Showing 52 changed files with 218 additions and 403 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -25,7 +25,6 @@ services:
             - db
             - dm3-storage
         environment:
-            REDIS_URL: redis://db:6379
             SIGNING_PUBLIC_KEY: ${SIGNING_PUBLIC_KEY}
             SIGNING_PRIVATE_KEY: ${SIGNING_PRIVATE_KEY}
             ENCRYPTION_PUBLIC_KEY: ${ENCRYPTION_PUBLIC_KEY}
@@ -36,12 +35,6 @@ services:
             LOG_LEVEL: 'debug'
             DATABASE_URL: ${DATABASE_URL}
 
-    db:
-        image: redis
-        restart: always
-        volumes:
-            - ${PERSISTENCE_DIRECTORY}/db/redis:/data
-
     dm3-storage:
         image: postgres:13
         restart: always

diff --git a/packages/backend/docker-compose.test.yml b/packages/backend/docker-compose.test.yml
@@ -2,12 +2,6 @@ version: '3.6'
 
 # The containers that compose the project
 services:
-    db:
-        image: redis
-        restart: always
-        container_name: redis-backend
-        ports:
-            - '6380:6379' # map to host port 6380
     postgres:
         image: postgres:13
         restart: always

diff --git a/packages/backend/docker-compose.yml b/packages/backend/docker-compose.yml
@@ -2,12 +2,6 @@ version: '3.6'
 
 # The containers that compose the project
 services:
-    db:
-        image: redis
-        restart: always
-        container_name: redis
-        ports:
-            - '6380:6379' # map to host port 6380
     dm3-storage:
         image: postgres:13
         restart: always

diff --git a/packages/backend/manual_data_migration/insertWithinDocker.sh b/packages/backend/manual_data_migration/insertWithinDocker.sh
diff --git a/packages/backend/manual_data_migration/notes.md b/packages/backend/manual_data_migration/notes.md
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -20,7 +20,7 @@
     "dotenv": "^16.0.1",
     "ethers": "5.7.2",
     "express": "^4.18.1",
-    "redis": "^4.1.0",
+    "prisma": "^5.10.1",
     "web-push": "^3.6.7",
     "yaml": "^2.1.3"
   },
@@ -43,7 +43,6 @@
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.13",
     "@types/node": "^20.3.1",
-    "@types/redis": "^4.0.11",
     "@types/supertest": "^2.0.12",
     "babel-cli": "^6.26.0",
     "babel-jest": "^29.2.2",

diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
@@ -1,5 +1,5 @@
 import {
-    Auth,
+    Authenticate,
     errorHandler,
     getCachedWebProvider,
     getServerSecret,
@@ -39,7 +39,7 @@ app.use(bodyParser.json());
     });
     app.use('/profile', Profile(db, web3Provider, serverSecret));
     app.use('/storage', Storage(db, web3Provider, serverSecret));
-    app.use('/auth', Auth(db, serverSecret, web3Provider));
+    app.use('/auth', Authenticate(db, serverSecret, web3Provider));
     app.use(logError);
     app.use(errorHandler);
 })();

diff --git a/packages/backend/src/persistence/account/getAccount.ts b/packages/backend/src/persistence/account/getAccount.ts
diff --git a/packages/backend/src/persistence/account/index.ts b/packages/backend/src/persistence/account/index.ts
diff --git a/packages/backend/src/persistence/account/setAccount.ts b/packages/backend/src/persistence/account/setAccount.ts
diff --git a/packages/backend/src/persistence/getDatabase.ts b/packages/backend/src/persistence/getDatabase.ts
@@ -1,51 +1,9 @@
 import { Account, PrismaClient } from '@prisma/client';
-import { createClient } from 'redis';
 import Storage from './storage';
 import { ConversationRecord } from './storage/postgres/dto/ConversationRecord';
 import { MessageRecord } from './storage/postgres/dto/MessageRecord';
 import { IAccountDatabase } from '@dm3-org/dm3-lib-server-side';
 
-export enum RedisPrefix {
-    Conversation = 'conversation:',
-    IncomingConversations = 'incoming.conversations:',
-    Sync = 'sync:',
-    // Account used to be called Session. The prefix still resolves to "session:" for now.
-    Account = 'session:',
-    NotificationChannel = 'notificationChannel:',
-    GlobalNotification = 'globalNotification:',
-    Otp = 'otp:',
-    UserStorageMigrated = 'user.storage.migrated:',
-}
-
-export async function getRedisClient() {
-    const url = process.env.REDIS_URL || 'redis://127.0.0.1:6380';
-    const socketConf = {
-        socket: {
-            tls: true,
-            rejectUnauthorized: false,
-        },
-    };
-    const client = createClient(
-        process.env.NODE_ENV === 'production'
-            ? {
-                  url,
-                  ...socketConf,
-              }
-            : { url },
-    );
-
-    client.on('error', (err) => {
-        console.error('Redis error: ' + (err as Error).message);
-    });
-
-    client.on('reconnecting', () => console.info('Redis reconnection'));
-    client.on('ready', () => console.info('Redis ready'));
-
-    await client.connect();
-
-    return client;
-}
-
 export async function getPrismaClient() {
     return new PrismaClient();
 }
@@ -56,28 +14,28 @@ export async function getDatabase(
     const prisma = _prisma ?? (await getPrismaClient());
 
     return {
-        //Session
+        //Account
         setAccount: Storage.setAccount(prisma),
         getAccount: Storage.getAccount(prisma),
         hasAccount: Storage.hasAccount(prisma),
-        //Storage AddConversation
+        //AddConversation
         addConversation: Storage.addConversation(prisma),
         getConversationList: Storage.getConversationList(prisma),
-        //Storage Add Messages
+        //Add Messages
         addMessageBatch: Storage.addMessageBatch(prisma),
-        //Storage Get Messages
+        //Get Messages
         getMessagesFromStorage: Storage.getMessages(prisma),
-        //Storage Edit Message Batch
+        //Edit Message Batch
         editMessageBatch: Storage.editMessageBatch(prisma),
-        //Storage Get Number Of Messages
+        //Get Number Of Messages
         getNumberOfMessages: Storage.getNumberOfMessages(prisma),
-        //Storage Get Number Of Converations
+        //Get Number Of Converations
         getNumberOfConverations: Storage.getNumberOfConversations(prisma),
-        //Storage Toggle Hide Conversation
+        //Toggle Hide Conversation
         toggleHideConversation: Storage.toggleHideConversation(prisma),
-        //Storage Get Halted Messages
+        //Get Halted Messages
         getHaltedMessages: Storage.getHaltedMessages(prisma),
-        //Storage Delete Halted Message
+        //Delete Halted Message
         clearHaltedMessage: Storage.clearHaltedMessage(prisma),
     };
 }
@@ -130,5 +88,3 @@ export interface IBackendDatabase extends IAccountDatabase {
         messageId: string,
     ) => Promise<boolean>;
 }
-
-export type Redis = Awaited<ReturnType<typeof getRedisClient>>;
diff --git a/packages/backend/src/persistence/getIdEnsName.ts b/packages/backend/src/persistence/getIdEnsName.ts
diff --git a/...rc/persistence/account/setAccount.test.ts → ...tence/storage/postgres/setAccount.test.ts b/...rc/persistence/account/setAccount.test.ts → ...tence/storage/postgres/setAccount.test.ts
@@ -1,6 +1,10 @@
 import { UserProfile } from '@dm3-org/dm3-lib-profile';
 import { PrismaClient } from '@prisma/client';
-import { IBackendDatabase, getDatabase, getPrismaClient } from '../getDatabase';
+import {
+    IBackendDatabase,
+    getDatabase,
+    getPrismaClient,
+} from '../../getDatabase';
 
 const USER_NAME = '0x25A643B6e52864d0eD816F1E43c0CF49C83B8292.dm3.eth';
 
@@ -14,12 +18,6 @@ describe('Set Account', () => {
     });
 
     it('Creates a new Account ', async () => {
-        const profile: UserProfile = {
-            publicEncryptionKey: '',
-            publicSigningKey: '',
-            deliveryServices: [],
-        };
-
         const priorSetAccount = await db.getAccount(USER_NAME);
 
         //User has no account yet

diff --git a/packages/backend/src/profile/getUserProfile.ts b/packages/backend/src/profile/getUserProfile.ts
diff --git a/packages/backend/src/profile/profile.test.ts b/packages/backend/src/profile/profile.test.ts
@@ -43,7 +43,6 @@ const createDbMock = async () => {
     const dbMock = {
         getAccount: async (ensName: string) => Promise.resolve(accountMocked),
         setAccount: async (id: string) => {},
-        getIdEnsName: async (ensName: string) => ensName,
     };
 
     return dbMock as any;
@@ -113,7 +112,6 @@ describe('Profile', () => {
                 setAccount: async (_: string, __: any) => {
                     return (_: any, __: any, ___: any) => {};
                 },
-                getIdEnsName: async (ensName: string) => ensName,
             };
 
             const app = express();

diff --git a/packages/backend/src/profile/profile.ts b/packages/backend/src/profile/profile.ts
@@ -54,8 +54,6 @@ export default (
                 method: 'POST',
                 url: req.url,
                 ensName,
-                disableSessionCheck:
-                    process.env.DISABLE_SESSION_CHECK === 'true',
             });
 
             // check if profile and signature are valid

diff --git a/packages/backend/src/storage.ts b/packages/backend/src/storage.ts
@@ -1,5 +1,5 @@
 import { normalizeEnsName } from '@dm3-org/dm3-lib-profile';
-import { authorize } from '@dm3-org/dm3-lib-server-side';
+import { authorizationMiddleware } from '@dm3-org/dm3-lib-server-side';
 import { sha256, validateSchema } from '@dm3-org/dm3-lib-shared';
 import cors from 'cors';
 import { ethers } from 'ethers';
@@ -32,7 +32,7 @@ export default (
             next: NextFunction,
             ensName: string,
         ) => {
-            authorize(
+            authorizationMiddleware(
                 req,
                 res,
                 next,

diff --git a/packages/delivery-service/src/delivery.ts b/packages/delivery-service/src/delivery.ts
@@ -4,7 +4,7 @@ import {
     schema,
 } from '@dm3-org/dm3-lib-delivery';
 import { normalizeEnsName } from '@dm3-org/dm3-lib-profile';
-import { authorize } from '@dm3-org/dm3-lib-server-side';
+import { authorizationMiddleware } from '@dm3-org/dm3-lib-server-side';
 import { validateSchema } from '@dm3-org/dm3-lib-shared';
 import cors from 'cors';
 import { ethers } from 'ethers';
@@ -40,7 +40,7 @@ export default (
     //TODO remove
     router.use(cors());
     router.param('ensName', async (req, res, next, ensName: string) => {
-        authorize(
+        authorizationMiddleware(
             req,
             res,
             next,