Merge pull request #41 from vtfk/fix-mongo

Fikser feil i mongo + litt attot
vtfk · Feb 3, 2021 · e3b63e5 · e3b63e5
2 parents b44799e + 2f89d58
commit e3b63e5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/Classes/index.js b/Classes/index.js
@@ -101,7 +101,8 @@ const handleClasses = async (context, req) => {
     // No matching method found
     throw new HTTPError(404, 'Method not found', { method, id, action })
   } catch (error) {
-    logger('error', ['handle-classes', 'user', user, 'id', id, 'err', error.message])
+    const level = error.message && error.message.includes('access to this') ? 'warn' : 'error'
+    logger(level, ['handle-classes', 'user', user, 'id', id, 'err', error.message])
 
     if (error instanceof HTTPError) return error.toJSON()
     return new HTTPError(500, 'An unknown error occured', error).toJSON()

diff --git a/Documents/index.js b/Documents/index.js
@@ -27,6 +27,11 @@ const handleDocuments = async (context, req) => {
     const students = await getMyStudents(user)
     logger('info', ['handle-documents', 'user', user, 'get-students', students.length, 'students'])
 
+    if (!students || students.length === 0) {
+      logger('info', ['handle-documents', 'user', user, 'no students found', 'return nothing'])
+      return getResponse([])
+    }
+
     // GET: /documents/?id
     if (method === 'GET') {
       logger('info', ['handle-documents', 'user', user, 'get-documents'])

diff --git a/Students/index.js b/Students/index.js
@@ -94,7 +94,8 @@ const handleStudents = async (context, req) => {
     // No matching method found
     throw new HTTPError(404, 'Method not found', { method, id, action })
   } catch (error) {
-    logger('error', ['handle-students', 'user', user, 'id', id, 'err', error.message])
+    const level = error.message && error.message.includes('access to this') ? 'warn' : 'error'
+    logger(level, ['handle-students', 'user', user, 'id', (id || 'all'), 'err', error.message])
 
     if (error instanceof HTTPError) return error.toJSON()
     return new HTTPError(500, 'An unknown error occured', error).toJSON()

diff --git a/YFF/index.js b/YFF/index.js
@@ -56,7 +56,8 @@ const handleYFF = async (context, req) => {
     logger('info', ['handle-yff', 'method', method, 'student', student, 'user', user, 'type', type, 'id', `${id || 'alle'}`, 'result', result.length])
     return getResponse(result)
   } catch (error) {
-    logger('error', ['handle-yff', 'method', method, 'student', student, 'user', user, 'id', `${id || 'alle'}`, 'err', error.message])
+    const level = error.message && error.message.includes('access to this') ? 'warn' : 'error'
+    logger(level, ['handle-yff', 'method', method, 'student', student, 'user', user, 'id', `${id || 'alle'}`, 'err', error.message])
     if (error instanceof HTTPError) return error.toJSON()
     return new HTTPError(500, 'An unknown error occured', error)
   }

diff --git a/lib/repack-student.js b/lib/repack-student.js
@@ -15,7 +15,7 @@ module.exports = (student, removeGroups, removeUtdProg) => {
     firstName: student.firstName,
     lastName: student.lastName,
     fullName: student.fullName,
-    birthdate: birthdate.toISOString(),
+    birthdate: (isNaN(birthdate.getTime()) ? new Date() : birthdate).toISOString(),
     username: student.userName,
     mail: student.mail,
     mobile: student.mobilePhone,

diff --git a/lib/with-token-auth.js b/lib/with-token-auth.js
@@ -24,7 +24,7 @@ module.exports = async (context, request, next) => {
 
     return next(context, request)
   } catch (error) {
-    logger('error', ['with-token-auth', request.url, 'invalid-token', error])
+    logger('warn', ['with-token-auth', request.url, 'invalid-token', error])
     return new HTTPError(401, 'Authorization token is invalid').toJSON()
   }
 }