Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NEW] GraphQL API #8158

Merged
merged 49 commits into from
Jan 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
23e9a60
WIP
kamilkisiela Jun 28, 2017
42ed8a4
WIP
kamilkisiela Jun 29, 2017
b868721
WIP
kamilkisiela Jun 29, 2017
c195f46
Separate features
kamilkisiela Jun 30, 2017
373e8e5
Support nameFilter in channels query
kamilkisiela Jul 1, 2017
858a9c0
WIP
kamilkisiela Jul 19, 2017
7bb4bfc
WIP
kamilkisiela Jul 20, 2017
a75b312
WIP
kamilkisiela Jul 21, 2017
9ea0cce
WIP
kamilkisiela Jul 21, 2017
5f1bbc1
Date to Float
kamilkisiela Jul 22, 2017
a036416
Add directChannel query
kamilkisiela Jul 31, 2017
0ac6e21
Expose username as name of direct channel
kamilkisiela Aug 1, 2017
0499617
WIP: rocketchat:grant
kamilkisiela Aug 4, 2017
ebe18ed
rocketchat-grant
kamilkisiela Aug 9, 2017
e6e9b1b
Moar
kamilkisiela Aug 9, 2017
09157fe
Remove console.logs and set email as verified
kamilkisiela Aug 9, 2017
4d5e0b6
Implemented saving avatars properly and fixed messages sorting (DESC …
kamilkisiela Aug 17, 2017
f90e302
Use findOneByRoomIdAndUserId instead of custom one
kamilkisiela Aug 29, 2017
c522dd9
Update deps in rocketchat:graphql
kamilkisiela Aug 29, 2017
7a6bce9
Add comments on the schema about meaning of the types
kamilkisiela Aug 29, 2017
eac0aac
Remove unnecessary return statement
kamilkisiela Aug 29, 2017
10e4b27
Remove unused todos from Message type
kamilkisiela Aug 29, 2017
0fff6a0
READMEs, separate schema from resolvers, fix sorting and cursor messa…
kamilkisiela Aug 31, 2017
dfe8d14
WIP - LAST ONE
kamilkisiela Sep 2, 2017
388ba96
Add a ref to the issue with @accounts/graphql-api
kamilkisiela Sep 6, 2017
8dffc89
Back to [email protected]
kamilkisiela Sep 6, 2017
5619e78
Add Authorization token to WebSocket connection
kamilkisiela Sep 8, 2017
04e2494
Fix an issue with Fiber (User.avatar)
kamilkisiela Sep 12, 2017
9dd51b3
Meteor 1.5.2
kamilkisiela Sep 12, 2017
161f9a1
Use a separate server for graphql subscriptions and fix channels.crea…
kamilkisiela Sep 16, 2017
83afe8b
Merge branch 'develop' into graphql
rodrigok Dec 7, 2017
7412bab
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
gdelavald Dec 14, 2017
85e15ff
Adds basic e2e tests for graphql
gdelavald Dec 14, 2017
8057275
Adds more tests for graphql api
gdelavald Dec 19, 2017
c694a7a
Fix type on addReactionToMessage method
gdelavald Dec 19, 2017
a487957
Add admin settings for graphql
gdelavald Dec 26, 2017
09e0db4
Replace setting endpoint for fixed api url
gdelavald Jan 20, 2018
885d67c
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
gdelavald Jan 20, 2018
edff5c5
Change logic for subscription
gdelavald Jan 20, 2018
a46fa2d
Merge branch 'graphql' of https://github.com/kamilkisiela/Rocket.Chat…
gdelavald Jan 20, 2018
b5b63da
Merge remote-tracking branch 'origin/develop' into graphql
rodrigok Jan 21, 2018
c449bb7
Fix tests
rodrigok Jan 21, 2018
2323ee1
Add step to disable graphql after testing
gdelavald Jan 21, 2018
3812986
Improve tests
rodrigok Jan 22, 2018
f563bed
Fix graphql tests
gdelavald Jan 22, 2018
b9975a6
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
gdelavald Jan 22, 2018
3ef5c69
small graphql config changes
gdelavald Jan 22, 2018
2285548
Fix broken admin page tests
gdelavald Jan 22, 2018
a1a72d4
Merge branch 'develop' into graphql
engelgabriel Jan 30, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ [email protected]

rocketchat:2fa
rocketchat:action-links
rocketchat:accounts
rocketchat:analytics
rocketchat:api
rocketchat:assets
Expand Down Expand Up @@ -67,6 +68,11 @@ rocketchat:github-enterprise
rocketchat:gitlab
#rocketchat:google-natural-language
rocketchat:google-vision
rocketchat:grant
rocketchat:grant-facebook
rocketchat:grant-github
rocketchat:grant-google
rocketchat:graphql
rocketchat:highlight-words
rocketchat:iframe-login
rocketchat:importer
Expand Down
7 changes: 7 additions & 0 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ [email protected]
[email protected]
[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
Expand Down Expand Up @@ -153,6 +154,11 @@ rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
Expand Down Expand Up @@ -242,6 +248,7 @@ [email protected]
[email protected]
[email protected]
steffo:[email protected]
swydo:[email protected]
tap:[email protected]
[email protected]
[email protected]
Expand Down
9 changes: 9 additions & 0 deletions graphql.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"schema": {
"request": {
"url" : "http://localhost:3000/api/graphql",
"method" : "POST",
"postIntrospectionQuery" : true
}
}
}
1 change: 1 addition & 0 deletions packages/rocketchat-accounts/.npm/package/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
7 changes: 7 additions & 0 deletions packages/rocketchat-accounts/.npm/package/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
This directory and the files immediately inside it are automatically generated
when you change this package's NPM dependencies. Commit the files in this
directory (npm-shrinkwrap.json, .gitignore, and this README) to source control
so that others run the same versions of sub-dependencies.

You should NOT check in the node_modules directory that Meteor automatically
creates; if you are using git, the .gitignore file tells git to ignore it.
259 changes: 259 additions & 0 deletions packages/rocketchat-accounts/.npm/package/npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions packages/rocketchat-accounts/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# rocketchat:accounts

Integration with `js-accounts` system.
22 changes: 22 additions & 0 deletions packages/rocketchat-accounts/package.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Package.describe({
name: 'rocketchat:accounts',
version: '0.0.1',
summary: 'JS-Accounts integration',
git: ''
});

Package.onUse(function(api) {
api.use([
'underscore',
'ecmascript'
]);

api.use('mongo', ['client', 'server']);

api.mainModule('server/index.js', 'server');
});

Npm.depends({
'@accounts/server': '0.0.18',
'@accounts/mongo': '0.0.12'
});
24 changes: 24 additions & 0 deletions packages/rocketchat-accounts/server/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import AccountsServer from '@accounts/server';
import MongoAdapter from '@accounts/mongo';
import { MongoInternals } from 'meteor/mongo';
import { Meteor } from 'meteor/meteor';

Meteor.startup(() => {
const mongodb = MongoInternals.defaultRemoteCollectionDriver().mongo.db;

const mongoAdapter = new MongoAdapter(mongodb, {
convertUserIdToMongoObjectId: false
});

AccountsServer.config({
tokenConfigs: {
accessToken: {
expiresIn: '3d'
},
refreshToken: {
expiresIn: '30d'
}
},
passwordHashAlgorithm: 'sha256'
}, mongoAdapter);
});
8 changes: 8 additions & 0 deletions packages/rocketchat-accounts/server/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import './config';

import AccountsServer from '@accounts/server';


export {
AccountsServer
};
Loading