fix: disable session check for billboard

dm3-org · Nov 8, 2023 · d08eb5b · d08eb5b
1 parent 3726417
commit d08eb5b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/deploy-billboard.yml b/.github/workflows/deploy-billboard.yml
@@ -52,6 +52,7 @@ jobs:
                   echo "RPC=${{ secrets.STAGING_RPC }}" >> ./.env
                   echo "BILLBOARD_PRIVATE_KEY=${{ secrets.BILLBOARD_PRIVATE_KEY}}" >> ./.env
                   echo "interceptor=${{ secrets.INTERCEPTOR}}" >> ./.env
+                  echo "DISABLE_SESSION_CHECK='true'" >> ./.env
                   envsubst '${SSL_CERTIFICATE_BASE_LOC} ${TLS_CERTIFICATE_LOCATION} ${TARGET_HOST}' < ./docker/nginx.conf > ./nginx.conf
                   cat ./.env
             - name: Build docker image

diff --git a/docker/billboard/docker-compose.yml b/docker/billboard/docker-compose.yml
@@ -25,6 +25,7 @@ services:
       SIGNING_PRIVATE_KEY: ${SIGNING_PRIVATE_KEY}
       ENCRYPTION_PUBLIC_KEY: ${ENCRYPTION_PUBLIC_KEY}
       ENCRYPTION_PRIVATE_KEY: ${ENCRYPTION_PRIVATE_KEY}
+      DISABLE_SESSION_CHECK: ${DISABLE_SESSION_CHECK}
       RPC: ${RPC}
       PORT: 8081
       LOG_LEVEL: 'debug'

diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
@@ -16,6 +16,7 @@ import Profile from './profile';
 import RpcProxy from './rpc/rpc-proxy';
 import Storage from './storage';
 import { logInfo } from 'dm3-lib-shared';
+import 'dotenv/config';
 
 import {
     errorHandler,

diff --git a/packages/backend/src/profile.ts b/packages/backend/src/profile.ts
@@ -49,6 +49,8 @@ export default () => {
                     method: 'POST',
                     url: req.url,
                     ensName,
+                    disableSessionCheck:
+                        process.env.DISABLE_SESSION_CHECK === 'true',
                 });
 
                 const data = await submitUserProfile(
@@ -69,6 +71,10 @@ export default () => {
 
                 res.json(data);
             } catch (e) {
+                global.logger.warn({
+                    message: 'POST profile',
+                    error: JSON.stringify(e),
+                });
                 res.status(400).send({
                     message: `Couldn't store profile`,
                     error: JSON.stringify(e),

diff --git a/packages/lib/delivery/src/UserProfile.ts b/packages/lib/delivery/src/UserProfile.ts
@@ -38,35 +38,39 @@ export async function submitUserProfile(
     send: (socketId: string) => void,
 ): Promise<string> {
     const account = normalizeEnsName(ensName);
+    console.log('1', account, signedUserProfile);
 
     if (!(await checkUserProfile(provider, signedUserProfile, account))) {
         throw Error('Signature invalid.');
     }
-    //TODO: remvoe DISABLE_SESSION_CHECK
+    console.log('2', process.env.DISABLE_SESSION_CHECK);
+    //TODO:  remvoe DISABLE_SESSION_CHECK
     // DISABLE_SESSION_CHECK is a special solution for ETH Prague
     if (
         process.env.DISABLE_SESSION_CHECK !== 'true' &&
         (await getSession(account))
     ) {
         throw Error('Profile exists already');
     }
+    console.log('3');
     const session: Session = {
         account,
         signedUserProfile,
         token: uuidv4(),
         createdAt: new Date().getTime(),
         profileExtension: getDefaultProfileExtension(),
     };
+    console.log('4', session);
 
     await setSession(account.toLocaleLowerCase(), session);
-
+    console.log('5');
     await handlePendingConversations(
         account,
         getSession,
         getPendingConversations,
         send,
     );
-
+    console.log('6');
     return session.token;
 }