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

Fixes s3 path

Browse Source
This commit is contained in:
Jori Lallo
2017-12-13 23:32:45 -08:00
parent 7d756e4fae
commit 308d36c528
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/api/user.js
View File

@ -1,13 +1,8 @@
// @flow // @flow
import uuid from 'uuid'; import uuid from 'uuid';
import Router from 'koa-router'; import Router from 'koa-router';
<<<<<<< HEAD
import { makePolicy, signPolicy, publicS3Endpoint } from '../utils/s3'; import { makePolicy, signPolicy, publicS3Endpoint } from '../utils/s3';
=======
import Event from '../models/Event'; import Event from '../models/Event';
import { makePolicy, signPolicy } from '../utils/s3';
>>>>>>> Avatar upload
import auth from './middlewares/authentication'; import auth from './middlewares/authentication';
import { presentUser } from '../presenters'; import { presentUser } from '../presenters';
@ -20,13 +15,12 @@ router.post('user.info', auth(), async ctx => {
router.post('user.update', auth(), async ctx => { router.post('user.update', auth(), async ctx => {
const { user } = ctx.state; const { user } = ctx.state;
const { name, avatarUrl } = ctx.body; const { name, avatarUrl } = ctx.body;
const endpoint = publicS3Endpoint();
if (name) user.name = name; if (name) user.name = name;
if ( if (
avatarUrl && avatarUrl &&
avatarUrl.startsWith( avatarUrl.startsWith(`${endpoint}/uploads/${ctx.state.user.id}`)
`${process.env.AWS_S3_UPLOAD_BUCKET_URL}uploads/${ctx.state.user.id}`
)
) )
user.avatarUrl = avatarUrl; user.avatarUrl = avatarUrl;
await user.save(); await user.save();