1159 Commits

Author SHA1 Message Date
Robert Schäfer
b7896f9c4e
Merge pull request #3101 from Human-Connection/3088-fix_notificationAdded_is_null
fix(subscriptions): Don't publish undefined
2020-02-19 09:47:38 +01:00
mattwr18
a346632fff Avoid running cypher statement if not needed
- it just feels safer to not run a cypher statement if there is no user
  in the idsOfUsers array. Why risk notifications pointing to empty
nodes? It doesn't seem like this happens, but I'm not sure how to write
a test to verify, and why run cypher statements, if there is no need to?
2020-02-18 23:19:14 +01:00
mattwr18
54caaaaa0a Remove unnecessary guard clause
- filter returns an empty array, and no notification is created if
  idsOfUsers is an empty array
2020-02-18 22:43:19 +01:00
mattwr18
7fe6fb110b Remove unnecessary negation of negation, refactor
- tests to use `toMatchObject`, which checks that only one notification
  is indeed created
2020-02-18 22:21:49 +01:00
Robert Schäfer
b003fb3f10
Merge pull request #2589 from Human-Connection/2587-geolocation-swap-lng-with-lat
fix: swap lat and lng
2020-02-18 17:55:57 +01:00
roschaefer
f32bfc7e36 fix(subscriptions): Don't publish undefined
Fix #3088
2020-02-18 16:25:11 +01:00
mattwr18
44d503c53c
Merge pull request #3090 from Human-Connection/2202_do_not_encode_the_entire_user_in_bearer_token
fix(jwt): Whitelist encoded JWT attributes
2020-02-18 14:37:15 +01:00
Moriz Wahl
5b41561cc4 throw error added to template 2020-02-18 14:16:46 +01:00
mattwr18
1b62dc3b2e Remove sequence for slug as it's not needed 2020-02-18 13:40:48 +01:00
mattwr18
6f6b1534df Reload page to add Category button
- I believe the cypress test is so fast that we visit the post/create
  page before the relationship CATEGORIZED is added, and therefore, we
must refresh the page.
- I am not happy about this solution, but I'm not sure what we can do...
  maybe wait for the post to be succesfully created with all it's
relationships?
2020-02-18 13:33:34 +01:00
roschaefer
e41a639cf1 fix(jwt): Encode only 3 attributes in JWT
This will prevent unintentional encoding of users email addresses in the
JWT.

@steffi201028 this might be interesting for you as well.
2020-02-18 11:23:04 +01:00
mattwr18
ee3a85f70f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3054-add-e2e-tests-image-uploader 2020-02-18 09:38:56 +01:00
roschaefer
6bba756856 Fix seeds, don't create additional categories 2020-02-18 00:30:53 +01:00
mattwr18
3398c2c12a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3054-add-e2e-tests-image-uploader 2020-02-17 18:38:09 +01:00
mattwr18
fa02a4dd33 Write cypress tests for ImageUploader
- have I missed any important features? too many tests?
2020-02-12 17:53:38 +01:00
mattwr18
4391915611 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-12 16:14:05 +01:00
Moriz Wahl
31cec2cf0c improved migration 2020-02-11 14:37:10 +01:00
Moriz Wahl
1ae6769c7d spec for location swapped lng and lat too 2020-02-11 11:33:47 +01:00
mattwr18
708ab6ecde Set equal to nginx max body size 2020-02-10 19:21:53 +01:00
mattwr18
00195f1615 Increase body parser limit
- The default limit is only 100kb
- we are getting many requests that exceed this limit
- not sure about what would be an appropriate limit, but have seen 50mb
  in many examples.
2020-02-10 19:16:41 +01:00
mattwr18
f16c8b27e7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-10 17:37:34 +01:00
mattwr18
409150813d Update to use PubSub in development
- for some reason RedisPubSub works locally, but with docker it tries to
  connect to Redis and therefore it doesn't pass the build. PubSub is
imported from graphql-subscriptions which is a dependency of
apollo-server-express, and suitable for dev purposes.
2020-02-10 17:19:19 +01:00
mattwr18
5347f734af Fix cypress tests/frontend implementation
- Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2020-02-10 16:25:00 +01:00
mattwr18
bcf9680ad9 Add type resolver for hasBlocked 2020-02-10 14:33:49 +01:00
mattwr18
c2802aa4f2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3033-fix-block-users-bug 2020-02-10 14:24:32 +01:00
mattwr18
70bb034343 Remove unused email property from user factory 2020-02-10 13:13:51 +01:00
mattwr18
3b29d480e3 Display unblock feature only for blocking user
- add hasBlocked query to check if userA initiated the blocking and, if
  true, only them to unblock userB.
