Skip to content

Refactor promises using async/await for apikey #2510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Refactor promises using async/await for apikey #2510

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e3dc05
refactor promises using async/await in apikey
adityagarg06 Oct 18, 2023
5143cff
Merge branch 'develop' into refactor_apikey_to_async/await
adityagarg06 Nov 3, 2023
54bdf4f
Merge branch 'processing:develop' into refactor_apikey_to_async/await
adityagarg06 Dec 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 52 additions & 73 deletions server/controllers/user.controller/apiKey.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ import crypto from 'crypto';

import User from '../../models/user';

function sendFailure(res, code, error) {
res.status(code).json({ error });
}

/**
* Generates a unique token to be used as a Personal Access Token
* @returns Promise<String> A promise that resolves to the token, or an Error
Expand All @@ -18,93 +22,68 @@ function generateApiKey() {
});
}

export function createApiKey(req, res) {
return new Promise((resolve, reject) => {
function sendFailure(code, error) {
res.status(code).json({ error });
resolve();
}

User.findById(req.user.id, async (err, user) => {
if (!user) {
sendFailure(404, 'User not found');
return;
}
export async function createApiKey(req, res) {
try {
const user = await User.findById(req.user.id);

if (!req.body.label) {
sendFailure(
400,
"Expected field 'label' was not present in request body"
);
return;
}
if (!user) {
sendFailure(res, 404, 'User not found');
return;
}

const keyToBeHashed = await generateApiKey();
if (!req.body.label) {
sendFailure(
res,
400,
"Expected field 'label' was not present in the request body"
);
return;
}

const addedApiKeyIndex = user.apiKeys.push({
label: req.body.label,
hashedKey: keyToBeHashed
});
const keyToBeHashed = await generateApiKey();

user.save((saveErr) => {
if (saveErr) {
sendFailure(500, saveErr);
return;
}
const addedApiKeyIndex = user.apiKeys.push({
label: req.body.label,
hashedKey: keyToBeHashed
});

const apiKeys = user.apiKeys.map((apiKey, index) => {
const fields = apiKey.toObject();
const shouldIncludeToken = index === addedApiKeyIndex - 1;
await user.save();

return shouldIncludeToken
? { ...fields, token: keyToBeHashed }
: fields;
});
const apiKeys = user.apiKeys.map((apiKey, index) => {
const fields = apiKey.toObject();
const shouldIncludeToken = index === addedApiKeyIndex - 1;

res.json({ apiKeys });
resolve();
});
return shouldIncludeToken ? { ...fields, token: keyToBeHashed } : fields;
});
});

res.json({ apiKeys });
} catch (error) {
sendFailure(res, 500, error);
}
}

export function removeApiKey(req, res) {
return new Promise((resolve, reject) => {
function sendFailure(code, error) {
res.status(code).json({ error });
resolve();
}
export async function removeApiKey(req, res) {
try {
const user = await User.findById(req.user.id);

User.findById(req.user.id, (err, user) => {
if (err) {
sendFailure(500, err);
return;
}
if (!user) {
sendFailure(res, 404, 'User not found');
return;
}

if (!user) {
sendFailure(404, 'User not found');
return;
}
const keyToDelete = user.apiKeys.find((key) => key.id === req.params.keyId);

const keyToDelete = user.apiKeys.find(
(key) => key.id === req.params.keyId
);
if (!keyToDelete) {
sendFailure(404, 'Key does not exist for user');
return;
}
if (!keyToDelete) {
sendFailure(res, 404, 'Key does not exist for user');
return;
}

user.apiKeys.pull({ _id: req.params.keyId });
user.apiKeys.pull({ _id: req.params.keyId });

user.save((saveErr) => {
if (saveErr) {
sendFailure(500, saveErr);
return;
}
await user.save();

res.status(200).json({ apiKeys: user.apiKeys });
resolve();
});
});
});
res.status(200).json({ apiKeys: user.apiKeys });
} catch (error) {
sendFailure(res, 500, error);
}
}