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
586 Commits 5 Branches 2 Tags
Commit Graph

586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
f94bb72fdb Merge remote-tracking branch 'origin/master' into editor 2019-02-26 00:52:38 +01:00
Robert Schäfer
c4f15e626d Fix lint and unblock port 4001 
We have to specify the `yarn run test:cypress` in `.travis.yml` in the
Nitro-Web repo.
 2019-02-26 00:46:14 +01:00
Robert Schäfer
ec2b1050bc Less redundancy and more consistency in factories 
* use the same `relate` method for now
* use a capital letter for the model `user` instead of `User`
 2019-02-25 21:28:30 +01:00
Robert Schäfer
bd264673bd Merge branch 'master' into editor 2019-02-25 19:34:48 +01:00
Robert Schäfer
aef367b210 Backend runs test- and seed-server on travis 
This is necessary for fullstack testing in the frontend repository
 2019-02-25 19:34:24 +01:00
Grzegorz Leoniec
bc6089dbf5
Fixed readme 2019-02-24 17:05:59 +01:00
Grzegorz Leoniec
5a255db018
Fixed FOSSA status 2019-02-24 15:08:00 +01:00
Grzegorz Leoniec
56610d0d3d
Fixed FOSSA status 2019-02-24 15:07:41 +01:00
Grzegorz Leoniec
fd0ac65f6a
Fixed FOSSA status 2019-02-24 15:04:16 +01:00
Grzegorz Leoniec
95dbba3369
Added more badges to readme 2019-02-24 15:02:05 +01:00
Robert Schäfer
6b66b33d8b Revert "Bump neo4j-graphql-js from 2.3.1 to 2.4.0" 
This reverts commit d8af7cb2e57b4623baa719c181899f4d72f7b185.

@appinteractive this broke the index page on the frontend side. If you
log in, you don't see posts and instead you see this error on the developer
console:

```
GraphQL error: Invalid input '}': expected whitespace, comment or a property key name (line 4, column 39 (offset: 464))
"RETURN COUNT(r)", {this: post_author, }, false),shoutedCount: apoc.cypher.runFirstColumn("MATCH (this)-[:SHOUTED]->(r:Post) WHERE NOT r.deleted = true AND NOT r.disabled = true RETURN COUNT(r)", {this: post_author, }, false),commentsCount: apoc.cypher.runFirstColumn("MATCH (this)-[:WROTE]->(r:Comment) WHERE NOT r.deleted = true RETURN COUNT(r)", {this: post_author, }, false),followedByCount: apoc.cypher.runFirstColumn("MATCH (this)<-[:FOLLOWS]-(r:User) RETURN COUNT(r)", {this: post_author, }, false),location: head([ post_author_location IN apoc.cypher.runFirstColumn("MATCH (this)-[:IS_IN]->(l:Location) RETURN l", {this: post_author, }, true) | post_author_location { .nameEN }]) ,badges: [(`post_author`)<-[:`REWARDED`]-(`post_author_badges`:`Badge`) | post_author_badges { .id , .key , .icon }] }]) ,commentsCount: apoc.cypher.runFirstColumn("MATCH (this)<-[:COMMENTS]-(r:Comment) RETURN COUNT(r)", {this: post, }, false),categories: [(`post`)-[:`CATEGORIZED`]->(`post_categories`:`Category`) | post_categories { .id , .name , .icon }] ,shoutedCount: apoc.cypher.runFirstColumn("MATCH (this)<-[:SHOUTED]-(r:User) WHERE NOT r.deleted = true AND NOT r.disabled = true RETURN COUNT(r)", {this: post, }, false)} AS `post` SKIP $offset LIMIT $first"
```
 2019-02-22 21:21:58 +01:00
Robert Schäfer
c86658729e Merge remote-tracking branch 'origin/master' into editor 2019-02-22 18:05:42 +01:00
Robert Schäfer
ed5e206dc6
Merge pull request #171 from Human-Connection/123-unit-test-for-report-mutation 
[WIP] Start unit testing report feature
 2019-02-22 17:58:44 +01:00
Robert Schäfer
c58d2ce403
Merge branch 'master' into 123-unit-test-for-report-mutation 2019-02-22 17:36:24 +01:00
dependabot[bot]
d4916323b0
Merge pull request #174 from Human-Connection/dependabot/npm_and_yarn/slug-1.0.0 2019-02-22 16:17:41 +00:00
Robert Schäfer
2e7e0579e4 Fix bug with id middleware 
Ids are queried only for well known queries and mutations
 2019-02-22 16:11:07 +01:00
Robert Schäfer
889818cd2d Expose bug in Query { isLoggedin } 
The idMiddleware was adding selection fields to the resolveInfo even if
the selection fields were empty. This caused a bug for each resolve
function including

```
{
 isLoggedin
}
```

which does not have any additional curly braces after the query.
 2019-02-22 15:21:23 +01:00
