krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix typo in apidocs comment and my screwup in the previous commit - so sorry :(

Browse Source
This commit is contained in:
Alys
2017-10-18 08:13:16 +10:00
parent 2e429513da
commit 810362a404
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
website/server/controllers/api-v3/user.js
View File

@@ -1,16 +1,25 @@
import { authWithHeaders } from '../../middlewares/auth'; import import { authWithHeaders } from '../../middlewares/auth';
common from '../../../common'; import { import common from '../../../common';
NotFound, BadRequest, NotAuthorized,
} from '../../libs/errors'; import * as Tasks from
'../../models/task'; import {
basicFields as basicGroupFields, model as Group,
} from '../../models/group'; import { model as User } from
'../../models/user'; import Bluebird from 'bluebird'; import _ from
'lodash'; import * as passwordUtils from '../../libs/password';
import { import {
getUserInfo, sendTxn as txnEmail, NotFound,
} from '../../libs/email'; import nconf from 'nconf'; import get from BadRequest,
'lodash/get'; NotAuthorized,
} from '../../libs/errors';
import * as Tasks from '../../models/task';
import {
basicFields as basicGroupFields,
model as Group,
} from '../../models/group';
import { model as User } from '../../models/user';
import Bluebird from 'bluebird';
import _ from 'lodash';
import * as passwordUtils from '../../libs/password';
import {
getUserInfo,
sendTxn as txnEmail,
} from '../../libs/email';
import nconf from 'nconf';
import get from 'lodash/get';
const TECH_ASSISTANCE_EMAIL = nconf.get('EMAILS:TECH_ASSISTANCE_EMAIL'); const TECH_ASSISTANCE_EMAIL = nconf.get('EMAILS:TECH_ASSISTANCE_EMAIL');
const DELETE_CONFIRMATION = 'DELETE'; const DELETE_CONFIRMATION = 'DELETE';