- add cypress tests to make sure we don't break this in the future.
2020-02-10 12:34:40 +01:00
roschaefer
a77f8d92bc Speed up factories a little 2020-02-08 17:55:07 +01:00
mattwr18
6271b53b30 Set up Subscriptions with RedisPubSub 2020-02-07 14:48:55 +01:00
roschaefer
46edc3fdd5 Replace buildList with array of Promises
reason: Rosie.js does not support promises. So for the time being, we
shall not use more than one `after` callback and we shall not use
buildList as it does not return a `Promise.all([])`. We have to ask the
maintainers of Rosie.js if they accept the breaking change of returning
a Promise always.
2020-02-07 14:28:57 +01:00
roschaefer
3c50255da2 Merge remote-tracking branch 'origin/master' into refactor_factories_with_rosie 2020-02-07 14:07:19 +01:00
Moriz Wahl
86f298f8e5 prettier, prettier 2020-02-06 23:00:06 +01:00
Moriz Wahl
4905b09b3e migration added to swap lat and lng in db 2020-02-06 20:47:45 +01:00
Moriz Wahl
cb8b2acffd swap lng and lat in db seed 2020-02-06 19:56:44 +01:00
Moriz Wahl
976583b235 fixing test for geolocation 2020-02-06 19:56:44 +01:00
Moriz Wahl
ef9d351fcf swap lat and lng 2020-02-06 19:56:44 +01:00
mattwr18
0851ad4c50 Add end line 2020-02-06 10:33:56 +01:00
mattwr18
7ac973f9a1 Refactor cypher statement to simplify
- it's questionable whether this simplifies it or not, and actually adds
  one line of code, but now it looks more similiar to the code in the
notifications query
2020-02-05 20:45:56 +01:00
mattwr18
6cf067937d Clean up
- remove the code for subscriptions to Post as we won't implement this
  at this time... I've created a new branch with the code that can be
built on later
- remove unused subscription path
- add possibility to use websockets uri for production env.
2020-02-05 20:24:23 +01:00
mattwr18
1c6a5503db Get subscriptions working with notifyUserOfComment
- Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
2020-02-05 19:06:55 +01:00
mattwr18
110165691a Refactor out transformReturnType function
- we have introduced a better way to return all the info we want without
  needing to make multiple database queries. It was introduced by
@roschaefer in the PR for the notifications query, but we hadn't
refactored markAsRead yet.
- Now that we are subscribing to notifications, we need to have the same
  return info as the notification query.

- Co-authored-by: Tirokk <wolle.huss@pjannto.com>
2020-02-05 18:42:31 +01:00
mattwr18
2f43069ea0 Subscribe to notifications/remove polling
- We want to publish when a notification occurs for a specific user, not
  have the client poll the backend for ever user every minute.

- Co-authored-by: @Tirokk <wolle.huss@pjannto.com>
2020-02-05 17:37:38 +01:00
mattwr18
04f0467d2d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-05 14:33:57 +01:00
mattwr18
5931e363ef
Use original createdAt for merged users/emails (#2969)
- Also, use original verifiedAt date for emails. These users only have
  newly created accounts/emails because of our blunder. Their nodes
should reflect when they became members/verified their emails.
2020-02-03 19:17:48 +01:00
roschaefer
fa0e64b7cb Merge remote-tracking branch 'origin/master' into refactor_factories_with_rosie
There was a single step definition that created a post and a comment. I
would say let's put that in two different steps.
2020-02-01 13:33:07 +01:00
mattwr18
701411e270 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-31 13:08:31 +01:00
mattwr18
60cd593826 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-30 10:47:50 +01:00
mattwr18
bcc1ab167e Improve styling per @alina-beck review 2020-01-30 10:46:43 +01:00
roschaefer
910f122087 Fix lint and cypress 2020-01-29 02:02:58 +01:00
roschaefer
f9c42ab2a5 refactor(seeds): Use buildList to setup lists 2020-01-28 23:40:41 +01:00