Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5fd5773

Browse files
idmadjidmadj
committed
Fixed some error messages references and converted meteor
errors to camel case tokens to allow them to be retrieved from a localization object
1 parent a76573b commit 5fd5773

3 files changed

Lines changed: 23 additions & 22 deletions

File tree

‎imports/helpers.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export function validateEmail(email, showMessage, clearMessage) {
6767
showMessage("error.emailRequired", 'warning', false, 'email');
6868
return false;
6969
} else {
70-
showMessage("error.accounts.Invalid email", 'warning', false, 'email');
70+
showMessage("error.accounts.invalidEmail", 'warning', false, 'email');
7171
return false;
7272
}
7373
}
@@ -77,7 +77,7 @@ export function validatePassword(password = '', showMessage, clearMessage, field
7777
return true;
7878
} else {
7979
// const errMsg = T9n.get("error.minChar").replace(/7/, Accounts.ui._options.minimumPasswordLength);
80-
const errMsg = "error.minChar"
80+
const errMsg = "error.minChar";
8181
showMessage(errMsg, 'warning', false, fieldId);
8282
return false;
8383
}

‎imports/ui/components/LoginForm.jsx‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React, { Component } from 'react';
22
import PropTypes from 'prop-types';
3-
import ReactDOM from 'react-dom';
43
import { withTracker } from 'meteor/react-meteor-data';
54
import { Accounts } from 'meteor/accounts-base';
6-
import { KEY_PREFIX } from '../../login_session.js';
5+
import { KEY_PREFIX } from '../../login_session.js';
76
import './Form.jsx';
7+
import _ from 'lodash';
88

