enable old storage api until the migrations has been finalized (#728)

Author: AlexNi245

packages/backend/src/persistance/getDatabase.ts

@@ -69,6 +69,10 @@ export async function getDatabase(_redis?: Redis): Promise<IDatabase> {
         //Storage
         getUserStorageChunk: Storage.getUserStorageChunk(redis),
         setUserStorageChunk: Storage.setUserStorageChunk(redis),
+        //Legacy remove after storage has been merged
+        getUserStorage: Storage.getUserStorageOld(redis),
+        setUserStorage: Storage.setUserStorageOld(redis),
+
         //Pending
         addPending: Pending.addPending(redis),
         getPending: Pending.getPending(redis),
@@ -119,6 +123,9 @@ export interface IDatabase {
         key: string,
         data: string,
     ) => Promise<void>;
+    //Legacy remove after storage has been merged
+    getUserStorage: (ensName: string) => Promise<UserStorage | null>;
+    setUserStorage: (ensName: string, data: string) => Promise<void>;
     setAliasSession: (ensName: string, aliasEnsName: string) => Promise<void>;
     addPending: (ensName: string, contactEnsName: string) => Promise<void>;
     getPending: (ensName: string) => Promise<string[]>;

packages/backend/src/persistance/storage/getUserStorageOld.ts

@@ -0,0 +1,14 @@
+import { Redis, RedisPrefix } from '../getDatabase';
+import { UserStorage } from '@dm3-org/dm3-lib-storage';
+import { getIdEnsName } from '../getIdEnsName';
+
+//Bring the old storage api temporarily back to allow testing without breaking changes
+//Remove as soon a storage is fully migrated
+export function getUserStorageOld(redis: Redis) {
+    return async (ensName: string): Promise<UserStorage | null> => {
+        const userStorage = await redis.get(
+            RedisPrefix.UserStorage + (await getIdEnsName(redis)(ensName)),
+        );
+        return userStorage ? JSON.parse(userStorage) : null;
+    };
+}

packages/backend/src/persistance/storage/index.ts

@@ -1,4 +1,12 @@
 import { setUserStorageChunk } from './setUserStorage';
 import { getUserStorageChunk } from './getUserStorage';
 
-export default { setUserStorageChunk, getUserStorageChunk };
+import { getUserStorageOld } from './getUserStorageOld';
+import { setUserStorageOld } from './setUserStorageOld';
+
+export default {
+    setUserStorageChunk,
+    getUserStorageChunk,
+    getUserStorageOld,
+    setUserStorageOld,
+};

packages/backend/src/persistance/storage/setUserStorageOld.ts

@@ -0,0 +1,12 @@
+import { stringify } from '@dm3-org/dm3-lib-shared';
+import { Redis, RedisPrefix } from '../getDatabase';
+import { getIdEnsName } from '../getIdEnsName';
+
+export function setUserStorageOld(redis: Redis) {
+    return async (ensName: string, data: string): Promise<void> => {
+        await redis.set(
+            RedisPrefix.UserStorage + (await getIdEnsName(redis)(ensName)),
+            stringify(data),
+        );
+    };
+}

packages/backend/src/storage.test.ts

@@ -62,7 +62,7 @@ describe('Storage', () => {
                     '0x71CB05EE1b1F506fF321Da3dac38f25c0c9ce6E1',
             };
             const { status } = await request(app)
-                .get(`/bob.eth/123`)
+                .get(`/new/bob.eth/123`)
                 .set({
                     authorization: `Bearer ${token}`,
                 })
@@ -103,7 +103,7 @@ describe('Storage', () => {
             };
 
             const { status } = await request(app)
-                .post(`/bob.eth/123`)
+                .post(`/new/bob.eth/123`)
                 .set({
                     authorization: `Bearer ${token}`,
                 })

packages/backend/src/storage.ts

@@ -11,7 +11,7 @@ export default () => {
     router.use(cors());
     router.param('ensName', auth);
 
-    router.get('/:ensName/:key', async (req, res, next) => {
+    router.get('/new/:ensName/:key', async (req, res, next) => {
         try {
             const ensName = normalizeEnsName(req.params.ensName);
             const userStorage = await req.app.locals.db.getUserStorageChunk(
@@ -24,7 +24,7 @@ export default () => {
         }
     });
 
-    router.post('/:ensName/:key', async (req, res, next) => {
+    router.post('/new/:ensName/:key', async (req, res, next) => {
         try {
             const ensName = normalizeEnsName(req.params.ensName);
 
@@ -42,5 +42,34 @@ export default () => {
         }
     });
 
+    router.get('/:ensName', async (req, res, next) => {
+        try {
+            const account = normalizeEnsName(req.params.ensName);
+            const userStorage = await req.app.locals.db.getUserStorageOld(
+                account,
+            );
+            return res.json(userStorage);
+        } catch (e) {
+            next(e);
+        }
+    });
+
+    router.post('/:ensName', async (req, res, next) => {
+        try {
+            const account = normalizeEnsName(req.params.ensName);
+
+            await req.app.locals.db.setUserStorage(
+                account,
+                stringify(req.body)!,
+            );
+
+            res.json({
+                timestamp: new Date().getTime(),
+            });
+        } catch (e) {
+            next(e);
+        }
+    });
+
     return router;
 };