Robert Schäfer
5856e74b39 Fix yarn run db:reset 2019-02-22 14:13:03 +01:00
dependabot[bot]
55395a2ffc
Bump slug from 0.9.3 to 1.0.0 
Bumps [slug](https://github.com/Trott/node-slug) from 0.9.3 to 1.0.0.
- [Release notes](https://github.com/Trott/node-slug/releases)
- [Commits](https://github.com/Trott/node-slug/compare/v0.9.3...v1.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-22 04:17:49 +00:00
Matt Rider
4a43583c6b Create abusive-user to report, PR review suggestions 2019-02-21 22:43:51 -03:00
Matt Rider
40c210a0ce Start unit testing report feature 2019-02-21 21:13:30 -03:00
Grzegorz Leoniec
a1e5e866d1
Merge branch 'master' into editor 2019-02-21 22:32:31 +01:00
dependabot[bot]
a473e8e059
Merge pull request #167 from Human-Connection/dependabot/npm_and_yarn/neo4j-graphql-js-2.4.0 2019-02-21 21:32:04 +00:00
dependabot[bot]
d8af7cb2e5
Bump neo4j-graphql-js from 2.3.1 to 2.4.0 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.3.1 to 2.4.0.
- [Release notes](https://github.com/neo4j-graphql/neo4j-graphql-js/releases)
- [Changelog](https://github.com/neo4j-graphql/neo4j-graphql-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/neo4j-graphql/neo4j-graphql-js/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-21 21:25:16 +00:00
dependabot[bot]
f283948035
Merge pull request #168 from Human-Connection/dependabot/npm_and_yarn/jsonwebtoken-8.5.0 2019-02-21 21:22:48 +00:00
Grzegorz Leoniec
ba71994425
Merge branch 'master' into editor 2019-02-21 22:20:43 +01:00
Robert Schäfer
fb517450ff
Merge pull request #164 from Human-Connection/without_neode 
Refactor seeds and tests
 2019-02-21 20:51:57 +01:00
Robert Schäfer
eda2ea34fc Incorporate @appinteractive's feedback 
@appinteractive can we merge this soon?
 2019-02-21 20:03:22 +01:00
Robert Schäfer
132dba04dd Refactor tests with the new factory API 2019-02-21 16:06:13 +01:00
Robert Schäfer
aa07a2a616 Refactor Id Middleware 
I found a way to cleanly request additional attributes in our
middleware. We can use this pattern if we e.g. require the author of
posts and comments to check if the user is the author and therefore
authorized to update or delete the post.

CC @mattwr18 @appinteractive @tirokk
 2019-02-21 10:50:41 +01:00
Robert Schäfer
98983bb575 Fix lint 2019-02-21 10:32:07 +01:00
dependabot[bot]
e5be51257a
Bump jsonwebtoken from 8.4.0 to 8.5.0 
Bumps [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken) from 8.4.0 to 8.5.0.
- [Release notes](https://github.com/auth0/node-jsonwebtoken/releases)
- [Changelog](https://github.com/auth0/node-jsonwebtoken/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/node-jsonwebtoken/compare/v8.4.0...v8.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-21 04:17:07 +00:00
Robert Schäfer
91a13593dc Provide a better interface for factories 
You can now run graphql mutations *from the point of view* of a user.

@mattwr18 @Tirokk Do you have a better idea how to name the factory
builder?
 2019-02-21 02:17:07 +01:00
Robert Schäfer
b3e476e039 Create a yarn script to the backend for testing 2019-02-21 00:30:46 +01:00
Robert Schäfer
d4a999ee91 Configure factories#cleanDatabase easier 2019-02-21 00:27:26 +01:00
Robert Schäfer
4a1e06402a Fix lint 2019-02-20 15:26:49 +01:00
Robert Schäfer
7abc1583dc Implement + test unique slugs for user 
I put the relevant line on categories and organizations too, but I
didn't test it separately. I could have tested it but found it
unnecessary repeating
 2019-02-20 14:03:36 +01:00
Robert Schäfer
bfc5603fa8 All tests are passing! 2019-02-20 12:56:57 +01:00
Robert Schäfer
c30548d1e8 Fix bugs in migration script for neo4j 
Only change the password, if we are the default user. Everything else
should be executed.
 2019-02-20 12:53:56 +01:00
Robert Schäfer
a61362b269 Fix slugify unit test with async mock functions 2019-02-20 11:48:06 +01:00
Robert Schäfer
ba26c0e188 Seed reported comments, posts and users 2019-02-20 11:36:50 +01:00
Robert Schäfer
3532b473ee Choose another slug is green 2019-02-20 01:30:32 +01:00
Robert Schäfer
7a70b9ece4 Implement authorization on Post mutations 2019-02-20 01:01:41 +01:00
Robert Schäfer
f1dd52f579 Expose yet another bug in the authorization 
Cannot read property id of null

CC @appinteractive
 2019-02-20 01:01:41 +01:00
Robert Schäfer
9c4e599ff1 Separate middleware for ids 2019-02-19 23:39:39 +01:00
Robert Schäfer
30bb54c6fa Fix slugify test 2019-02-19 23:00:59 +01:00
Robert Schäfer
e6a996e0dd Harden permissions spec 
If we expect an error to be thrown, the test should fail if no error was
raised.
 2019-02-19 22:55:23 +01:00
dependabot[bot]
caea576ae7
Merge pull request #159 from Human-Connection/dependabot/npm_and_yarn/@babel/core-7.3.3 2019-02-19 15:28:58 +00:00
dependabot[bot]
7d0463ac97
Bump @babel/core from 7.2.2 to 7.3.3 
Bumps [@babel/core](https://github.com/babel/babel) from 7.2.2 to 7.3.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.2...v7.3.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-19 15:14:52 +00:00
dependabot[bot]
d5ccd7d19b
Merge pull request #158 from Human-Connection/dependabot/npm_and_yarn/apollo-server-testing-2.4.2 2019-02-19 15:08:23 +00:00