reactioncommerce · jmaver-plume · Apr 25, 2019 · Apr 25, 2019 · Apr 25, 2019 · Apr 25, 2019
diff --git a/imports/collections/schemas/accounts.js b/imports/collections/schemas/accounts.js
@@ -73,6 +73,11 @@ export const Profile = new SimpleSchema({
     optional: true,
     mockValue: null
   },
+  "language": {
+    label: "User Language",
+    type: String,
+    optional: true
+  },
   "preferences": {
     label: "User preferences",
     type: Object,

diff --git a/imports/collections/schemas/orders.js b/imports/collections/schemas/orders.js
@@ -456,6 +456,10 @@ export const Order = new SimpleSchema({
     optional: true
   },
   "history.$": History,
+  "language": {
+    type: String,
+    optional: true
+  },
   "notes": {
     type: Array,
     optional: true

diff --git a/imports/plugins/core/accounts/server/methods/index.js b/imports/plugins/core/accounts/server/methods/index.js
@@ -13,6 +13,7 @@ import removeEmailAddress from "./removeEmailAddress";
 import removeUserPermissions from "./removeUserPermissions";
 import sendResetPasswordEmail from "./sendResetPasswordEmail";
 import setProfileCurrency from "./setProfileCurrency";
+import setProfileLanguage from "./setProfileLanguage";
 import setUserPermissions from "./setUserPermissions";
 import updateEmailAddress from "./updateEmailAddress";
 import updateServiceConfiguration from "./updateServiceConfiguration";
@@ -47,6 +48,7 @@ export default {
   "accounts/removeUserPermissions": removeUserPermissions,
   "accounts/sendResetPasswordEmail": sendResetPasswordEmail,
   "accounts/setProfileCurrency": setProfileCurrency,
+  "accounts/setProfileLanguage": setProfileLanguage,
   "accounts/setUserPermissions": setUserPermissions,
   "accounts/updateEmailAddress": updateEmailAddress,
   "accounts/updateServiceConfiguration": updateServiceConfiguration,

diff --git a/imports/plugins/core/accounts/server/methods/inviteShopMember.js b/imports/plugins/core/accounts/server/methods/inviteShopMember.js
@@ -116,9 +116,12 @@ export default function inviteShopMember(options) {
 
   dataForEmail.groupName = _.startCase(group.name);
 
+  const account = Accounts.findOne({ userId });
+  const language = account && account.profile && account.profile.language;
+
   // Compile Email with SSR
-  SSR.compileTemplate(tpl, Reaction.Email.getTemplate(tpl));
-  SSR.compileTemplate(subject, Reaction.Email.getSubject(tpl));
+  SSR.compileTemplate(tpl, Reaction.Email.getTemplate(tpl, language));
+  SSR.compileTemplate(subject, Reaction.Email.getSubject(tpl, language));
 
   // send invitation email from primary shop email
   Reaction.Email.send({
@@ -128,5 +131,5 @@ export default function inviteShopMember(options) {
     html: SSR.render(tpl, dataForEmail)
   });
 
-  return Accounts.findOne({ userId });
+  return account;
 }
diff --git a/imports/plugins/core/accounts/server/methods/inviteShopOwner.js b/imports/plugins/core/accounts/server/methods/inviteShopOwner.js
@@ -4,6 +4,7 @@ import { Meteor } from "meteor/meteor";
 import { Accounts as MeteorAccounts } from "meteor/accounts-base";
 import { check, Match } from "meteor/check";
 import { SSR } from "meteor/meteorhacks:ssr";
+import { Accounts } from "/lib/collections";
 import Reaction from "/imports/plugins/core/core/server/Reaction";
 import ReactionError from "@reactioncommerce/reaction-error";
 import getCurrentUserName from "../no-meteor/util/getCurrentUserName";
@@ -55,8 +56,11 @@ export default function inviteShopOwner(options, shopData) {
   const tpl = "accounts/inviteShopOwner";
   const subject = "accounts/inviteShopOwner/subject";
 
-  SSR.compileTemplate(tpl, Reaction.Email.getTemplate(tpl));
-  SSR.compileTemplate(subject, Reaction.Email.getSubject(tpl));
+  const account = Accounts.findOne({ userId }, { _id: 0, profile: 1 });
+  const language = account && account.profile && account.profile.language;
+
+  SSR.compileTemplate(tpl, Reaction.Email.getTemplate(tpl, language));
+  SSR.compileTemplate(subject, Reaction.Email.getSubject(tpl, language));
 
   const emailLogo = Reaction.Email.getShopLogo(primaryShop);
   const token = Random.id();

diff --git a/imports/plugins/core/accounts/server/methods/sendResetPasswordEmail.js b/imports/plugins/core/accounts/server/methods/sendResetPasswordEmail.js
@@ -1,15 +1,15 @@
 import _ from "lodash";
 import Logger from "@reactioncommerce/logger";
 import Random from "@reactioncommerce/random";
-import { Accounts } from "meteor/accounts-base";
+import { Accounts as MeteorAccounts } from "meteor/accounts-base";
 import { check } from "meteor/check";
 import { Meteor } from "meteor/meteor";
 import { SSR } from "meteor/meteorhacks:ssr";
-import { Shops } from "/lib/collections";
+import { Accounts, Shops } from "/lib/collections";
 import Reaction from "/imports/plugins/core/core/server/Reaction";
 import ReactionError from "@reactioncommerce/reaction-error";
 
-Accounts.urls.resetPassword = function reset(token) {
+MeteorAccounts.urls.resetPassword = function reset(token) {
   return Meteor.absoluteUrl(`reset-password/${token}`);
 };
 
@@ -97,15 +97,19 @@ async function sendResetEmail(userId, optionalEmail) {
       }
     },
     // Account Data
-    passwordResetUrl: Accounts.urls.resetPassword(token),
+    passwordResetUrl: MeteorAccounts.urls.resetPassword(token),
     user
   };
 
   // Compile Email with SSR
   const tpl = "accounts/resetPassword";
   const subject = "accounts/resetPassword/subject";
-  SSR.compileTemplate(tpl, Reaction.Email.getTemplate(tpl));
-  SSR.compileTemplate(subject, Reaction.Email.getSubject(tpl));
+
+  const account = Accounts.findOne({ userId }, { _id: 0, profile: 1 });
+  const language = account && account.profile && account.profile.language;
+
+  SSR.compileTemplate(tpl, Reaction.Email.getTemplate(tpl, language));
+  SSR.compileTemplate(subject, Reaction.Email.getSubject(tpl, language));
 
   return Reaction.Email.send({
     to: email,
@@ -130,7 +134,7 @@ export default function sendResetPasswordEmail(options) {
     email: String
   });
 
-  const user = Accounts.findUserByEmail(options.email);
+  const user = MeteorAccounts.findUserByEmail(options.email);
 
   if (!user) {
     Logger.error("accounts/sendResetPasswordEmail - User not found");

diff --git a/imports/plugins/core/accounts/server/methods/setProfileLanguage.js b/imports/plugins/core/accounts/server/methods/setProfileLanguage.js
@@ -0,0 +1,57 @@
+import { check, Match } from "meteor/check";
+import R from "ramda";
+import { Accounts, Shops } from "/lib/collections";
+import appEvents from "/imports/node-app/core/util/appEvents";
+import Reaction from "/imports/plugins/core/core/server/Reaction";
+import ReactionError from "@reactioncommerce/reaction-error";
+
+/**
+ * @name accounts/setProfileLanguage
+ * @memberof Accounts/Methods
+ * @method
+ * @param {String} languageCode - i18n language code
+ * @param {String} [accountId] - accountId of user to set language of. Defaults to current user ID
+ * @summary Sets users profile language
+ * @returns {Object} Account document
+ */
+export default function setProfileLanguage(languageCode, accountId) {
+  check(languageCode, String);
+  check(accountId, Match.Maybe(String));
+
+  const currentUserId = this.userId;
+  const userId = accountId || currentUserId;
+  if (!userId) throw new ReactionError("access-denied", "You must be logged in to set profile language");
+
+  const account = Accounts.findOne({ userId }, { fields: { shopId: 1 } });
+  if (!account) throw new ReactionError("not-found", "Account not found");
+
+  if (userId !== currentUserId && !Reaction.hasPermission("reaction-accounts", currentUserId, account.shopId)) {
+    throw new ReactionError("access-denied", "Access denied");
+  }
+
+  // first search for shop based on account id
+  let shop = Shops.findOne({ _id: account.shopId }, { languages: 1 });
+
+  if (!shop || !shop.languages || shop.languages.length === 0) {
+    // if non-primary shop does not have any languages use primary shop
+    shop = Shops.findOne({ shopType: "primary" }, { languages: 1 });
+  }
+
+  const shopLanguages = (shop && shop.languages) || [];
+  const shopLanguage = R.find(R.whereEq({ enabled: true, i18n: languageCode }))(shopLanguages);
+
+  if (!shopLanguage) {
+    throw new ReactionError("invalid-argument", `Shop does not define any enabled language with code "${languageCode}"`);
+  }
+
+  Accounts.update({ userId }, { $set: { "profile.language": languageCode } });
+
+  const updatedAccount = Accounts.findOne({ userId });
+  Promise.await(appEvents.emit("afterAccountUpdate", {
+    account: updatedAccount,
+    updatedBy: currentUserId,
+    updatedFields: ["profile.language"]
+  }));
+
+  return updatedAccount;
+}
diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/Account/index.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/Account/index.js
@@ -8,6 +8,7 @@ export default {
   _id: (account) => encodeAccountOpaqueId(account._id),
   addressBook,
   currency: (account) => getXformedCurrencyByCode(account.profile && account.profile.currency),
+  language: (account) => account.profile && account.profile.language,
   emailRecords: (account) => account.emails,
   preferences: (account) => get(account, "profile.preferences"),
   primaryEmailAddress: (account) => {

diff --git a/imports/plugins/core/accounts/server/no-meteor/resolvers/Mutation/index.js b/imports/plugins/core/accounts/server/no-meteor/resolvers/Mutation/index.js
@@ -4,6 +4,7 @@ import inviteShopMember from "./inviteShopMember";
 import removeAccountAddressBookEntry from "./removeAccountAddressBookEntry";
 import removeAccountFromGroup from "./removeAccountFromGroup";
 import setAccountProfileCurrency from "./setAccountProfileCurrency";
+import setAccountProfileLanguage from "./setAccountProfileLanguage";
 import updateAccountAddressBookEntry from "./updateAccountAddressBookEntry";
 
 export default {
@@ -13,5 +14,6 @@ export default {
   removeAccountAddressBookEntry,
   removeAccountFromGroup,
   setAccountProfileCurrency,
+  setAccountProfileLanguage,
   updateAccountAddressBookEntry
 };
diff --git a/...ts/plugins/core/accounts/server/no-meteor/resolvers/Mutation/setAccountProfileLanguage.js b/...ts/plugins/core/accounts/server/no-meteor/resolvers/Mutation/setAccountProfileLanguage.js
@@ -0,0 +1,25 @@
+import { decodeAccountOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/account";
+
+/**
+ * @name "Mutation.setAccountProfileLanguage"
+ * @method
+ * @memberof Accounts/GraphQL
+ * @summary resolver for the setAccountProfileLanguage GraphQL mutation
+ * @param {Object} _ - unused
+ * @param {Object} args.input - an object of all mutation arguments that were sent by the client
+ * @param {String} [args.input.accoundId] - The account ID, which defaults to the viewer account
+ * @param {String} args.input.languageCode - The languageCode to add to user profile
+ * @param {String} [args.input.clientMutationId] - An optional string identifying the mutation call
+ * @param {Object} context - an object containing the per-request state
+ * @return {Object} setAccountProfileLanguage
+ */
+export default function setAccountProfileLanguage(_, { input }, context) {
+  const { accountId, languageCode, clientMutationId = null } = input;
+  const dbAccountId = decodeAccountOpaqueId(accountId);
+  const updatedAccount = context.callMeteorMethod("accounts/setProfileLanguage", languageCode, dbAccountId);
+
+  return {
+    account: updatedAccount,
+    clientMutationId
+  };
+}
diff --git a/imports/plugins/core/accounts/server/no-meteor/schemas/account.graphql b/imports/plugins/core/accounts/server/no-meteor/schemas/account.graphql
@@ -60,6 +60,18 @@ input SetAccountProfileCurrencyInput {
   currencyCode: String!
 }
 
+"Describes an account profile language change"
+input SetAccountProfileLanguageInput {
+  "The account ID, which defaults to the viewer account"
+  accountId: ID
+
+  "An optional string identifying the mutation call, which will be returned in the response payload"
+  clientMutationId: String
+
+  "The language code"
+  languageCode: String!
+}
+
 "Defines a new Email and the account to which it should be added"
 input AddAccountEmailRecordInput {
   "The account ID, which defaults to the viewer account"
@@ -124,6 +136,9 @@ type Account implements Node {
   "The preferred currency used by this account"
   currency: Currency
 
+  "The preferred language used by this account"
+  language: String
+
   "A list of email records associated with this account"
   emailRecords: [EmailRecord]
 
@@ -228,6 +243,15 @@ type SetAccountProfileCurrencyPayload {
   clientMutationId: String
 }
 
+"The response from the `setAccountProfileLanguage` mutation"
+type SetAccountProfileLanguagePayload {
+  "The updated account"
+  account: Account
+
+  "The same string you sent with the mutation params, for matching mutation calls with their responses"
+  clientMutationId: String
+}
+
 extend type Mutation {
   "Add a new address to the `addressBook` field for an account"
   addAccountAddressBookEntry(input: AddAccountAddressBookEntryInput!): AddAccountAddressBookEntryPayload
@@ -244,6 +268,9 @@ extend type Mutation {
   "Set the preferred currency for an account"
   setAccountProfileCurrency(input: SetAccountProfileCurrencyInput!): SetAccountProfileCurrencyPayload
 
+  "Set the preferred language for an account"
+  setAccountProfileLanguage(input: SetAccountProfileLanguageInput!): SetAccountProfileLanguagePayload
+
   "Remove an address that exists in the `addressBook` field for an account"
   updateAccountAddressBookEntry(input: UpdateAccountAddressBookEntryInput!): UpdateAccountAddressBookEntryPayload
 }

diff --git a/imports/plugins/core/accounts/server/util/sendVerificationEmail.js b/imports/plugins/core/accounts/server/util/sendVerificationEmail.js
@@ -2,7 +2,8 @@ import _ from "lodash";
 import Logger from "@reactioncommerce/logger";
 import Random from "@reactioncommerce/random";
 import { Meteor } from "meteor/meteor";
-import { Accounts } from "meteor/accounts-base";
+import { Accounts as MeteorAccounts } from "meteor/accounts-base";
+import { Accounts } from "/lib/collections";
 import { SSR } from "meteor/meteorhacks:ssr";
 import Reaction from "/imports/plugins/core/core/server/Reaction";
 import ReactionError from "@reactioncommerce/reaction-error";
@@ -66,7 +67,7 @@ export default async function sendVerificationEmail({
   });
 
   const shopName = Reaction.getShopName();
-  const url = Accounts.urls.verifyEmail(token);
+  const url = MeteorAccounts.urls.verifyEmail(token);
   const copyrightDate = new Date().getFullYear();
 
   const dataForEmail = {
@@ -117,8 +118,11 @@ export default async function sendVerificationEmail({
     `);
   }
 
-  SSR.compileTemplate(bodyTemplate, Reaction.Email.getTemplate(bodyTemplate));
-  SSR.compileTemplate(subjectTemplate, Reaction.Email.getSubject(bodyTemplate));
+  const account = Accounts.findOne({ userId }, { _id: 0, profile: 1 });
+  const language = account && account.profile && account.profile.language;
+
+  SSR.compileTemplate(bodyTemplate, Reaction.Email.getTemplate(bodyTemplate, language));
+  SSR.compileTemplate(subjectTemplate, Reaction.Email.getSubject(bodyTemplate, language));
 
   return Reaction.Email.send({
     to: address,

diff --git a/imports/plugins/core/accounts/server/util/sendWelcomeEmail.js b/imports/plugins/core/accounts/server/util/sendWelcomeEmail.js
@@ -82,8 +82,9 @@ export default function sendWelcomeEmail(shopId, userId, token) {
 
   const tpl = "accounts/sendWelcomeEmail";
   const subject = "accounts/sendWelcomeEmail/subject";
-  SSR.compileTemplate(tpl, Reaction.Email.getTemplate(tpl));
-  SSR.compileTemplate(subject, Reaction.Email.getSubject(tpl));
+  const language = account && account.profile && account.profile.language;
+  SSR.compileTemplate(tpl, Reaction.Email.getTemplate(tpl, language));
+  SSR.compileTemplate(subject, Reaction.Email.getSubject(tpl, language));
 
   Reaction.Email.send({
     to: userEmail,

diff --git a/imports/plugins/core/core/server/Reaction/Email/getSubject.js b/imports/plugins/core/core/server/Reaction/Email/getSubject.js
@@ -10,22 +10,40 @@ import ReactionError from "@reactioncommerce/reaction-error";
  * layout must be defined + template
  * @example SSR.compileTemplate(subject, Reaction.Email.getSubject(tpl));
  * @param {String} template name of the template in either Layouts or fs
+ * @param {String} [language] i18n language of a template
  * @returns {Object} returns source
  */
-export default function getSubject(template) {
+export default function getSubject(template, language) {
   if (typeof template !== "string") {
     const msg = "Reaction.Email.getSubject() requires a template name";
     Logger.error(msg);
     throw new ReactionError("invalid-parameter", msg);
   }
 
-  // set default
-  const language = Reaction.getShopLanguage();
+  if (language !== undefined && typeof language !== "string") {
+    const msg = "Reaction.Email.getSubject() requires optional language code that is a string";
+    Logger.error(msg);
+    throw new ReactionError("invalid-parameter", msg);
+  }
+
+  if (language !== undefined) {
+    // check database for a matching template using language param
+    const tmpl = Templates.findOne({
+      enabled: true,
+      name: template,
+      language
+    });
+
+    // use that template if found
+    if (tmpl && tmpl.template) {
+      return tmpl.subject;
+    }
+  }
 
-  // check database for a matching template
+  // check database for a matching template using shop language
   const tmpl = Templates.findOne({
     name: template,
-    language
+    language: Reaction.getShopLanguage()
   });
 
   // use that template if found