Add logger + getFbByTeamMember query
This commit is contained in:
1 parent
439448360c
commit
d715415fc6
7 files changed
+322
-24
No files matched your search
@@ -26,10 +26,11 @@ const createMember = async (ctx, idToken, info) => {
|
||||
}
|
||||
|
||||
const isLoggedIn = async ctx => {
|
||||
console.log('isLoggedIn 0 : ', ctx.request.headers)
|
||||
let member = ctxMember(ctx, memberLocationOnContext)
|
||||
let token = ctxToken(ctx, bearerAccessToken)
|
||||
let memberToken
|
||||
// console.log('isLoggedIn: ', ctx, member, token)
|
||||
console.log('isLoggedIn: ', member, token)
|
||||
if (!member && token) {
|
||||
let scheme, credentials
|
||||
const tokenParts = token.split(' ')
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
const gql = require('graphql-tag')
|
||||
|
||||
const TEAM_FB_FRAGMENT = gql`{
|
||||
id
|
||||
name
|
||||
slug
|
||||
members {
|
||||
role
|
||||
member {
|
||||
alias
|
||||
authId
|
||||
}
|
||||
status {
|
||||
id
|
||||
status
|
||||
reason
|
||||
createdAt
|
||||
}
|
||||
}
|
||||
fb {
|
||||
id
|
||||
name
|
||||
slug
|
||||
avatar
|
||||
kind
|
||||
status {
|
||||
status
|
||||
reason
|
||||
createdAt
|
||||
}
|
||||
}
|
||||
}`
|
||||
|
||||
module.exports = TEAM_FB_FRAGMENT
|
||||
+12
-2
@@ -25,9 +25,12 @@ const { sendTeamMemberInvite, sendTeamCreateConfirmation, verifyInviteToken } =
|
||||
|
||||
const TEAMS_FRAGMENT = require('./graphql/TeamsFragment')
|
||||
const TEAMS_CONNECTIONS_FRAGMENT = require('./graphql/TeamsConnectionsFragment')
|
||||
const TEAM_FB_FRAGMENT = require('./graphql/TeamFBFragment')
|
||||
|
||||
const logger = require('./logger')
|
||||
|
||||
const createMember = async function (ctx, info, idToken) {
|
||||
console.log('createMember', idToken)
|
||||
logger.info('createMember', idToken)
|
||||
const member = await ctx.db.mutation.upsertMember({
|
||||
where: {
|
||||
authId: idToken.sub,
|
||||
@@ -88,6 +91,13 @@ const resolvers = {
|
||||
console.log('teamsByRole teamAdmin: ', teamAdmin)
|
||||
return teamAdmin
|
||||
},
|
||||
async fbByTeamMember(parent, args, ctx, info) {
|
||||
console.log('fbByTeamMember: ', args, ctx.request, ctx.request.res.req.user)
|
||||
const authId = ctx.request.user.sub
|
||||
let teamMemberFB = await ctx.db.query.teams({where: {members_some: {AND: [{member: {authId: authId}}]}}, orderBy: 'updatedAt_DESC'}, TEAM_FB_FRAGMENT)
|
||||
logger.info('fbByTeamMember response: ', await teamMemberFB[0])
|
||||
return teamMemberFB[0]
|
||||
},
|
||||
async owner(parent, args, ctx, info) {
|
||||
console.log('resolver.query.owner ctx: ', ctxMember(ctx))
|
||||
return ctx.db.query.member({ where: { id: ctxMember(ctx).authId } }, info)
|
||||
@@ -260,7 +270,7 @@ server.express.use(
|
||||
server.options.endpoint,
|
||||
checkJwt,
|
||||
function (err, req, res, next) {
|
||||
// console.log('checkJwt: ', err, req)
|
||||
logger.info('checkJwt: ', err, req.headers, req.user)
|
||||
if (err) {
|
||||
return res.status(201).send(err.message)
|
||||
} else {
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
const { createLogger, format, transports } = require('winston')
|
||||
const { combine, timestamp, simple } = format
|
||||
|
||||
const options = {
|
||||
file: {
|
||||
level: 'info',
|
||||
filename: '../logs/app.log',
|
||||
handleExceptions: true,
|
||||
json: true,
|
||||
maxsize: 5242880, // 5MB
|
||||
maxFiles: 5,
|
||||
colorize: false,
|
||||
timestamp: true
|
||||
},
|
||||
console: {
|
||||
level: 'debug',
|
||||
handleExceptions: true,
|
||||
json: false,
|
||||
colorize: true,
|
||||
timestamp: true
|
||||
}
|
||||
}
|
||||
|
||||
const logger = createLogger({
|
||||
level: 'info',
|
||||
format: combine(
|
||||
timestamp({
|
||||
format: 'YYYY-MM-DD HH:mm:ss'
|
||||
}),
|
||||
simple()
|
||||
),
|
||||
transports: [
|
||||
new transports.File(options.file),
|
||||
new transports.Console(options.console)
|
||||
],
|
||||
exitOnError: false // do not exit on handled exceptions
|
||||
})
|
||||
|
||||
module.exports= logger
|
||||
@@ -13,6 +13,7 @@ type Query {
|
||||
teamWithRole(teamId: String!, role: String!): Team
|
||||
teamsByOwner(ownerId: String!): [Team!]! @isAuthenticated
|
||||
teamsByRole: [Team!]! @isAuthenticated
|
||||
fbByTeamMember: Team @isAuthenticated
|
||||
owner: Member @isAuthenticated
|
||||
currentMember: Member @isAuthenticated
|
||||
member(authId: String!): Member @isAuthenticated
|
||||
|
||||
Reference in new issue
Block a user