Merge branch 'api-v3' into api-v3-equip-feed-hatch2

common/script/index.js

@@ -112,6 +112,8 @@ import allocateNow from './ops/allocateNow';
 import hatch from './ops/hatch';
 import feed from './ops/feed';
 import equip from './ops/equip';
+import changeClass from './ops/changeClass';
+import disableClasses from './ops/disableClasses';
 
 api.ops = {
   scoreTask,
@@ -125,6 +127,8 @@ api.ops = {
   hatch,
   feed,
   equip,
+  changeClass,
+  disableClasses,
 };
 
 import handleTwoHanded from './fns/handleTwoHanded';

common/script/ops/changeClass.js

@@ -2,58 +2,70 @@ import i18n from '../i18n';
 import _ from 'lodash';
 import splitWhitespace from '../libs/splitWhitespace';
 import { capByLevel } from '../statHelpers';
+import {
+  NotAuthorized,
+} from '../libs/errors';
+
+module.exports = function changeClass (user, req = {}, analytics) {
+  let klass = _.get(req, 'query.class');
 
-module.exports = function(user, req, cb, analytics) {
-  var analyticsData, klass, ref;
-  klass = (ref = req.query) != null ? ref["class"] : void 0;
   if (klass === 'warrior' || klass === 'rogue' || klass === 'wizard' || klass === 'healer') {
-    analyticsData = {
+    user.stats.class = klass;
+    user.flags.classSelected = true;
+
+    _.each(['weapon', 'armor', 'shield', 'head'], (type) => {
+      let foundKey = false;
+      _.findLast(user.items.gear.owned, (val, key) => {
+        if (key.indexOf(`${type}_${klass}`) !== -1 && val === true) {
+          foundKey = key;
+          return true;
+        }
+      });
+
+      if (!foundKey) {
+        if (type === 'weapon') {
+          foundKey = `weapon_${klass}_0`;
+        } else if (type === 'shield' && klass === 'rogue') {
+          foundKey = 'shield_rogue_0';
+        } else {
+          foundKey = `${type}_base_0`;
+        }
+      }
+
+      user.items.gear.equipped[type] = foundKey;
+
+      if (type === 'weapon' || (type === 'shield' && klass === 'rogue')) { // eslint-disable-line no-extra-parens
+        user.items.gear.owned[`${type}_${klass}_0`] = true;
+      }
+    });
+
+    if (analytics) {
+      analytics.track('change class', {
         uuid: user._id,
-      "class": klass,
+        class: klass,
         acquireMethod: 'Gems',
         gemCost: 3,
-      category: 'behavior'
-    };
-    if (analytics != null) {
-      analytics.track('change class', analyticsData);
-    }
-    user.stats["class"] = klass;
-    user.flags.classSelected = true;
-    _.each(["weapon", "armor", "shield", "head"], function(type) {
-      var foundKey;
-      foundKey = false;
-      _.findLast(user.items.gear.owned, function(v, k) {
-        if (~k.indexOf(type + "_" + klass) && v === true) {
-          return foundKey = k;
-        }
+        category: 'behavior',
       });
-      user.items.gear.equipped[type] = foundKey ? foundKey : type === "weapon" ? "weapon_" + klass + "_0" : type === "shield" && klass === "rogue" ? "shield_rogue_0" : type + "_base_0";
-      if (type === "weapon" || (type === "shield" && klass === "rogue")) {
-        user.items.gear.owned[type + "_" + klass + "_0"] = true;
     }
-      return true;
-    });
   } else {
     if (user.preferences.disableClasses) {
       user.preferences.disableClasses = false;
       user.preferences.autoAllocate = false;
     } else {
-      if (!(user.balance >= .75)) {
-        return typeof cb === "function" ? cb({
-          code: 401,
-          message: i18n.t('notEnoughGems', req.language)
-        }) : void 0;
+      if (user.balance < 0.75) throw new NotAuthorized(i18n.t('notEnoughGems', req.language));
+      user.balance -= 0.75;
     }
-      user.balance -= .75;
-    }
-    _.merge(user.stats, {
-      str: 0,
-      con: 0,
-      per: 0,
-      int: 0,
-      points: capByLevel(user.stats.lvl)
-    });
+
+    user.stats.str = 0;
+    user.stats.con = 0;
+    user.stats.per = 0;
+    user.stats.int = 0;
+    user.stats.points = capByLevel(user.stats.lvl);
     user.flags.classSelected = false;
   }
-  return typeof cb === "function" ? cb(null, _.pick(user, splitWhitespace('stats flags items preferences'))) : void 0;
+
+  return {
+    data: _.pick(user, splitWhitespace('stats flags items preferences')),
+  };
 };

common/script/ops/disableClasses.js

@@ -2,12 +2,15 @@ import splitWhitespace from '../libs/splitWhitespace';
 import { capByLevel } from '../statHelpers';
 import _ from 'lodash';
 
-module.exports = function(user, req, cb) {
-  user.stats["class"] = 'warrior';
+module.exports = function disableClasses (user) {
+  user.stats.class = 'warrior';
   user.flags.classSelected = true;
   user.preferences.disableClasses = true;
   user.preferences.autoAllocate = true;
   user.stats.str = capByLevel(user.stats.lvl);
   user.stats.points = 0;
-  return typeof cb === "function" ? cb(null, _.pick(user, splitWhitespace('stats flags preferences'))) : void 0;
+
+  return {
+    data: _.pick(user, splitWhitespace('stats flags preferences')),
+  };
 };

tasks/gulp-eslint.js

@@ -20,14 +20,12 @@ const COMMON_FILES = [
   '!./common/script/ops/addTask.js',
   '!./common/script/ops/addWebhook.js',
   '!./common/script/ops/blockUser.js',
-  '!./common/script/ops/changeClass.js',
   '!./common/script/ops/clearCompleted.js',
   '!./common/script/ops/clearPMs.js',
   '!./common/script/ops/deletePM.js',
   '!./common/script/ops/deleteTag.js',
   '!./common/script/ops/deleteTask.js',
   '!./common/script/ops/deleteWebhook.js',
-  '!./common/script/ops/disableClasses.js',
   '!./common/script/ops/getTag.js',
   '!./common/script/ops/getTags.js',
   '!./common/script/ops/hourglassPurchase.js',

test/api/v3/integration/user/POST-user_change-class.test.js

@@ -0,0 +1,27 @@
+import {
+  generateUser,
+} from '../../../../helpers/api-integration/v3';
+
+describe('POST /user/change-class', () => {
+  let user;
+
+  beforeEach(async () => {
+    user = await generateUser();
+  });
+
+  // More tests in common code unit tests
+
+  it('changes class', async () => {
+    let res = await user.post(`/user/change-class?class=rogue`);
+    await user.sync();
+
+    expect(res).to.eql({
+      data: JSON.parse(JSON.stringify({
+        preferences: user.preferences,
+        stats: user.stats,
+        flags: user.flags,
+        items: user.items,
+      })),
+    });
+  });
+});

test/api/v3/integration/user/POST-user_disable-classes.test.js

@@ -0,0 +1,26 @@
+import {
+  generateUser,
+} from '../../../../helpers/api-integration/v3';
+
+describe('POST /user/disable-classes', () => {
+  let user;
+
+  beforeEach(async () => {
+    user = await generateUser();
+  });
+
+  // More tests in common code unit tests
+
+  it('disable classes', async () => {
+    let res = await user.post(`/user/disable-classes`);
+    await user.sync();
+
+    expect(res).to.eql({
+      data: JSON.parse(JSON.stringify({
+        preferences: user.preferences,
+        stats: user.stats,
+        flags: user.flags,
+      })),
+    });
+  });
+});

test/api/v3/integration/user/auth/POST-register_local.test.js

@@ -116,6 +116,40 @@ describe('POST /user/auth/local/register', () => {
     });
   });
 
+  context('attach to facebook user', () => {
+    let user;
+    let email = 'some@email.net';
+    let username = 'some-username';
+    let password = 'some-password';
+    beforeEach(async () => {
+      user = await generateUser();
+    });
+    it('checks onlySocialAttachLocal', async () => {
+      await expect(user.post('/user/auth/local/register', {
+        email,
+        username,
+        password,
+        confirmPassword: password,
+      })).to.eventually.be.rejected.and.eql({
+        code: 401,
+        error: 'NotAuthorized',
+        message: t('onlySocialAttachLocal'),
+      });
+    });
+    it('succeeds', async () => {
+      await user.update({ 'auth.facebook.id': 'some-fb-id', 'auth.local': { ok: true } });
+      await user.post('/user/auth/local/register', {
+        username,
+        email,
+        password,
+        confirmPassword: password,
+      });
+      await user.sync();
+      expect(user.auth.local.username).to.eql(username);
+      expect(user.auth.local.email).to.eql(email);
+    });
+  });
+
   context('login is already taken', () => {
     let username, email, api;
 

test/common/ops/changeClass.js

@@ -0,0 +1,119 @@
+import changeClass from '../../../common/script/ops/changeClass';
+import {
+  NotAuthorized,
+} from '../../../common/script/libs/errors';
+import i18n from '../../../common/script/i18n';
+import {
+  generateUser,
+} from '../../helpers/common.helper';
+
+describe('shared.ops.changeClass', () => {
+  let user;
+
+  beforeEach(() => {
+    user = generateUser();
+  });
+
+  context('req.query.class is a valid class', () => {
+    it('changes class', () => {
+      user.stats.class = 'healer';
+      user.items.gear.owned.armor_rogue_1 = true; // eslint-disable-line camelcase
+
+      let res = changeClass(user, {query: {class: 'rogue'}});
+      expect(res).to.eql({
+        data: {
+          preferences: user.preferences,
+          stats: user.stats,
+          flags: user.flags,
+          items: user.items,
+        },
+      });
+
+      expect(user.stats.class).to.equal('rogue');
+      expect(user.flags.classSelected).to.be.true;
+      expect(user.items.gear.equipped.weapon).to.equal('weapon_rogue_0');
+      expect(user.items.gear.owned.weapon_rogue_0).to.be.true;
+      expect(user.items.gear.equipped.armor).to.equal('armor_rogue_1');
+      expect(user.items.gear.owned.armor_rogue_1).to.be.true;
+      expect(user.items.gear.equipped.shield).to.equal('shield_rogue_0');
+      expect(user.items.gear.owned.shield_rogue_0).to.be.true;
+      expect(user.items.gear.equipped.head).to.equal('head_base_0');
+    });
+  });
+
+  context('req.query.class is missing', () => {
+    it('has user.preferences.disableClasses === true', () => {
+      user.balance = 1;
+      user.preferences.disableClasses = true;
+      user.preferences.autoAllocate = true;
+      user.stats.points = 45;
+      user.stats.lvl = 3;
+      user.stats.str = 1;
+      user.stats.con = 2;
+      user.stats.per = 3;
+      user.stats.int = 4;
+      user.flags.classSelected = true;
+
+      let res = changeClass(user);
+      expect(res).to.eql({
+        data: {
+          preferences: user.preferences,
+          stats: user.stats,
+          flags: user.flags,
+          items: user.items,
+        },
+      });
+
+      expect(user.preferences.disableClasses).to.be.false;
+      expect(user.preferences.autoAllocate).to.be.false;
+      expect(user.balance).to.equal(1);
+      expect(user.stats.str).to.equal(0);
+      expect(user.stats.con).to.equal(0);
+      expect(user.stats.per).to.equal(0);
+      expect(user.stats.int).to.equal(0);
+      expect(user.stats.points).to.equal(3);
+      expect(user.flags.classSelected).to.equal(false);
+    });
+
+    context('has user.preferences.disableClasses !== true', () => {
+      it('and less than 3 gems', () => {
+        user.balance = 0.5;
+        try {
+          changeClass(user);
+        } catch (err) {
+          expect(err).to.be.an.instanceof(NotAuthorized);
+          expect(err.message).to.equal(i18n.t('notEnoughGems'));
+        }
+      });
+
+      it('and at least 3 gems', () => {
+        user.balance = 1;
+        user.stats.points = 45;
+        user.stats.lvl = 3;
+        user.stats.str = 1;
+        user.stats.con = 2;
+        user.stats.per = 3;
+        user.stats.int = 4;
+        user.flags.classSelected = true;
+
+        let res = changeClass(user);
+        expect(res).to.eql({
+          data: {
+            preferences: user.preferences,
+            stats: user.stats,
+            flags: user.flags,
+            items: user.items,
+          },
+        });
+
+        expect(user.balance).to.equal(0.25);
+        expect(user.stats.str).to.equal(0);
+        expect(user.stats.con).to.equal(0);
+        expect(user.stats.per).to.equal(0);
+        expect(user.stats.int).to.equal(0);
+        expect(user.stats.points).to.equal(3);
+        expect(user.flags.classSelected).to.equal(false);
+      });
+    });
+  });
+});

test/common/ops/disableClasses.js

@@ -0,0 +1,37 @@
+import disableClasses from '../../../common/script/ops/disableClasses';
+import {
+  generateUser,
+} from '../../helpers/common.helper';
+
+describe('shared.ops.disableClasses', () => {
+  let user;
+
+  beforeEach(() => {
+    user = generateUser();
+  });
+
+  it('disable classes', () => {
+    user.stats.lvl = 34;
+    user.stats.str = 45;
+    user.stats.class = 'healer';
+    user.preferences.disableClasses = false;
+    user.preferences.autoAllocate = false;
+    user.stats.points = 2;
+
+    let res = disableClasses(user);
+    expect(res).to.eql({
+      data: {
+        preferences: user.preferences,
+        stats: user.stats,
+        flags: user.flags,
+      },
+    });
+
+    expect(user.stats.class).to.equal('warrior');
+    expect(user.flags.classSelected).to.equal(true);
+    expect(user.preferences.disableClasses).to.equal(true);
+    expect(user.preferences.autoAllocate).to.equal(true);
+    expect(user.stats.str).to.equal(34);
+    expect(user.stats.points).to.equal(0);
+  });
+});

website/src/controllers/api-v3/auth.js

@@ -70,7 +70,7 @@ api.registerLocal = {
   url: '/user/auth/local/register',
   async handler (req, res) {
     let fbUser = res.locals.user; // If adding local auth to social user
-    // TODO check user doesn't have local auth
+
     req.checkBody({
       email: {
         notEmpty: {errorMessage: res.t('missingEmail')},
@@ -82,7 +82,6 @@ api.registerLocal = {
         equals: {options: [req.body.confirmPassword], errorMessage: res.t('passwordConfirmationMatch')},
       },
     });
-
     let validationErrors = req.validationErrors();
     if (validationErrors) throw validationErrors;
 
@@ -124,7 +123,7 @@ api.registerLocal = {
 
     if (fbUser) {
       if (!fbUser.auth.facebook.id) throw new NotAuthorized(res.t('onlySocialAttachLocal'));
-      fbUser.auth.local = newUser;
+      fbUser.auth.local = newUser.auth.local;
       newUser = fbUser;
     } else {
       newUser = new User(newUser);

website/src/controllers/api-v3/user.js

@@ -381,4 +381,46 @@ api.feed = {
   },
 };
 
+/**
+* @api {post} /user/change-class Change class.
+* @apiVersion 3.0.0
+* @apiName UserChangeClass
+* @apiGroup User
+*
+* @apiParam {string} class ?class={warrior|rogue|wizard|healer}. If missing will
+*
+* @apiSuccess {Object} data `stats flags items preferences`
+*/
+api.changeClass = {
+  method: 'POST',
+  middlewares: [authWithHeaders(), cron],
+  url: '/user/change-class',
+  async handler (req, res) {
+    let user = res.locals.user;
+    let changeClassRes = common.ops.changeClass(user, req, res.analytics);
+    await user.save();
+    res.respond(200, changeClassRes);
+  },
+};
+
+/**
+* @api {post} /user/disable-classes Disable classes.
+* @apiVersion 3.0.0
+* @apiName UserDisableClasses
+* @apiGroup User
+*
+* @apiSuccess {Object} data `stats flags preferences`
+*/
+api.disableClasses = {
+  method: 'POST',
+  middlewares: [authWithHeaders(), cron],
+  url: '/user/disable-classes',
+  async handler (req, res) {
+    let user = res.locals.user;
+    let disableClassesRes = common.ops.disableClasses(user, req);
+    await user.save();
+    res.respond(200, disableClassesRes);
+  },
+};
+
 module.exports = api;