99
import {
1010
STATES,
@@ -597,7 +597,7 @@ export default class LoginForm extends Component {
597597
if (usernameOrEmail !== null) {
598598
if (!this.validateField('username', usernameOrEmail)) {
599599
if (this.state.formState == STATES.SIGN_UP) {
600-
this.state.onSubmitHook("error.accounts.usernameRequired", this.state.formState);
600+
this.state.onSubmitHook("error.usernameRequired", this.state.formState);
601601
}
602602
error = true;
603603
}
@@ -612,7 +612,7 @@ export default class LoginForm extends Component {
612612
} else if (username !== null) {
613613
if (!this.validateField('username', username)) {
614614
if (this.state.formState == STATES.SIGN_UP) {
615-
this.state.onSubmitHook("error.accounts.usernameRequired", this.state.formState);
615+
this.state.onSubmitHook("error.usernameRequired", this.state.formState);
616616
}
617617
error = true;
618618
}
@@ -642,7 +642,7 @@ export default class LoginForm extends Component {
642642
Meteor.loginWithPassword(loginSelector, password, (error, result) => {
643643
onSubmitHook(error,formState);
644644
if (error) {
645-
this.showMessage(`error.accounts.${error.reason}` || "unknown_error", 'error');
645+
this.showMessage(`error.accounts.${_.camelCase(error.reason)}` || "unknown_error", 'error');
646646
}
647647
else {
648648
loginResultCallback(() => this.state.onSignedInHook());
@@ -703,7 +703,7 @@ export default class LoginForm extends Component {
703703
loginWithService(options, (error) => {
704704
onSubmitHook(error,formState);
705705
if (error) {
706-
this.showMessage(`error.accounts.${error.reason}` || "unknown_error");
706+
this.showMessage(`error.accounts.${_.camelCase(error.reason)}` || "unknown_error");
707707
} else {
708708
this.setState({ formState: STATES.PROFILE });
709709
this.clearDefaultFieldValues();
@@ -730,7 +730,7 @@ export default class LoginForm extends Component {
730730
if (username !== null) {
731731
if ( !this.validateField('username', username) ) {
732732
if (this.state.formState == STATES.SIGN_UP) {
733-
this.state.onSubmitHook("error.accounts.usernameRequired", this.state.formState);
733+
this.state.onSubmitHook("error.usernameRequired", this.state.formState);
734734
}
735735
error = true;
736736
} else {
@@ -742,7 +742,7 @@ export default class LoginForm extends Component {
742742
"USERNAME_AND_EMAIL_NO_PASSWORD"
743743
].includes(passwordSignupFields()) && !this.validateField('username', username) ) {
744744
if (this.state.formState == STATES.SIGN_UP) {
745-
this.state.onSubmitHook("error.accounts.usernameRequired", this.state.formState);
745+
this.state.onSubmitHook("error.usernameRequired", this.state.formState);
746746
}
747747
error = true;
748748
}
@@ -770,9 +770,9 @@ export default class LoginForm extends Component {
770770
const SignUp = function(_options) {
771771
Accounts.createUser(_options, (error) => {
772772
if (error) {
773-
this.showMessage(`error.accounts.${error.reason}` || "unknown_error", 'error');
774-
if (this.translate(`error.accounts.${error.reason}`)) {
775-
onSubmitHook(`error.accounts.${error.reason}`, formState);
773+
this.showMessage(`error.accounts.${_.camelCase(error.reason)}` || "unknown_error", 'error');
774+
if (this.translate(`error.accounts.${_.camelCase(error.reason)}`)) {
775+
onSubmitHook(`error.accounts.${_.camelCase(error.reason)}`, formState);
776776
}
777777
else {
778778
onSubmitHook("unknown_error", formState);
@@ -821,7 +821,7 @@ export default class LoginForm extends Component {
821821

822822
Accounts.loginWithoutPassword({ email: email }, (error) => {
823823
if (error) {
824-
this.showMessage(`error.accounts.${error.reason}` || "unknown_error", 'error');
824+
this.showMessage(`error.accounts.${_.camelCase(error.reason)}` || "unknown_error", 'error');
825825
}
826826
else {
827827
this.showMessage("info.emailSent", 'success', 5000);
@@ -835,7 +835,7 @@ export default class LoginForm extends Component {
835835

836836
Accounts.loginWithoutPassword({ email: usernameOrEmail, username: usernameOrEmail }, (error) => {
837837
if (error) {
838-
this.showMessage(`error.accounts.${error.reason}` || "unknown_error", 'error');
838+
this.showMessage(`error.accounts.${_.camelCase(error.reason)}` || "unknown_error", 'error');
839839
}
840840
else {
841841
this.showMessage("info.emailSent", 'success', 5000);
@@ -845,9 +845,9 @@ export default class LoginForm extends Component {
845845
this.setState({ waiting: false });
846846
});
847847
} else {
848-
let errMsg = "error.accounts.invalid_email";
848+
let errMsg = "error.accounts.invalidEmail";
849849
this.showMessage(errMsg,'warning');
850-
onSubmitHook(this.translate(errMsg), formState);
850+
onSubmitHook(errMsg, formState);
851851
}
852852
}
853853

@@ -869,7 +869,7 @@ export default class LoginForm extends Component {
869869

870870
Accounts.forgotPassword({ email: email }, (error) => {
871871
if (error) {
872-
this.showMessage(`error.accounts.${error.reason}` || "unknown_error", 'error');
872+
this.showMessage(`error.accounts.${_.camelCase(error.reason)}` || "unknown_error", 'error');
873873
}
874874
else {
875875
this.showMessage("info.emailSent", 'success', 5000);
@@ -891,7 +891,7 @@ export default class LoginForm extends Component {
891891
} = this.state;
892892

893893
if (!this.validateField('password', newPassword, 'newPassword')){
894-
onSubmitHook('err.minChar',formState);
894+
onSubmitHook('error.minChar',formState);
895895
return;
896896
}
897897

@@ -902,7 +902,7 @@ export default class LoginForm extends Component {
902902
if (token) {
903903
Accounts.resetPassword(token, newPassword, (error) => {
904904
if (error) {
905-
this.showMessage(`error.accounts.${error.reason}` || "unknown_error", 'error');
905+
this.showMessage(`error.accounts.${_.camelCase(error.reason)}` || "unknown_error", 'error');
906906
onSubmitHook(error, formState);
907907
}
908908
else {
@@ -918,7 +918,7 @@ export default class LoginForm extends Component {
918918
else {
919919
Accounts.changePassword(password, newPassword, (error) => {
920920
if (error) {
921-
this.showMessage(`error.accounts.${error.reason}` || "unknown_error", 'error');
921+
this.showMessage(`error.accounts.${_.camelCase(error.reason)}` || "unknown_error", 'error');
922922
onSubmitHook(error, formState);
923923
}
924924
else {

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
},
1818
"homepage": "https://github.com/studiointeract/accounts-ui",
1919
"dependencies": {
20-
"prop-types": "^15.5.8"
20+
"prop-types": "^15.5.8",
21+
"lodash": "^4.17.10"
2122
},
2223
"peerDependencies": {
2324
"react": "^15.0.0",

0 commit comments

Comments
 (0)