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

Revert "Deprecate API v2" (#7801)

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-07-17 18:15:25 +02:00
committed by GitHub
parent 45c31a2bcf
commit 590adb3438
193 changed files with 11487 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
website/server/controllers/api-v3/auth.js
View File

@@ -4,22 +4,22 @@ import passport from 'passport';
import nconf from 'nconf';
import {
authWithHeaders,
} from '../../middlewares/auth';
} from '../../middlewares/api-v3/auth';
import {
NotAuthorized,
BadRequest,
NotFound,
} from '../../libs/errors';
} from '../../libs/api-v3/errors';
import Bluebird from 'bluebird';
import * as passwordUtils from '../../libs/password';
import logger from '../../libs/logger';
import * as passwordUtils from '../../libs/api-v3/password';
import logger from '../../libs/api-v3/logger';
import { model as User } from '../../models/user';
import { model as Group } from '../../models/group';
import { model as EmailUnsubscription } from '../../models/emailUnsubscription';
import { sendTxn as sendTxnEmail } from '../../libs/email';
import { decrypt } from '../../libs/encryption';
import { send as sendEmail } from '../../libs/email';
import pusher from '../../libs/pusher';
import { sendTxn as sendTxnEmail } from '../../libs/api-v3/email';
import { decrypt } from '../../libs/api-v3/encryption';
import { send as sendEmail } from '../../libs/api-v3/email';
import pusher from '../../libs/api-v3/pusher';
let api = {};

6
website/server/controllers/api-v3/challenges.js
View File

@@ -1,4 +1,4 @@
import { authWithHeaders, authWithSession } from '../../middlewares/auth';
import { authWithHeaders, authWithSession } from '../../middlewares/api-v3/auth';
import _ from 'lodash';
import { model as Challenge } from '../../models/challenge';
import {
@@ -13,10 +13,10 @@ import {
import {
NotFound,
NotAuthorized,
} from '../../libs/errors';
} from '../../libs/api-v3/errors';
import * as Tasks from '../../models/task';
import Bluebird from 'bluebird';
import csvStringify from '../../libs/csvStringify';
import csvStringify from '../../libs/api-v3/csvStringify';
let api = {};

10
website/server/controllers/api-v3/chat.js
View File

@@ -1,14 +1,14 @@
import { authWithHeaders } from '../../middlewares/auth';
import { authWithHeaders } from '../../middlewares/api-v3/auth';
import { model as Group } from '../../models/group';
import { model as User } from '../../models/user';
import {
NotFound,
NotAuthorized,
} from '../../libs/errors';
} from '../../libs/api-v3/errors';
import _ from 'lodash';
import { removeFromArray } from '../../libs/collectionManipulators';
import { getUserInfo, getGroupUrl, sendTxn } from '../../libs/email';
import pusher from '../../libs/pusher';
import { removeFromArray } from '../../libs/api-v3/collectionManipulators';
import { getUserInfo, getGroupUrl, sendTxn } from '../../libs/api-v3/email';
import pusher from '../../libs/api-v3/pusher';
import nconf from 'nconf';
import Bluebird from 'bluebird';

4
website/server/controllers/api-v3/content.js
View File

@@ -1,10 +1,10 @@
import common from '../../../../common';
import _ from 'lodash';
import { langCodes } from '../../libs/i18n';
import { langCodes } from '../../libs/api-v3/i18n';
import Bluebird from 'bluebird';
import fsCallback from 'fs';
import path from 'path';
import logger from '../../libs/logger';
import logger from '../../libs/api-v3/logger';
// Transform fs methods that accept callbacks in ones that return promises
const fs = {

6
website/server/controllers/api-v3/coupon.js
View File

@@ -1,9 +1,9 @@
import csvStringify from '../../libs/csvStringify';
import csvStringify from '../../libs/api-v3/csvStringify';
import {
authWithHeaders,
authWithSession,
} from '../../middlewares/auth';
import { ensureSudo } from '../../middlewares/ensureAccessRight';
} from '../../middlewares/api-v3/auth';
import { ensureSudo } from '../../middlewares/api-v3/ensureAccessRight';
import { model as Coupon } from '../../models/coupon';
import _ from 'lodash';
import couponCode from 'coupon-code';

6
website/server/controllers/api-v3/debug.js
View File

@@ -1,6 +1,6 @@
import { authWithHeaders } from '../../middlewares/auth';
import ensureDevelpmentMode from '../../middlewares/ensureDevelpmentMode';
import { BadRequest } from '../../libs/errors';
import { authWithHeaders } from '../../middlewares/api-v3/auth';
import ensureDevelpmentMode from '../../middlewares/api-v3/ensureDevelpmentMode';
import { BadRequest } from '../../libs/api-v3/errors';
import { content } from '../../../../common';
import _ from 'lodash';

14
website/server/controllers/api-v3/groups.js
View File

@@ -1,4 +1,4 @@
import { authWithHeaders } from '../../middlewares/auth';
import { authWithHeaders } from '../../middlewares/api-v3/auth';
import Bluebird from 'bluebird';
import _ from 'lodash';
import {
@@ -15,12 +15,12 @@ import {
NotFound,
BadRequest,
NotAuthorized,
} from '../../libs/errors';
import { removeFromArray } from '../../libs/collectionManipulators';
import { sendTxn as sendTxnEmail } from '../../libs/email';
import { encrypt } from '../../libs/encryption';
import sendPushNotification from '../../libs/pushNotifications';
import pusher from '../../libs/pusher';
} from '../../libs/api-v3/errors';
import { removeFromArray } from '../../libs/api-v3/collectionManipulators';
import { sendTxn as sendTxnEmail } from '../../libs/api-v3/email';
import { encrypt } from '../../libs/api-v3/encryption';
import sendPushNotification from '../../libs/api-v3/pushNotifications';
import pusher from '../../libs/api-v3/pusher';
let api = {};

