IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,669 Commits 5 Branches 2 Tags
Commit Graph

2468 Commits

Author SHA1 Message Date
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
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
0f74273b5b Let post factory create default category 
- since we have factories that ensure a post has a category created, we
  don't need extra code to create a category before the post
 2020-02-18 10:36:34 +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
6ea2f3c8a9
Merge pull request #3029 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.7.0 
build(deps-dev): bump eslint-plugin-jest from 23.6.0 to 23.7.0 in /backend
 2020-02-14 11:28:18 +01:00
dependabot-preview[bot]
b93ed8dc1b
build(deps): bump metascraper-image from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.7...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-14 04:18:52 +00: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
mattwr18
b4fe3de4bb
Merge pull request #3041 from Human-Connection/node_v13_compatiblity 
build(deps): Node v13 compatbility
 2020-02-12 11:40:36 +01:00
dependabot-preview[bot]
b6f505d4be
build(deps): bump request from 2.88.0 to 2.88.2 in /backend 
Bumps [request](https://github.com/request/request) from 2.88.0 to 2.88.2.
- [Release notes](https://github.com/request/request/releases)
- [Changelog](https://github.com/request/request/blob/master/CHANGELOG.md)
- [Commits](https://github.com/request/request/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-12 04:17:48 +00:00
roschaefer
2f0e40e0e4 build(deps): Node v13 compatbility 
Through https://github.com/jaydenseric/graphql-upload/issues/170#issue-527336432
 2020-02-11 23:18:37 +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
63ef9e339d chore: Update to v0.3.1 2020-02-10 17:33:31 +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
1fce867b46
Merge pull request #2921 from Human-Connection/refactor_factories_with_rosie 
refactor(factories): Refactor test factories with rosie.js
 2020-02-10 14:03:03 +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
dependabot-preview[bot]
7a3cd75469 build(deps-dev): bump eslint-plugin-jest in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.6.0 to 23.7.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.6.0...v23.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 04:18:27 +00:00
dependabot-preview[bot]
64d90e5311 build(deps): bump graphql-shield from 7.0.10 to 7.0.11 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.10 to 7.0.11.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.10...v7.0.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 04:17:22 +00:00
roschaefer
a77f8d92bc Speed up factories a little 2020-02-08 17:55:07 +01:00
mattwr18
069c637c84 Run yarn install to update yarn.lock 2020-02-07 15:10:45 +01:00
mattwr18
7488e724cb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-07 14:50:53 +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
mattwr18
3373bf232b
Merge pull request #3020 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.10.0 
build(deps-dev): bump apollo-server-testing from 2.9.16 to 2.10.0 in /backend
 2020-02-07 09:54:45 +01:00
dependabot-preview[bot]
7dca739325
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.16 to 2.10.0.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.9.16...apollo-server-testing@2.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-07 04:17:46 +00:00
dependabot-preview[bot]
ae0ac37f3d
build(deps): bump apollo-server from 2.9.16 to 2.10.0 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.16 to 2.10.0.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.9.16...apollo-server@2.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-07 04:17:26 +00:00
mattwr18
0851ad4c50 Add end line 2020-02-06 10:33:56 +01:00
dependabot-preview[bot]
f1e60b2362
build(deps): bump graphql-tag from 2.10.2 to 2.10.3 in /backend 
Bumps [graphql-tag](https://github.com/apollographql/graphql-tag) from 2.10.2 to 2.10.3.
- [Release notes](https://github.com/apollographql/graphql-tag/releases)
- [Changelog](https://github.com/apollographql/graphql-tag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/graphql-tag/compare/v2.10.2...v2.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-06 08:04:09 +00:00
dependabot-preview[bot]
cdddd5b092
build(deps): bump graphql-shield from 7.0.9 to 7.0.10 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.9 to 7.0.10.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.9...v7.0.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-06 04:19:04 +00: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
77ed5a2755
Merge pull request #2994 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-author-5.10.7 
build(deps): bump metascraper-author from 5.10.6 to 5.10.7 in /backend
 2020-02-05 11:04:11 +01:00
mattwr18
f771936aa6
Merge pull request #2978 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.10.7 
build(deps): bump metascraper-title from 5.10.6 to 5.10.7 in /backend
 2020-02-05 10:06:57 +01:00
dependabot-preview[bot]
4d7c31a550
build(deps): bump metascraper-author from 5.10.6 to 5.10.7 in /backend 
Bumps [metascraper-author](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.6...v5.10.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-05 07:58:24 +00:00