fix: email verification and UX

fix: remove annotations

fix: styles

fix: move directives from schema

chore: rework auth routes

feat: start graphql schema modularization

feat: start directives rework

fix: directive cycle

fix: directive resolve

fix: schema auth directive

feat: migrate auth routes to gql

fix: apollo client

fix: migrate forms to formik

refactor: user resolver

chore: final touches on auth components

fix: routes

lib/new-admin/admin-server.js

@@ -21,7 +21,9 @@ const options = require('../options')
 const db = require('../db')
 const users = require('../users')
 
-const { typeDefs, resolvers, AuthDirective, SuperuserDirective } = require('./graphql/schema')
+const authRouter = require('./routes/auth')
+const { AuthDirective } = require('./graphql/directives')
+const { typeDefs, resolvers } = require('./graphql/schema')
 
 const devMode = require('minimist')(process.argv.slice(2)).dev
 const idPhotoCardBasedir = _.get('idPhotoCardDir', options)
@@ -64,8 +66,7 @@ const apolloServer = new ApolloServer({
   typeDefs,
   resolvers,
   schemaDirectives: {
-    auth: AuthDirective,
-    superuser: SuperuserDirective
+    auth: AuthDirective
   },
   playground: false,
   introspection: false,
@@ -74,7 +75,8 @@ const apolloServer = new ApolloServer({
     return error
   },
   context: async ({ req }) => {
-    if (!req.session.user) throw new AuthenticationError('Authentication failed')
+    if (!req.session.user) return { req }
+
     const user = await users.verifyAndUpdateUser(
       req.session.user.id,
       req.headers['user-agent'] || 'Unknown',
@@ -87,7 +89,8 @@ const apolloServer = new ApolloServer({
     req.session.lastUsed = new Date(Date.now()).toISOString()
     req.session.user.id = user.id
     req.session.user.role = user.role
-    return { req: { ...req } }
+
+    return { req }
   }
 })
 
@@ -104,9 +107,7 @@ app.use(cors({ credentials: true, origin: devMode && 'https://localhost:3001' })
 
 app.use('/id-card-photo', serveStatic(idPhotoCardBasedir, { index: false }))
 app.use('/front-camera-photo', serveStatic(frontCameraBasedir, { index: false }))
-app.use('/api', register)
-
-require('./routes/auth')(app)
+app.use(authRouter)
 
 // Everything not on graphql or api/register is redirected to the front-end
 app.get('*', (req, res) => res.sendFile(path.resolve(__dirname, '..', '..', 'public', 'index.html')))