6
website/server/controllers/api-v3/hall.js
View File

@@ -1,9 +1,9 @@
import { authWithHeaders } from '../../middlewares/auth';
import { ensureAdmin } from '../../middlewares/ensureAccessRight';
import { authWithHeaders } from '../../middlewares/api-v3/auth';
import { ensureAdmin } from '../../middlewares/api-v3/ensureAccessRight';
import { model as User } from '../../models/user';
import {
NotFound,
} from '../../libs/errors';
} from '../../libs/api-v3/errors';
import _ from 'lodash';
let api = {};

8
website/server/controllers/api-v3/members.js
View File

@@ -1,4 +1,4 @@
import { authWithHeaders } from '../../middlewares/auth';
import { authWithHeaders } from '../../middlewares/api-v3/auth';
import {
model as User,
publicFields as memberFields,
@@ -9,14 +9,14 @@ import { model as Challenge } from '../../models/challenge';
import {
NotFound,
NotAuthorized,
} from '../../libs/errors';
} from '../../libs/api-v3/errors';
import * as Tasks from '../../models/task';
import {
getUserInfo,
sendTxn as sendTxnEmail,
} from '../../libs/email';
} from '../../libs/api-v3/email';
import Bluebird from 'bluebird';
import sendPushNotification from '../../libs/pushNotifications';
import sendPushNotification from '../../libs/api-v3/pushNotifications';
let api = {};

4
website/server/controllers/api-v3/notifications.js
View File

@@ -1,8 +1,8 @@
import { authWithHeaders } from '../../middlewares/auth';
import { authWithHeaders } from '../../middlewares/api-v3/auth';
import _ from 'lodash';
import {
NotFound,
} from '../../libs/errors';
} from '../../libs/api-v3/errors';
let api = {};

4
website/server/controllers/api-v3/pushNotifications.js
View File

@@ -1,8 +1,8 @@
import { authWithHeaders } from '../../middlewares/auth';
import { authWithHeaders } from '../../middlewares/api-v3/auth';
import {
NotAuthorized,
NotFound,
} from '../../libs/errors';
} from '../../libs/api-v3/errors';
let api = {};

10
website/server/controllers/api-v3/quests.js
View File

@@ -1,7 +1,7 @@
import _ from 'lodash';
import Bluebird from 'bluebird';
import { authWithHeaders } from '../../middlewares/auth';
import analytics from '../../libs/analyticsService';
import { authWithHeaders } from '../../middlewares/api-v3/auth';
import analytics from '../../libs/api-v3/analyticsService';
import {
model as Group,
} from '../../models/group';
@@ -10,13 +10,13 @@ import {
NotFound,
NotAuthorized,
BadRequest,
} from '../../libs/errors';
} from '../../libs/api-v3/errors';
import {
getUserInfo,
sendTxn as sendTxnEmail,
} from '../../libs/email';
} from '../../libs/api-v3/email';
import common from '../../../../common';
import sendPushNotification from '../../libs/pushNotifications';
import sendPushNotification from '../../libs/api-v3/pushNotifications';
const questScrolls = common.content.quests;

6
website/server/controllers/api-v3/tags.js
View File

@@ -1,11 +1,11 @@
import { authWithHeaders } from '../../middlewares/auth';
import { authWithHeaders } from '../../middlewares/api-v3/auth';
import { model as Tag } from '../../models/tag';
import * as Tasks from '../../models/task';
import {
NotFound,
} from '../../libs/errors';
} from '../../libs/api-v3/errors';
import _ from 'lodash';
import { removeFromArray } from '../../libs/collectionManipulators';
import { removeFromArray } from '../../libs/api-v3/collectionManipulators';
let api = {};

10
website/server/controllers/api-v3/tasks.js
View File

@@ -1,6 +1,6 @@
import { authWithHeaders } from '../../middlewares/auth';
import { sendTaskWebhook } from '../../libs/webhook';
import { removeFromArray } from '../../libs/collectionManipulators';
import { authWithHeaders } from '../../middlewares/api-v3/auth';
import { sendTaskWebhook } from '../../libs/api-v3/webhook';
import { removeFromArray } from '../../libs/api-v3/collectionManipulators';
import * as Tasks from '../../models/task';
import { model as Challenge } from '../../models/challenge';
import { model as Group } from '../../models/group';
@@ -8,11 +8,11 @@ import {
NotFound,
NotAuthorized,
BadRequest,
} from '../../libs/errors';
} from '../../libs/api-v3/errors';
import common from '../../../../common';
import Bluebird from 'bluebird';
import _ from 'lodash';
import logger from '../../libs/logger';
import logger from '../../libs/api-v3/logger';
let api = {};

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

@@ -1,10 +1,10 @@
import { authWithHeaders } from '../../middlewares/auth';
import { authWithHeaders } from '../../middlewares/api-v3/auth';
import common from '../../../../common';
import {
NotFound,
BadRequest,
NotAuthorized,
} from '../../libs/errors';
} from '../../libs/api-v3/errors';
import * as Tasks from '../../models/task';
import {
basicFields as basicGroupFields,
@@ -13,7 +13,7 @@ import {
import { model as User } from '../../models/user';
import Bluebird from 'bluebird';
import _ from 'lodash';
import * as passwordUtils from '../../libs/password';
import * as passwordUtils from '../../libs/api-v3/password';
let api = {};