coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

review comments

Browse Source
This commit is contained in:
Jori Lallo
2017-10-19 23:30:31 -07:00
parent c1a8e15a52
commit 1fdbf256a7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/models/User.js
View File

@ -1,6 +1,7 @@
// @flow
import crypto from 'crypto';
import bcrypt from 'bcrypt';
import uuid from 'uuid';
import { DataTypes, sequelize, encryptedFields } from '../sequelize';
import { uploadToS3FromUrl } from '../utils/s3';
@ -71,7 +72,7 @@ User.prototype.verifyPassword = function(password) {
User.prototype.updateAvatar = async function() {
this.avatarUrl = await uploadToS3FromUrl(
this.slackData.image_192,
`avatars/${this.id}`
`avatars/${this.id}/${uuid.v4()}`
);
};

9
server/utils/s3.js
View File

@ -4,6 +4,7 @@ import moment from 'moment';
import AWS from 'aws-sdk';
import invariant from 'invariant';
import fetch from 'isomorphic-fetch';
import bugsnag from 'bugsnag';
AWS.config.update({
accessKeyId: process.env.AWS_ACCESS_KEY_ID,
@ -32,7 +33,7 @@ const makePolicy = () => {
};
const signPolicy = (policy: any) => {
invariant(AWS_SECRET_ACCESS_KEY);
invariant(AWS_SECRET_ACCESS_KEY, 'AWS_SECRET_ACCESS_KEY not set');
const signature = crypto
.createHmac('sha1', AWS_SECRET_ACCESS_KEY)
.update(policy)
@ -43,7 +44,7 @@ const signPolicy = (policy: any) => {
const uploadToS3FromUrl = async (url: string, key: string) => {
const s3 = new AWS.S3();
invariant(AWS_S3_UPLOAD_BUCKET_NAME);
invariant(AWS_S3_UPLOAD_BUCKET_NAME, 'AWS_S3_UPLOAD_BUCKET_NAME not set');
try {
// $FlowIssue dunno it's fine
@ -59,8 +60,8 @@ const uploadToS3FromUrl = async (url: string, key: string) => {
})
.promise();
return `https://s3.amazonaws.com/${AWS_S3_UPLOAD_BUCKET_NAME}/${key}`;
} catch (_e) {
return undefined;
} catch (e) {
bugsnag.notify(e);
}
};