Merge pull request #111 from openstad/bugfix/currentuser-bugfix-and-c…

…leanup

Fixed small bug that prevents a proper login, removed legacy config key

packages/data-store/src/hooks/use-comments.js

@@ -1,44 +1,79 @@
 import { useState } from 'react';
 
 export default function useComments(props) {
-
   let self = this;
 
-  const projectId = props.projectId || props.config.projectId;
-  const resourceId = props.resourceId || props.config.resourceId;
-  const sentiment = props.sentiment || props.config.sentiment || null;
+  const projectId = props.projectId;
+  const resourceId = props.resourceId;
+  const sentiment = props.sentiment || null;
 
-  const { data, error, isLoading } = self.useSWR({ projectId, resourceId, sentiment }, 'comments.fetch');
+  const { data, error, isLoading } = self.useSWR(
+    { projectId, resourceId, sentiment },
+    'comments.fetch'
+  );
 
   // add functionality
   let comments = data || [];
-  comments.create = function(newData) {
-    return self.mutate({ projectId, resourceId, sentiment }, 'comments.create', newData, { action: 'create' });
-  }
-  comments.map( async comment => {
-    comment.update = function(newData) {
-      return self.mutate({ projectId, resourceId, sentiment }, 'comments.update', newData, { action: 'update' });
-    }
-    comment.delete = function(newData) {
-      return self.mutate({ projectId, resourceId, sentiment }, 'comments.delete', comment, { action: 'delete' });
-    }
-    comment.submitLike = function() {
-      return self.mutate({ projectId, resourceId, sentiment }, 'comments.submitLike', comment, { action: 'update' });
-    }
-    comment.replies?.map( async reply => {
-      reply.update = function(newData) {
-        return self.mutate({ projectId, resourceId, sentiment }, 'comments.update', newData, { action: 'update' });
-      }
-      reply.delete = function(newData) {
-        return self.mutate({ projectId, resourceId, sentiment }, 'comments.delete', reply, { action: 'delete' });
-      }
-      reply.submitLike = function() {
-        return self.mutate({ projectId, resourceId, sentiment }, 'comments.submitLike', reply, { action: 'update' });
-      }
-    })
-  })
-
-  return [ comments, error, isLoading ];
+  comments.create = function (newData) {
+    return self.mutate(
+      { projectId, resourceId, sentiment },
+      'comments.create',
+      newData,
+      { action: 'create' }
+    );
+  };
+  comments.map(async (comment) => {
+    comment.update = function (newData) {
+      return self.mutate(
+        { projectId, resourceId, sentiment },
+        'comments.update',
+        newData,
+        { action: 'update' }
+      );
+    };
+    comment.delete = function (newData) {
+      return self.mutate(
+        { projectId, resourceId, sentiment },
+        'comments.delete',
+        comment,
+        { action: 'delete' }
+      );
+    };
+    comment.submitLike = function () {
+      return self.mutate(
+        { projectId, resourceId, sentiment },
+        'comments.submitLike',
+        comment,
+        { action: 'update' }
+      );
+    };
+    comment.replies?.map(async (reply) => {
+      reply.update = function (newData) {
+        return self.mutate(
+          { projectId, resourceId, sentiment },
+          'comments.update',
+          newData,
+          { action: 'update' }
+        );
+      };
+      reply.delete = function (newData) {
+        return self.mutate(
+          { projectId, resourceId, sentiment },
+          'comments.delete',
+          reply,
+          { action: 'delete' }
+        );
+      };
+      reply.submitLike = function () {
+        return self.mutate(
+          { projectId, resourceId, sentiment },
+          'comments.submitLike',
+          reply,
+          { action: 'update' }
+        );
+      };
+    });
+  });
 
+  return [comments, error, isLoading];
 }
-

packages/data-store/src/hooks/use-current-user.js

@@ -20,6 +20,7 @@ export default function useCurrentUser(props) {
 
     // get user from props
     let initialUser = props.openStadUser || props.config?.openStadUser || {};
+
     if (initialUser.id && initialUser.projectId == self.projectId) {
       return initialUser;
     }
@@ -37,7 +38,7 @@ export default function useCurrentUser(props) {
       history.replaceState(null, '', url);
     }
 
-    const cmsUser = props.cmsUser || props.config.cmsUser || {};
+    const cmsUser = props.cmsUser || {};
     // get cmsUser from session data - this is a fix for badly written cms logouts
     let sessionCmsUser = session.get('cmsUser') || {};
     if (sessionCmsUser && cmsUser) {