Server: Update resolver to use auth context
This commit is contained in:
1 parent
5731ec1957
commit
43f2bbceee
15 files changed
+2577
-145
No files matched your search
@@ -4,7 +4,7 @@ projects:
|
|||||||
extensions:
|
extensions:
|
||||||
endpoints:
|
endpoints:
|
||||||
dev1:
|
dev1:
|
||||||
url: http://0.0.0.0:4000/graphql
|
url: http://localhost:4001/graphql
|
||||||
|
|
||||||
database:
|
database:
|
||||||
schemaPath: src/generated/prisma.graphql
|
schemaPath: src/generated/prisma.graphql
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
FROM mhart/alpine-node:8
|
FROM mhart/alpine-node:8
|
||||||
|
|
||||||
ENV PORT=4000
|
ENV PORT=4001
|
||||||
|
|
||||||
RUN mkdir -p /var/www/app && \
|
RUN mkdir -p /var/www/app && \
|
||||||
mkdir -p /var/www/app/node_modules
|
mkdir -p /var/www/app/node_modules
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ type Team {
|
|||||||
slug: String! @unique
|
slug: String! @unique
|
||||||
profile: TeamProfile
|
profile: TeamProfile
|
||||||
members: [TeamMembers!]! @relation (name: "TeamMembers", onDelete: SET_NULL)
|
members: [TeamMembers!]! @relation (name: "TeamMembers", onDelete: SET_NULL)
|
||||||
|
owner: String!
|
||||||
wallet: Wallet
|
wallet: Wallet
|
||||||
fb: [FinancialBeings!]! @relation (name: "TeamFinancialBeing", onDelete: SET_NULL)
|
fb: [FinancialBeings!]! @relation (name: "TeamFinancialBeing", onDelete: SET_NULL)
|
||||||
status: [TeamStatus!]!
|
status: [TeamStatus!]!
|
||||||
@@ -59,7 +60,7 @@ type TeamMembers {
|
|||||||
|
|
||||||
type Member {
|
type Member {
|
||||||
id: ID! @unique
|
id: ID! @unique
|
||||||
nickname: String
|
alias: String
|
||||||
team: TeamMembers @relation (name: "MemberOnTeam", onDelete: SET_NULL)
|
team: TeamMembers @relation (name: "MemberOnTeam", onDelete: SET_NULL)
|
||||||
authId: String! @unique
|
authId: String! @unique
|
||||||
visible: Boolean! @default(value: true)
|
visible: Boolean! @default(value: true)
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
version: '3'
|
||||||
|
services:
|
||||||
|
api:
|
||||||
|
image: aateamapi-dev:v1
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: ./Dockerfile
|
||||||
|
env_file: ./.env
|
||||||
|
container_name: aateamapi
|
||||||
|
tty: true
|
||||||
|
stdin_open: true
|
||||||
|
volumes:
|
||||||
|
- ./:/var/www/app
|
||||||
|
- /var/www/app/node_modules
|
||||||
|
working_dir: /var/www/app
|
||||||
|
restart: always
|
||||||
|
command: node -r dotenv/config src/index.js
|
||||||
|
ports:
|
||||||
|
- "4001:4001"
|
||||||
@@ -27,24 +27,5 @@ services:
|
|||||||
POSTGRES_PASSWORD: prisma
|
POSTGRES_PASSWORD: prisma
|
||||||
volumes:
|
volumes:
|
||||||
- postgres:/var/lib/postgresql/data
|
- postgres:/var/lib/postgresql/data
|
||||||
node:
|
|
||||||
image: aateamapi-dev:v1
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: ./Dockerfile
|
|
||||||
depends_on:
|
|
||||||
- prisma
|
|
||||||
env_file: ./.env
|
|
||||||
container_name: aateamapi
|
|
||||||
tty: true
|
|
||||||
stdin_open: true
|
|
||||||
volumes:
|
|
||||||
- ./:/var/www/app
|
|
||||||
- /var/www/app/node_modules
|
|
||||||
working_dir: /var/www/app
|
|
||||||
restart: always
|
|
||||||
command: node -r dotenv/config src/index.js
|
|
||||||
ports:
|
|
||||||
- "4000:4000"
|
|
||||||
volumes:
|
volumes:
|
||||||
postgres:
|
postgres:
|
||||||
Generated
+51
-69
@@ -568,7 +568,7 @@
|
|||||||
},
|
},
|
||||||
"readable-stream": {
|
"readable-stream": {
|
||||||
"version": "2.3.6",
|
"version": "2.3.6",
|
||||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
||||||
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -614,7 +614,7 @@
|
|||||||
},
|
},
|
||||||
"readable-stream": {
|
"readable-stream": {
|
||||||
"version": "2.3.6",
|
"version": "2.3.6",
|
||||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
||||||
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -923,7 +923,7 @@
|
|||||||
},
|
},
|
||||||
"readable-stream": {
|
"readable-stream": {
|
||||||
"version": "2.3.6",
|
"version": "2.3.6",
|
||||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
||||||
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -1462,7 +1462,7 @@
|
|||||||
},
|
},
|
||||||
"readable-stream": {
|
"readable-stream": {
|
||||||
"version": "2.3.6",
|
"version": "2.3.6",
|
||||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
||||||
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -1492,9 +1492,9 @@
|
|||||||
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
|
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
|
||||||
},
|
},
|
||||||
"config-chain": {
|
"config-chain": {
|
||||||
"version": "1.1.11",
|
"version": "1.1.12",
|
||||||
"resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz",
|
"resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
|
||||||
"integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=",
|
"integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"ini": "^1.3.4",
|
"ini": "^1.3.4",
|
||||||
@@ -1640,7 +1640,7 @@
|
|||||||
},
|
},
|
||||||
"readable-stream": {
|
"readable-stream": {
|
||||||
"version": "2.3.6",
|
"version": "2.3.6",
|
||||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
||||||
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -4997,7 +4997,7 @@
|
|||||||
},
|
},
|
||||||
"readable-stream": {
|
"readable-stream": {
|
||||||
"version": "2.3.6",
|
"version": "2.3.6",
|
||||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
||||||
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -5366,7 +5366,7 @@
|
|||||||
},
|
},
|
||||||
"chalk": {
|
"chalk": {
|
||||||
"version": "1.1.3",
|
"version": "1.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
|
"resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
|
||||||
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
|
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -6371,14 +6371,14 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"prisma": {
|
"prisma": {
|
||||||
"version": "1.15.3",
|
"version": "1.16.0",
|
||||||
"resolved": "https://registry.npmjs.org/prisma/-/prisma-1.15.3.tgz",
|
"resolved": "https://registry.npmjs.org/prisma/-/prisma-1.16.0.tgz",
|
||||||
"integrity": "sha512-95s0Kk8PtptrVhp4ajXPd7A7QrbWdCEyZ/nnvcz0Sz9nzufYYZfBjxgibUyoaNs/XL0KXtiibQIdZhpWIJgOhw==",
|
"integrity": "sha512-8jZYCrkd1xjy+JJbQi81f8PBOLe8LLWwSu0fK0cqekm3FeafBd8xk5b0RWcIsHyVd6ypKCQt3tnZEMVzmbKrdQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"fs-extra": "^5.0.0",
|
"fs-extra": "^5.0.0",
|
||||||
"prisma-cli-core": "1.0.75",
|
"prisma-cli-core": "1.0.76",
|
||||||
"prisma-cli-engine": "1.0.78",
|
"prisma-cli-engine": "1.0.79",
|
||||||
"semver": "^5.4.1",
|
"semver": "^5.4.1",
|
||||||
"source-map-support": "^0.4.18"
|
"source-map-support": "^0.4.18"
|
||||||
},
|
},
|
||||||
@@ -6497,9 +6497,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"prisma-cli-core": {
|
"prisma-cli-core": {
|
||||||
"version": "1.0.75",
|
"version": "1.0.76",
|
||||||
"resolved": "https://registry.npmjs.org/prisma-cli-core/-/prisma-cli-core-1.0.75.tgz",
|
"resolved": "https://registry.npmjs.org/prisma-cli-core/-/prisma-cli-core-1.0.76.tgz",
|
||||||
"integrity": "sha512-DiH686w2u9aiz4RoNX3T0XgGzeai8IrXX/Qsocam+lKtBB63aupqCxbj6kp16sNoiXhDPzI2Zx/Hwm0GG9sUhw==",
|
"integrity": "sha512-HtHn/RM2GlJi23KoIXHoboP97aC54SYDqr7B4uT/80JP6A6nQp5HLt4sJgNfKapaHFZVzXYM7M3LEfGq3tgQbw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"adm-zip": "^0.4.7",
|
"adm-zip": "^0.4.7",
|
||||||
@@ -6533,9 +6533,9 @@
|
|||||||
"opn": "^5.1.0",
|
"opn": "^5.1.0",
|
||||||
"pause": "^0.1.0",
|
"pause": "^0.1.0",
|
||||||
"portfinder": "^1.0.13",
|
"portfinder": "^1.0.13",
|
||||||
"prisma-db-introspection": "0.0.45",
|
"prisma-db-introspection": "0.0.46",
|
||||||
"prisma-json-schema": "0.0.4",
|
"prisma-json-schema": "0.0.4",
|
||||||
"prisma-yml": "1.0.90",
|
"prisma-yml": "1.0.96",
|
||||||
"scuid": "^1.0.2",
|
"scuid": "^1.0.2",
|
||||||
"semver": "^5.4.1",
|
"semver": "^5.4.1",
|
||||||
"sillyname": "^0.1.0",
|
"sillyname": "^0.1.0",
|
||||||
@@ -6599,12 +6599,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"debug": {
|
"debug": {
|
||||||
"version": "3.1.0",
|
"version": "3.2.5",
|
||||||
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz",
|
||||||
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
|
"integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"ms": "2.0.0"
|
"ms": "^2.1.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dotenv": {
|
"dotenv": {
|
||||||
@@ -6693,7 +6693,7 @@
|
|||||||
},
|
},
|
||||||
"graphql-import": {
|
"graphql-import": {
|
||||||
"version": "0.4.5",
|
"version": "0.4.5",
|
||||||
"resolved": "https://registry.npmjs.org/graphql-import/-/graphql-import-0.4.5.tgz",
|
"resolved": "http://registry.npmjs.org/graphql-import/-/graphql-import-0.4.5.tgz",
|
||||||
"integrity": "sha512-G/+I08Qp6/QGTb9qapknCm3yPHV0ZL7wbaalWFpxsfR8ZhZoTBe//LsbsCKlbALQpcMegchpJhpTSKiJjhaVqQ==",
|
"integrity": "sha512-G/+I08Qp6/QGTb9qapknCm3yPHV0ZL7wbaalWFpxsfR8ZhZoTBe//LsbsCKlbALQpcMegchpJhpTSKiJjhaVqQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -6766,12 +6766,6 @@
|
|||||||
"regex-cache": "^0.4.2"
|
"regex-cache": "^0.4.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ms": {
|
|
||||||
"version": "2.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
|
|
||||||
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
|
|
||||||
"dev": true
|
|
||||||
},
|
|
||||||
"prisma-json-schema": {
|
"prisma-json-schema": {
|
||||||
"version": "0.0.4",
|
"version": "0.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/prisma-json-schema/-/prisma-json-schema-0.0.4.tgz",
|
"resolved": "https://registry.npmjs.org/prisma-json-schema/-/prisma-json-schema-0.0.4.tgz",
|
||||||
@@ -6779,9 +6773,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"prisma-yml": {
|
"prisma-yml": {
|
||||||
"version": "1.0.90",
|
"version": "1.0.96",
|
||||||
"resolved": "https://registry.npmjs.org/prisma-yml/-/prisma-yml-1.0.90.tgz",
|
"resolved": "https://registry.npmjs.org/prisma-yml/-/prisma-yml-1.0.96.tgz",
|
||||||
"integrity": "sha512-i5qMN/p1YvLV931YgfJtUAaHO7nOL07oW/EqQ1AixBGRi9nB21TpZGy9b50TwunaMt8LfVYB5ER82338qrJA5g==",
|
"integrity": "sha512-w3XGzJHUq5pwBoFy/amkGOcTDj4XoHh8UFUUUZcHo5fSyoF8AWeRTu1yWINaPVGxbcmpwKNetntAW4ijiq7M5g==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"ajv": "5",
|
"ajv": "5",
|
||||||
@@ -6828,9 +6822,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"prisma-cli-engine": {
|
"prisma-cli-engine": {
|
||||||
"version": "1.0.78",
|
"version": "1.0.79",
|
||||||
"resolved": "https://registry.npmjs.org/prisma-cli-engine/-/prisma-cli-engine-1.0.78.tgz",
|
"resolved": "https://registry.npmjs.org/prisma-cli-engine/-/prisma-cli-engine-1.0.79.tgz",
|
||||||
"integrity": "sha512-chtmecxBgXPQUzvDS0U/R+pHZ/nzV1ksO+OiKr98kT7dBR9QJQbRG0v/j+zoIW4vdR9eyIaXy5i+dW8HU8XnDg==",
|
"integrity": "sha512-CdEIJs4ld1IiQQt2CFFPmeDypN4Ct4sTgmFODVjJix790mpEtxMagzCcA+mhfnRL65P6xiHn76Gdxbz60GyYBA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"@heroku/linewrap": "^1.0.0",
|
"@heroku/linewrap": "^1.0.0",
|
||||||
@@ -6873,7 +6867,7 @@
|
|||||||
"memfs": "^2.5.3",
|
"memfs": "^2.5.3",
|
||||||
"opn": "^5.1.0",
|
"opn": "^5.1.0",
|
||||||
"prisma-json-schema": "0.0.4",
|
"prisma-json-schema": "0.0.4",
|
||||||
"prisma-yml": "1.0.90",
|
"prisma-yml": "1.0.96",
|
||||||
"raven": "2.3.0",
|
"raven": "2.3.0",
|
||||||
"replaceall": "^0.1.6",
|
"replaceall": "^0.1.6",
|
||||||
"rwlockfile": "^1.4.8",
|
"rwlockfile": "^1.4.8",
|
||||||
@@ -6890,12 +6884,12 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"debug": {
|
"debug": {
|
||||||
"version": "3.1.0",
|
"version": "3.2.5",
|
||||||
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz",
|
||||||
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
|
"integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"ms": "2.0.0"
|
"ms": "^2.1.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dotenv": {
|
"dotenv": {
|
||||||
@@ -6931,12 +6925,6 @@
|
|||||||
"through": "^2.3.6"
|
"through": "^2.3.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ms": {
|
|
||||||
"version": "2.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
|
|
||||||
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
|
|
||||||
"dev": true
|
|
||||||
},
|
|
||||||
"prisma-json-schema": {
|
"prisma-json-schema": {
|
||||||
"version": "0.0.4",
|
"version": "0.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/prisma-json-schema/-/prisma-json-schema-0.0.4.tgz",
|
"resolved": "https://registry.npmjs.org/prisma-json-schema/-/prisma-json-schema-0.0.4.tgz",
|
||||||
@@ -6944,9 +6932,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"prisma-yml": {
|
"prisma-yml": {
|
||||||
"version": "1.0.90",
|
"version": "1.0.96",
|
||||||
"resolved": "https://registry.npmjs.org/prisma-yml/-/prisma-yml-1.0.90.tgz",
|
"resolved": "https://registry.npmjs.org/prisma-yml/-/prisma-yml-1.0.96.tgz",
|
||||||
"integrity": "sha512-i5qMN/p1YvLV931YgfJtUAaHO7nOL07oW/EqQ1AixBGRi9nB21TpZGy9b50TwunaMt8LfVYB5ER82338qrJA5g==",
|
"integrity": "sha512-w3XGzJHUq5pwBoFy/amkGOcTDj4XoHh8UFUUUZcHo5fSyoF8AWeRTu1yWINaPVGxbcmpwKNetntAW4ijiq7M5g==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"ajv": "5",
|
"ajv": "5",
|
||||||
@@ -7002,9 +6990,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"prisma-db-introspection": {
|
"prisma-db-introspection": {
|
||||||
"version": "0.0.45",
|
"version": "0.0.46",
|
||||||
"resolved": "https://registry.npmjs.org/prisma-db-introspection/-/prisma-db-introspection-0.0.45.tgz",
|
"resolved": "https://registry.npmjs.org/prisma-db-introspection/-/prisma-db-introspection-0.0.46.tgz",
|
||||||
"integrity": "sha512-tOdv4mBFZLVds1Wst92l2iarmzlxwFo/EFHs4kW1P0rR2My7BoxRgV0HSZy9xvo9gbU3P8e5JEZofMNrS+5v+g==",
|
"integrity": "sha512-/b7evS9b5xKS7UrcOERkCmV+IWC6OAgFtInFsvdwn4MeLEaVbkOfzRakdOo+t2gb+N7Yy8Eey9eKYgB5jiJAbA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"ajv": "5",
|
"ajv": "5",
|
||||||
@@ -7029,12 +7017,12 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"debug": {
|
"debug": {
|
||||||
"version": "3.1.0",
|
"version": "3.2.5",
|
||||||
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz",
|
||||||
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
|
"integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"ms": "2.0.0"
|
"ms": "^2.1.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dotenv": {
|
"dotenv": {
|
||||||
@@ -7043,12 +7031,6 @@
|
|||||||
"integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=",
|
"integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"ms": {
|
|
||||||
"version": "2.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
|
|
||||||
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
|
|
||||||
"dev": true
|
|
||||||
},
|
|
||||||
"prisma-json-schema": {
|
"prisma-json-schema": {
|
||||||
"version": "0.0.1",
|
"version": "0.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/prisma-json-schema/-/prisma-json-schema-0.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/prisma-json-schema/-/prisma-json-schema-0.0.1.tgz",
|
||||||
@@ -7608,7 +7590,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"commander": {
|
"commander": {
|
||||||
"version": "2.8.1",
|
"version": "2.8.1",
|
||||||
"resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
|
"resolved": "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
|
||||||
"integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
|
"integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -8196,7 +8178,7 @@
|
|||||||
},
|
},
|
||||||
"table": {
|
"table": {
|
||||||
"version": "4.0.3",
|
"version": "4.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/table/-/table-4.0.3.tgz",
|
"resolved": "http://registry.npmjs.org/table/-/table-4.0.3.tgz",
|
||||||
"integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==",
|
"integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -8257,7 +8239,7 @@
|
|||||||
},
|
},
|
||||||
"readable-stream": {
|
"readable-stream": {
|
||||||
"version": "2.3.6",
|
"version": "2.3.6",
|
||||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
||||||
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -8522,7 +8504,7 @@
|
|||||||
},
|
},
|
||||||
"buffer": {
|
"buffer": {
|
||||||
"version": "3.6.0",
|
"version": "3.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz",
|
"resolved": "http://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz",
|
||||||
"integrity": "sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=",
|
"integrity": "sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -9105,7 +9087,7 @@
|
|||||||
},
|
},
|
||||||
"readable-stream": {
|
"readable-stream": {
|
||||||
"version": "2.3.6",
|
"version": "2.3.6",
|
||||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
||||||
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
|
|||||||
+1
-1
@@ -22,6 +22,6 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"graphql-cli": "^2.16.5",
|
"graphql-cli": "^2.16.5",
|
||||||
"npm-run-all": "4.1.3",
|
"npm-run-all": "4.1.3",
|
||||||
"prisma": "^1.14.0"
|
"prisma": "^1.16.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
const _get = require('lodash.get')
|
const _get = require('lodash.get')
|
||||||
const validateAndParseIdToken = require('./helpers/validateAndParseIdToken')
|
const { validateIdToken } = require('./validateIdToken')
|
||||||
const createMember = require('./index')
|
|
||||||
|
|
||||||
const memberLocationOnContext = 'request.member'
|
const memberLocationOnContext = 'request.member'
|
||||||
const bearerAccessToken = 'request.headers.authorization'
|
const bearerAccessToken = 'request.headers.authorization'
|
||||||
@@ -8,11 +7,29 @@ const bearerAccessToken = 'request.headers.authorization'
|
|||||||
const ctxMember = ctx => _get(ctx, memberLocationOnContext)
|
const ctxMember = ctx => _get(ctx, memberLocationOnContext)
|
||||||
const ctxToken = ctx => _get(ctx, bearerAccessToken)
|
const ctxToken = ctx => _get(ctx, bearerAccessToken)
|
||||||
|
|
||||||
|
const createMember = async (ctx, idToken, info) => {
|
||||||
|
console.log('createMember', idToken)
|
||||||
|
const member = await ctx.db.mutation.upsertMember({
|
||||||
|
where: {
|
||||||
|
authId: idToken.sub,
|
||||||
|
},
|
||||||
|
create: {
|
||||||
|
authId: idToken.sub,
|
||||||
|
alias: idToken.nickname
|
||||||
|
},
|
||||||
|
update: {
|
||||||
|
authId: idToken.sub,
|
||||||
|
alias: idToken.nickname
|
||||||
|
}
|
||||||
|
}, info)
|
||||||
|
return member
|
||||||
|
}
|
||||||
|
|
||||||
const isLoggedIn = async ctx => {
|
const isLoggedIn = async ctx => {
|
||||||
let member = ctxMember(ctx, memberLocationOnContext)
|
let member = ctxMember(ctx, memberLocationOnContext)
|
||||||
let token = ctxToken(ctx, bearerAccessToken)
|
let token = ctxToken(ctx, bearerAccessToken)
|
||||||
let memberToken
|
let memberToken
|
||||||
|
console.log('isLoggedIn: ', member, token)
|
||||||
if (!member && token) {
|
if (!member && token) {
|
||||||
let scheme, credentials
|
let scheme, credentials
|
||||||
const tokenParts = token.split(' ')
|
const tokenParts = token.split(' ')
|
||||||
@@ -24,21 +41,28 @@ const isLoggedIn = async ctx => {
|
|||||||
if (/^Bearer$/i.test(scheme)) {
|
if (/^Bearer$/i.test(scheme)) {
|
||||||
token = credentials
|
token = credentials
|
||||||
//verify token
|
//verify token
|
||||||
|
console.log('isLoggedIn2 : ', token)
|
||||||
try {
|
try {
|
||||||
memberToken = await validateAndParseIdToken(token)
|
memberToken = await validateIdToken(token)
|
||||||
const auth0id = memberToken.sub
|
const authId = memberToken.sub
|
||||||
|
console.log('isLoggedIn3 : ', await authId, ctx.db.query.member)
|
||||||
|
exists = await ctx.db.query.member({ where: { authId: authId } })
|
||||||
|
console.log('isLoggedIn4 : ', await exists, createMember )
|
||||||
|
if (!member && exists === null) {
|
||||||
|
member = await createMember(ctx, memberToken).then(res => {
|
||||||
|
console.log('isLoggedIn5 : ', res)
|
||||||
|
return res
|
||||||
|
})
|
||||||
|
|
||||||
member = await ctx.db.query.member({ where: { auth0id } })
|
return member
|
||||||
|
|
||||||
if (!member) {
|
|
||||||
member = await createMember(ctx, memberToken)
|
|
||||||
}
|
}
|
||||||
|
return member
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
memberToken = false
|
memberToken = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
console.log('isLoggedIn5 : ', await member)
|
||||||
if (!member) {
|
if (!member) {
|
||||||
throw new Error(`Not logged in`)
|
throw new Error(`Not logged in`)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ const jwks = jwksClient({
|
|||||||
jwksUri: `https://${process.env.AUTH0_DOMAIN}/.well-known/jwks.json`
|
jwksUri: `https://${process.env.AUTH0_DOMAIN}/.well-known/jwks.json`
|
||||||
})
|
})
|
||||||
|
|
||||||
const validateParseIdToken = idToken =>
|
const validateIdToken = idToken =>
|
||||||
new Promise((resolve, reject) => {
|
new Promise((resolve, reject) => {
|
||||||
const { header, payload } = jwt.decode(idToken, { complete: true })
|
const { header, payload } = jwt.decode(idToken, { complete: true })
|
||||||
if (!header || !header.kid || !payload) reject(new Error('Invalid Token'))
|
if (!header || !header.kid || !payload) reject(new Error('Invalid Token'))
|
||||||
@@ -25,4 +25,4 @@ const validateParseIdToken = idToken =>
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
module.exports = validateParseIdToken
|
module.exports = { validateIdToken }
|
||||||
File diff suppressed because it is too large.
Load diff
+55
-29
@@ -1,3 +1,4 @@
|
|||||||
|
require('dotenv').config();
|
||||||
const { GraphQLServer } = require('graphql-yoga')
|
const { GraphQLServer } = require('graphql-yoga')
|
||||||
const {
|
const {
|
||||||
Prisma,
|
Prisma,
|
||||||
@@ -8,15 +9,39 @@ const { makeExecutableSchema } = require('graphql-tools')
|
|||||||
const { importSchema } = require('graphql-import')
|
const { importSchema } = require('graphql-import')
|
||||||
const { checkJwt } = require('./auth/middleware/jwt')
|
const { checkJwt } = require('./auth/middleware/jwt')
|
||||||
const { getMember } = require('./auth/middleware/getMember')
|
const { getMember } = require('./auth/middleware/getMember')
|
||||||
const validateParseIdToken = require('./auth/helpers/validate-parse-id-token')
|
const { validateIdToken } = require('./auth/validateIdToken')
|
||||||
const { directiveResolvers } = require('./auth-directives')
|
const { directiveResolvers } = require('./auth/authDirectives')
|
||||||
|
|
||||||
|
const createMember = async function (ctx, info, idToken) {
|
||||||
|
console.log('createMember', idToken)
|
||||||
|
const member = await ctx.db.mutation.upsertMember({
|
||||||
|
where: {
|
||||||
|
authId: idToken.sub,
|
||||||
|
},
|
||||||
|
create: {
|
||||||
|
authId: idToken.sub,
|
||||||
|
alias: idToken.nickname
|
||||||
|
},
|
||||||
|
update: {
|
||||||
|
authId: idToken.sub,
|
||||||
|
alias: idToken.nickname
|
||||||
|
}
|
||||||
|
}, info)
|
||||||
|
return member
|
||||||
|
}
|
||||||
|
|
||||||
const ctxMember = ctx => ctx.request.member
|
const ctxMember = ctx => ctx.request.member
|
||||||
|
|
||||||
const resolvers = {
|
const resolvers = {
|
||||||
Query: {
|
Query: {
|
||||||
async member(parent, { auth0id }, ctx, info) {
|
async member(parent, arg, ctx, info) {
|
||||||
return ctx.db.query.member({ where: { auth0id } }, info)
|
console.log('member: ', parent, arg)
|
||||||
|
return ctx.db.query.member({ where: { authId: arg.authId } }, info)
|
||||||
|
},
|
||||||
|
async currentMember(parent, args, ctx, info) {
|
||||||
|
console.log('currentMember: ', ctx.request.res.req.user)
|
||||||
|
const authId = ctx.request.res.req.user.sub
|
||||||
|
return ctx.db.query.member({ where: { authId } }, info)
|
||||||
},
|
},
|
||||||
teams(parent, args, ctx, info) {
|
teams(parent, args, ctx, info) {
|
||||||
return ctx.db.query.teamsConnection({},
|
return ctx.db.query.teamsConnection({},
|
||||||
@@ -59,7 +84,7 @@ const resolvers = {
|
|||||||
return ctx.db.query.team({ where: { name: name } }, `{ name }`)
|
return ctx.db.query.team({ where: { name: name } }, `{ name }`)
|
||||||
},
|
},
|
||||||
async teamByOwner(parent, { ownerId }, ctx, info) {
|
async teamByOwner(parent, { ownerId }, ctx, info) {
|
||||||
return ctx.db.query.teamsConnection({where: { owner: { auth0id: ownerId }}},
|
return ctx.db.query.teamsConnection({where: { owner: { authId: ownerId }}},
|
||||||
`{
|
`{
|
||||||
edges {
|
edges {
|
||||||
node {
|
node {
|
||||||
@@ -72,7 +97,7 @@ const resolvers = {
|
|||||||
motto
|
motto
|
||||||
}
|
}
|
||||||
owner {
|
owner {
|
||||||
auth0id
|
authId
|
||||||
nickname
|
nickname
|
||||||
visible
|
visible
|
||||||
profile {
|
profile {
|
||||||
@@ -95,28 +120,27 @@ const resolvers = {
|
|||||||
},
|
},
|
||||||
async owner(parent, args, ctx, info) {
|
async owner(parent, args, ctx, info) {
|
||||||
console.log('resolver.query.owner ctx: ', ctxMember(ctx))
|
console.log('resolver.query.owner ctx: ', ctxMember(ctx))
|
||||||
return ctx.db.query.member({ where: { id: ctxMember(ctx).auth0id } }, info)
|
return ctx.db.query.member({ where: { id: ctxMember(ctx).authId } }, info)
|
||||||
.catch((res) => {
|
.catch((res) => {
|
||||||
console.log('createTeam error: ', res)
|
console.log('createTeam error: ', res)
|
||||||
const errors = res.graphQLErrors.map((error) => {
|
const errors = res.graphQLErrors.map((error) => {
|
||||||
return error.message
|
return error.message
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
}
|
||||||
members: forwardTo('db')
|
|
||||||
},
|
},
|
||||||
Mutation: {
|
Mutation: {
|
||||||
async authenticate(parent, { idToken }, ctx, info) {
|
async authenticate(parent, { idToken }, ctx, info) {
|
||||||
let memberToken = null
|
let memberToken = null
|
||||||
try {
|
try {
|
||||||
memberToken = await validateAndParseIdToken(idToken)
|
memberToken = await validateIdToken(idToken)
|
||||||
console.log('authenticate.memberToken: ', await memberToken)
|
console.log('authenticate.memberToken: ', await memberToken)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.log('authenticat.validateAndParseIdToken err: ', err)
|
console.log('authenticat.validateIdToken err: ', err)
|
||||||
throw new Error(err.message)
|
throw new Error(err.message)
|
||||||
}
|
}
|
||||||
const auth0id = memberToken.sub
|
const authId = memberToken.sub
|
||||||
let member = await ctx.db.query.member({ where: { auth0id } }, info)
|
let member = await ctx.db.query.member({ where: { authId } }, info)
|
||||||
|
|
||||||
if (!member) {
|
if (!member) {
|
||||||
try {
|
try {
|
||||||
@@ -124,7 +148,6 @@ const resolvers = {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw new Error(error.message)
|
throw new Error(error.message)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return member
|
return member
|
||||||
},
|
},
|
||||||
@@ -133,15 +156,12 @@ const resolvers = {
|
|||||||
data: {
|
data: {
|
||||||
name: name,
|
name: name,
|
||||||
slug: slug,
|
slug: slug,
|
||||||
owner: {connect:{auth0id: owner}},
|
owner: owner
|
||||||
members: {create: {role: 'OWNER', member: {connect: {auth0id: owner}}}}
|
|
||||||
}
|
}
|
||||||
}, info)
|
}, info)
|
||||||
.catch((res) => {
|
.catch((err) => {
|
||||||
console.log('createTeam error: ', res)
|
console.log('createTeam error: ', err)
|
||||||
const errors = res.graphQLErrors.map((error) => {
|
return err
|
||||||
return error.message
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
async deleteTeam(parent, { id }, ctx, info) {
|
async deleteTeam(parent, { id }, ctx, info) {
|
||||||
@@ -176,25 +196,30 @@ const server = new GraphQLServer({
|
|||||||
context: req => ({
|
context: req => ({
|
||||||
...req,
|
...req,
|
||||||
db
|
db
|
||||||
})
|
}),
|
||||||
})
|
})
|
||||||
|
|
||||||
server.express.post(
|
server.express.use(
|
||||||
server.options.endpoint,
|
server.options.endpoint,
|
||||||
checkJwt,
|
checkJwt,
|
||||||
(err, req, res, next) => {
|
(err, req, res, next) => {
|
||||||
|
console.log('checkJwt: ', err, req.user)
|
||||||
if (err) return res.status(401).send(err.message)
|
if (err) return res.status(401).send(err.message)
|
||||||
next()
|
next()
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
server.express.post(server.options.endpoint, (req, res, done) =>
|
server.express.post(server.options.endpoint, (err, req, res, done) => {
|
||||||
|
console.log('getMember: ', err, req.user)
|
||||||
getMember(req, res, done, db)
|
getMember(req, res, done, db)
|
||||||
)
|
})
|
||||||
|
|
||||||
const whitelist = [
|
const whitelist = [
|
||||||
'http://localhost:1337',
|
'http://localhost:3000',
|
||||||
'http://0.0.0.0:5000'
|
'http://localhost:3001',
|
||||||
|
'http://localhost:3002',
|
||||||
|
'http://localhost:4000',
|
||||||
|
'http://localhost:4002'
|
||||||
]
|
]
|
||||||
const corsOptionsDelegate = (req, callback) => {
|
const corsOptionsDelegate = (req, callback) => {
|
||||||
var corsOptions
|
var corsOptions
|
||||||
@@ -207,12 +232,13 @@ const corsOptionsDelegate = (req, callback) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const options = {
|
const options = {
|
||||||
|
port: 4001,
|
||||||
cors: corsOptionsDelegate,
|
cors: corsOptionsDelegate,
|
||||||
endpoint: '/graphql',
|
endpoint: '/graphql',
|
||||||
subscriptions: '/graphql',
|
subscriptions: '/graphql',
|
||||||
playground: '/playground'
|
playground: '/playground'
|
||||||
}
|
}
|
||||||
|
|
||||||
server.start(options, () => console.log(`Server is running on http://localhost:4000${server.options.endpoint}`))
|
server.start(options, () => console.log(`Server is running on http://localhost:4001${server.options.endpoint}`))
|
||||||
|
|
||||||
module.exports= { createPrismaMember: createPrismaMember }
|
module.exports= { createMember }
|
||||||
@@ -12,24 +12,37 @@ type Query {
|
|||||||
teamById(teamId: String!): Team
|
teamById(teamId: String!): Team
|
||||||
teamByOwner(ownerId: String!): TeamConnection
|
teamByOwner(ownerId: String!): TeamConnection
|
||||||
owner: Member @isAuthenticated
|
owner: Member @isAuthenticated
|
||||||
member(auth0id: String!): Member @isAuthenticated
|
currentMember: Member @isAuthenticated
|
||||||
|
member(authId: String!): Member @isAuthenticated
|
||||||
}
|
}
|
||||||
|
|
||||||
type Mutation {
|
type Mutation {
|
||||||
authenticate(idToken: String!): Member
|
authenticate(idToken: String!): Member
|
||||||
createTeam(name: String!, slug: String, owner: String): Team @isAuthenticated
|
createTeam(name: String!, slug: String, owner: String): Team @isAuthenticated
|
||||||
deleteTeam(id: ID!): Team @isAuthenticated @isOwner(type: "Team")
|
deleteTeam(id: ID!): Team @isAuthenticated @isOwner(type: "Team")
|
||||||
updateProfile(data: MemberProfileInput): Member @isAuthenticated
|
|
||||||
}
|
}
|
||||||
|
|
||||||
input MemberProfileInput {
|
input MemberProfileInput {
|
||||||
auth0id: String!
|
authId: String!
|
||||||
nickname: String!
|
alias: String!
|
||||||
anonymous: Boolean
|
}
|
||||||
visible: Boolean
|
|
||||||
avatar: String
|
fragment MemberInfo on Member {
|
||||||
email: String
|
id
|
||||||
repo: String
|
authId
|
||||||
bio: String
|
alias
|
||||||
status: String
|
isActive
|
||||||
|
profile {
|
||||||
|
...MemberProfileInfo
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fragment MemberProfileInfo on MemberProfile {
|
||||||
|
firstName
|
||||||
|
lastName
|
||||||
|
email
|
||||||
|
avatar
|
||||||
|
role {
|
||||||
|
name
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -3,7 +3,8 @@ import Footer from './footer'
|
|||||||
import Callback from './callback'
|
import Callback from './callback'
|
||||||
import Home from './home'
|
import Home from './home'
|
||||||
import Dashboard from './dashboard'
|
import Dashboard from './dashboard'
|
||||||
|
import Teams from './teams'
|
||||||
|
|
||||||
import { theme, globalStyles } from './theme'
|
import { theme, globalStyles } from './theme'
|
||||||
|
|
||||||
export { NavBar, Footer, Callback, Home, Dashboard, theme, globalStyles }
|
export { NavBar, Footer, Callback, Home, Dashboard, Teams, theme, globalStyles }
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
import React from 'react'
|
||||||
|
import PropTypes from 'prop-types'
|
||||||
|
|
||||||
|
import CssBaseline from '@material-ui/core/CssBaseline'
|
||||||
|
import Typography from '@material-ui/core/Typography'
|
||||||
|
import { withStyles } from '@material-ui/core/styles'
|
||||||
|
|
||||||
|
const styles = theme => ({
|
||||||
|
'@global': {
|
||||||
|
body: {
|
||||||
|
backgroundColor: theme.palette.common.white
|
||||||
|
}
|
||||||
|
},
|
||||||
|
layout: {
|
||||||
|
width: 'auto',
|
||||||
|
marginLeft: theme.spacing.unit * 3,
|
||||||
|
marginRight: theme.spacing.unit * 3,
|
||||||
|
[theme.breakpoints.up(900 + theme.spacing.unit * 3 * 2)]: {
|
||||||
|
width: 900,
|
||||||
|
marginLeft: 'auto',
|
||||||
|
marginRight: 'auto'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
heroContent: {
|
||||||
|
maxWidth: 600,
|
||||||
|
margin: '0 auto',
|
||||||
|
padding: `${theme.spacing.unit * 8}px 0 ${theme.spacing.unit * 6}px`
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
const Home = ({ classes }) => (
|
||||||
|
<React.Fragment>
|
||||||
|
<CssBaseline />
|
||||||
|
<main className={classes.layout}>
|
||||||
|
<div className={classes.heroContent}>
|
||||||
|
<Typography
|
||||||
|
variant='display3'
|
||||||
|
align='center'
|
||||||
|
color='textPrimary'
|
||||||
|
gutterBottom
|
||||||
|
>
|
||||||
|
Teams
|
||||||
|
</Typography>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</React.Fragment>
|
||||||
|
)
|
||||||
|
|
||||||
|
Home.propTypes = {
|
||||||
|
classes: PropTypes.object.isRequired
|
||||||
|
}
|
||||||
|
|
||||||
|
export default withStyles(styles)(Home)
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
# Code Styling and Formatting
|
||||||
|
|
||||||
|
```
|
||||||
|
npm install --save-dev eslint-config-standard eslint-config-standard-react eslint-plugin-standard eslint-plugin-promise eslint-plugin-import eslint-plugin-node eslint-plugin-react
|
||||||
|
```
|
||||||
Reference in new issue
Block a user