Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions packages/api/server/controllers/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,10 @@ exports.updateAvatar = async (req, res) => {
const { avatar } = profile;
console.log('userId:', userId, ', avatar:', avatar);
if (avatar) {
await s3Service.deleteAvatar(avatar);
await s3Service.deleteAvatar(avatar.substring(avatar.lastIndexOf('/') + 1));
}

await profile.update({ avatar: filename });
await profile.update({ avatar: s3Service.getAvatarUrl(filename) });

return res.status(200).json({
code: 200,
Expand Down
13 changes: 9 additions & 4 deletions packages/api/server/services/s3.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const AWS_S3_CONFIG = {
};

const Bucket = 'workly-images';
const baseUrl = 'https://workly-images.s3.amazonaws.com/';
const originalPath = 'avatars/original/';
const thumbPath = 'avatars/thumb/';

Expand Down Expand Up @@ -38,12 +39,16 @@ exports.getOriginalPath = () => {
return originalPath;
};

exports.deleteAvatar = async avatar => {
console.log('avatar:', avatar);
exports.getAvatarUrl = filename => {
return baseUrl + thumbPath + filename;
};

exports.deleteAvatar = async filename => {
console.log('filename:', filename);
try {
const s3 = createS3Instance();
await deleteFile(s3, `${originalPath}${avatar}`);
await deleteFile(s3, `${thumbPath}${avatar}`);
await deleteFile(s3, `${originalPath}${filename}`);
await deleteFile(s3, `${thumbPath}${filename}`);
} catch (error) {
console.log(error);
}
Expand Down