Do not clear new user form on failure

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
nextcloud · Nov 22, 2018 · 8bbb889 · 8bbb889
1 parent 654880d
commit 8bbb889
Show file tree

Hide file tree

Showing 12 changed files with 130 additions and 47 deletions.
diff --git a/settings/js/2.js b/settings/js/2.js
diff --git a/settings/js/2.js.map b/settings/js/2.js.map
diff --git a/settings/js/4.js.map b/settings/js/4.js.map
diff --git a/settings/js/5.js b/settings/js/5.js
diff --git a/settings/js/5.js.map b/settings/js/5.js.map
diff --git a/settings/js/settings-admin-security.js.map b/settings/js/settings-admin-security.js.map
diff --git a/settings/js/settings-vue.js b/settings/js/settings-vue.js
diff --git a/settings/js/settings-vue.js.map b/settings/js/settings-vue.js.map
diff --git a/settings/package-lock.json b/settings/package-lock.json
diff --git a/settings/package.json b/settings/package.json
@@ -1,7 +1,7 @@
 {
   "name": "settings",
   "description": "Nextcloud settings",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "author": "John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>",
   "license": "AGPL3",
   "private": true,

diff --git a/settings/src/components/userList.vue b/settings/src/components/userList.vue
@@ -51,7 +51,7 @@
 				<input id="newusername" type="text" required v-model="newUser.id"
 					   :placeholder="t('settings', 'Username')" name="username"
 					   autocomplete="off" autocapitalize="none" autocorrect="off"
-					   pattern="[a-zA-Z0-9 _\.@\-']+">
+					   ref="newusername" pattern="[a-zA-Z0-9 _\.@\-']+">
 			</div>
 			<div class="displayName">
 				<input id="newdisplayname" type="text" v-model="newUser.displayName"
@@ -60,7 +60,7 @@
 			</div>
 			<div class="password">
 				<input id="newuserpassword" type="password" v-model="newUser.password"
-					   :required="newUser.mailAddress===''"
+					   :required="newUser.mailAddress===''" ref="newuserpassword"
 					   :placeholder="t('settings', 'Password')" name="password"
 					   autocomplete="new-password" autocapitalize="none" autocorrect="off"
 					   :minlength="minPasswordLength">
@@ -335,8 +335,21 @@ export default {
 				subadmin: this.newUser.subAdminsGroups.map(group => group.id),
 				quota: this.newUser.quota.id,
 				language: this.newUser.language.code,
-			}).then(() => this.resetForm())
-			.catch(() => this.loading.all = false);
+			})
+			.then(() => this.resetForm())
+			.catch((error) => {
+				this.loading.all = false;
+				if (error.response && error.response.data && error.response.data.ocs && error.response.data.ocs.meta) {
+					const statuscode = error.response.data.ocs.meta.statuscode
+					if (statuscode === 102) {
+						// wrong username
+						this.$refs.newusername.focus();	
+					} else if (statuscode === 107) {
+						// wrong password
+						this.$refs.newuserpassword.focus();	
+					}
+				}
+			});
 		},
 		setNewUserDefaultGroup(value) {
 			if (value && value.length > 0) {

diff --git a/settings/src/store/users.js b/settings/src/store/users.js
@@ -431,7 +431,10 @@ const actions = {
 			return api.post(OC.linkToOCS(`cloud/users`, 2), { userid, password, displayName, email, groups, subadmin, quota, language })
 				.then((response) => dispatch('addUserData', userid))
 				.catch((error) => {throw error;});
-		}).catch((error) => commit('API_FAILURE', { userid, error }));
+		}).catch((error) => {
+			commit('API_FAILURE', { userid, error });
+			throw error;
+		});
 	},
 
 	/**