Skip to content

Commit 5d68477

Browse files
authored
Update controller.js to async await
1 parent bf94e60 commit 5d68477

1 file changed

Lines changed: 30 additions & 28 deletions

File tree

lib/controllers.js

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,59 @@
11
'use strict';
22

3-
var groups = require.main.require('./src/groups');
3+
const groups = require.main.require('./src/groups');
44

5-
var Controllers = {};
5+
const Controllers = {};
66

77
Controllers.renderAdminPage = async (req, res) => {
88
const groupData = await groups.getGroupsFromSet('groups:visible:createtime', 0, -1);
99
res.render('admin/plugins/session-sharing', { groups: groupData });
1010
};
1111

12-
Controllers.retrieveUser = function (req, res) {
12+
Controllers.retrieveUser = async (req, res) {
1313
const main = module.parent.exports;
1414
const remoteId = req.query.id;
15-
16-
if (remoteId) {
17-
main.getUser(remoteId, function (err, userObj) {
18-
if (err) {
19-
res.status(500).json({
20-
error: err.message,
21-
});
22-
} else if (userObj) {
23-
res.status(200).json(userObj);
24-
} else {
25-
res.sendStatus(404);
26-
}
27-
});
28-
} else {
29-
res.status(400).json({
15+
16+
if (!remoteId) {
17+
return res.status(400).json({
3018
error: 'no-id-supplied',
3119
});
3220
}
21+
22+
try {
23+
const userObj = await main.getUser(remoteId);
24+
25+
if (!userObj) {
26+
return res.sendStatus(404);
27+
}
28+
29+
return res.status(200).json(userObj);
30+
} catch (error) {
31+
return res.status(500).json({
32+
error: error.message,
33+
});
34+
}
3335
};
3436

35-
Controllers.process = function (req, res) {
37+
Controllers.process = async (req, res) {
3638
const main = module.parent.exports;
3739

3840
if (!req.body || !req.body.token) {
3941
return res.status(400).json({
4042
error: 'no-token-provided',
4143
});
4244
}
45+
46+
try {
47+
const uid = await main.process(req.body.token);
4348

44-
main.process(req.body.token, (err, uid) => {
45-
if (err) {
46-
return res.status(500).json({
47-
error: err.message,
48-
});
49-
}
50-
51-
res.status(200).json({
49+
return res.status(200).json({
5250
uid,
5351
});
54-
});
52+
} catch (error) {
53+
return res.status(500).json({
54+
error: error.message,
55+
});
56+
}
5557
};
5658

5759
module.exports = Controllers;

0 commit comments

Comments
 (0)