Skip to content

Commit

Permalink
Fix accounts import (#1839)
Browse files Browse the repository at this point in the history
* Added import for Meteor Accounts package.

- Also prevent Accounts (meteor) from colliding with Accounts (reaction
collection)

* Updated import order
  • Loading branch information
mikemurray authored Feb 16, 2017
1 parent afa2495 commit 1d3b554
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions server/methods/accounts/accounts.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import _ from "lodash";
import moment from "moment";
import path from "path";
import { Accounts as MeteorAccounts } from "meteor/accounts-base"
import { Accounts, Cart, Media, Shops, Packages } from "/lib/collections";
import * as Schemas from "/lib/collections/schemas";
import { Logger, Reaction } from "/server/api";
Expand Down Expand Up @@ -408,7 +409,7 @@ Meteor.methods({
});

if (!user) {
const userId = Accounts.createUser({
const userId = MeteorAccounts.createUser({
email: email,
username: name
});
Expand Down Expand Up @@ -474,7 +475,7 @@ Meteor.methods({
user: Meteor.user(),
currentUserName,
invitedUserName: name,
url: Accounts.urls.enrollAccount(token)
url: MeteorAccounts.urls.enrollAccount(token)
};

// Compile Email with SSR
Expand Down

0 comments on commit 1d3b554

Please sign in to comment.