Merge pull request #304 from UniversityOfHelsinkiCS/trunk

Endpoints for also non-admins

src/routes.js

@@ -4,6 +4,7 @@ const courses = require('./routes/courses')
 const students = require('./routes/students')
 const population = require('./routes/population')
 const login = require('./routes/login')
+const language = require('./routes/language')
 const users = require('./routes/users')
 const elementdetails = require('./routes/elementdetails')
 const auth = require('./middleware/auth')
@@ -27,6 +28,7 @@ module.exports = (app, url) => {
   app.use(url, courses)
   app.use(url, students)
   app.use(url, population)
+  app.use(url, language)
   app.use(url, providers)
   app.use(url, semesters)
   app.use(`${url}/teachers`, auth.roles(['teachers']), teachers)
@@ -34,7 +36,7 @@ module.exports = (app, url) => {
   app.use(`${url}/usage`, auth.roles(['usage']), usage)
   app.use(`${url}/oodilearn`, auth.roles(['oodilearn']), oodilearn)
   app.use(`${url}/course-groups`, auth.roles(['coursegroups']), courseGroups)
-  app.use(`${url}/mandatory_courses`, auth.roles(['studyprogramme']), mandatoryCourses),
+  app.use(`${url}/mandatory_courses`, mandatoryCourses),
   app.use(`${url}/oodi`, auth.roles(['dev']), oodi)
   app.use(url, auth.roles(['dev', 'admin']), task)
 }

src/routes/language.js

@@ -0,0 +1,17 @@
+const router = require('express').Router()
+const userService = require('../services/userService')
+
+router.post('/language', async (req, res) => {
+  const { username, language } = req.body
+  if (!['fi','sv','en'].includes(language)) {
+    return res.status(400).json('invalid language')
+  }
+  try {
+    const result = await userService.updateUser(username, { language })
+    return res.status(200).json(result)
+  } catch (e) {
+    return res.status(e.response.status).json(e.response.data)
+  }
+})
+
+module.exports = router

src/routes/users.js

@@ -58,17 +58,4 @@ router.delete('/:uid/elements', async (req, res) => {
   res.json(user)
 })
 
-router.post('/language', async (req, res) => {
-  const { username, language } = req.body
-  if (!['fi','sv','en'].includes(language)) {
-    return res.status(400).json('invalid language')
-  }
-  try {
-    const result = await userService.updateUser(username, { language })
-    return res.status(200).json(result)
-  } catch (e) {
-    return res.status(e.response.status).json(e.response.data)
-  }
-})
-
 module.exports = router