Merge pull request topcoder-platform#55 from applehit16/email-conflict

sushilshinde · web-flow · commit 8f8101c24268 · 2019-04-18T16:46:04.000+05:30
show error message when user email is used
diff --git a/src/actions/profile.js b/src/actions/profile.js
@@ -434,6 +434,16 @@ function verifyMemberNewEmailDone(handle, tokenV3, emailVerifyToken) {
     .then(res => ({ data: res }));
 }
 
+/**
+ * @static
+ * @desc Creates an action that toggles isEmailConflict state
+ * @param {boolean} state
+ * @return {Action}
+ */
+function updateEmailConflict(state = false) {
+  return state;
+}
+
 export default createActions({
   PROFILE: {
     LOAD_PROFILE: loadProfile,
@@ -480,5 +490,6 @@ export default createActions({
     UPDATE_PASSWORD_DONE: updatePasswordDone,
     VERIFY_MEMBER_NEW_EMAIL_INIT: verifyMemberNewEmailInit,
     VERIFY_MEMBER_NEW_EMAIL_DONE: verifyMemberNewEmailDone,
+    UPDATE_EMAIL_CONFLICT: updateEmailConflict,
   },
 });
diff --git a/src/reducers/profile.js b/src/reducers/profile.js
@@ -212,6 +212,14 @@ function onDeletePhotoDone(state, { payload, error }) {
 function onUpdateProfileDone(state, { payload, error }) {
   const newState = { ...state, updatingProfile: false };
 
+  if (payload.isEmailConflict) {
+    return {
+      ...newState,
+      isEmailConflict: true,
+      updateProfileSuccess: false,
+    };
+  }
+
   if (error) {
     logger.error('Failed to update user profile', payload);
     fireErrorMessage('ERROR: Failed to update user profile!');
@@ -455,6 +463,19 @@ function onVerifyMemberNewEmailDone(state, { payload, error }) {
   };
 }
 
+/**
+ * Handles UPDATE_EMAIL_CONFLICT action
+ * @param {Object} state
+ * @param {Object} action Payload will be a boolean value
+ * @return {Object} New state
+ */
+function onUpdateEmailConflict(state, { payload }) {
+  return {
+    ...state,
+    isEmailConflict: payload,
+  };
+}
+
 /**
  * Creates a new Profile reducer with the specified initial state.
  * @param {Object} initialState Optional. Initial state.
@@ -509,6 +530,7 @@ function create(initialState) {
     [a.updatePasswordDone]: onUpdatePasswordDone,
     [a.verifyMemberNewEmailInit]: state => ({ ...state, verifyingEmail: true }),
     [a.verifyMemberNewEmailDone]: onVerifyMemberNewEmailDone,
+    [a.updateEmailConflict]: onUpdateEmailConflict,
   }, _.defaults(initialState, {
     achievements: null,
     copilot: false,
diff --git a/src/services/members.js b/src/services/members.js
@@ -204,6 +204,9 @@ class MembersService {
   async updateMemberProfile(profile) {
     const url = profile.verifyUrl ? `/members/${profile.handle}?verifyUrl=${profile.verifyUrl}` : `/members/${profile.handle}`;
     const res = await this.private.api.putJson(url, { param: profile.verifyUrl ? _.omit(profile, ['verifyUrl']) : profile });
+    if (profile.verifyUrl && res.status === 409) {
+      return Promise.resolve(Object.assign({}, profile, { isEmailConflict: true }));
+    }
     return getApiResponsePayload(res);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,9 @@ class MembersService {`
`204`	`204`	`async updateMemberProfile(profile) {`
`205`	`205`	const url = profile.verifyUrl ? `/members/${profile.handle}?verifyUrl=${profile.verifyUrl}` : `/members/${profile.handle}`;
`206`	`206`	`const res = await this.private.api.putJson(url, { param: profile.verifyUrl ? _.omit(profile, ['verifyUrl']) : profile });`
	`207`	`+ if (profile.verifyUrl && res.status === 409) {`
	`208`	`+ return Promise.resolve(Object.assign({}, profile, { isEmailConflict: true }));`
	`209`	`+ }`
`207`	`210`	`return getApiResponsePayload(res);`
`208`	`211`	`}`
`209`	`212`