Fixed tabs and Language support

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

settings/src/.jshintrc

@@ -1,3 +1,3 @@
 {
-    "esversion": 6
+	"esversion": 6
 }

settings/src/components/userList.vue

@@ -231,7 +231,7 @@ export default {
 			// revert form to original state
 			Object.assign(this.newUser, this.$options.data.call(this).newUser);
 			this.loading = false;
-        },
+		},
 		createUser() {
 			this.loading = true;
 			this.$store.dispatch('addUser', {

settings/src/components/userList/userRow.vue

@@ -343,7 +343,7 @@ export default {
 			let userid = this.user.id;
 			let gid = group.id;
 			return this.$store.dispatch('addUserGroup', {userid, gid})
-					.then(() => this.loading.groups = false);
+				.then(() => this.loading.groups = false);
 		},
 
 		/**
@@ -357,7 +357,7 @@ export default {
 			let userid = this.user.id;
 			let gid = group.id;
 			return this.$store.dispatch('removeUserGroup', {userid, gid})
-					.then(() => this.loading.groups = false);
+				.then(() => this.loading.groups = false);
 		},
 
 		/**
@@ -371,7 +371,7 @@ export default {
 			let userid = this.user.id;
 			let gid = group.id;
 			return this.$store.dispatch('addUserSubAdmin', {userid, gid})
-					.then(() => this.loading.subadmins = false);
+				.then(() => this.loading.subadmins = false);
 		},
 
 		/**
@@ -385,12 +385,11 @@ export default {
 			let userid = this.user.id;
 			let gid = group.id;
 			return this.$store.dispatch('removeUserSubAdmin', {userid, gid})
-					.then(() => this.loading.subadmins = false);
+				.then(() => this.loading.subadmins = false);
 		},
 
-
 		/**
-		 * Validate quota string to make sure it's a valid human file size
+		 * Dispatch quota set request
 		 * 
 		 * @param {string|Object} quota Quota in readable format '5 GB' or Object {id: '5 GB', label: '5GB'}
 		 * @returns {string}
@@ -407,24 +406,6 @@ export default {
 			return quota;
 		},
 
-
-		/**
-		 * Validate quota string to make sure it's a valid human file size
-		 * 
-		 * @param {string|Object} quota Quota in readable format '5 GB' or Object {id: '5 GB', label: '5GB'}
-		 * @returns {string}
-		 */
-		setUserLanguage(lang) {
-			this.loading.languages = true;
-			// ensure we only send the preset id
-			this.$store.dispatch('setUserData', {
-				userid: this.user.id, 
-				key: 'language',
-				value: lang.code
-			}).then(() => this.loading.languages = false);
-			return lang;
-		},
-
 		/**
 		 * Validate quota string to make sure it's a valid human file size
 		 * 
@@ -442,6 +423,23 @@ export default {
 			}
 			// if no valid doo not change
 			return false;
+		},
+
+		/**
+		 * Dispatch language set request
+		 * 
+		 * @param {Object} lang language object {code:'en', name:'English'}
+		 * @returns {Object}
+		 */
+		setUserLanguage(lang) {
+			this.loading.languages = true;
+			// ensure we only send the preset id
+			this.$store.dispatch('setUserData', {
+				userid: this.user.id, 
+				key: 'language',
+				value: lang.code
+			}).then(() => this.loading.languages = false);
+			return lang;
 		}
 	}
 }

settings/src/main.js

@@ -12,9 +12,9 @@ Vue.prototype.OC = OC;
 Vue.prototype.oc_userconfig = oc_userconfig;
 
 const app = new Vue({
-    router,
-    store,
-    render: h => h(App)
+	router,
+	store,
+	render: h => h(App)
 }).$mount('#content');
 
 export { app, router, store };

settings/src/router.js

@@ -14,10 +14,10 @@ Vue.use(Router);
  */
 
 export default new Router({
-    mode: 'history',
-    base: window.location.pathName,
-    routes: [{
-        path: '/settings/users',
-        component: Users
-    }]
+	mode: 'history',
+	base: window.location.pathName,
+	routes: [{
+		path: '/settings/users',
+		component: Users
+	}]
 });

settings/src/store/api.js

@@ -4,47 +4,94 @@ const requestToken = document.getElementsByTagName('head')[0].getAttribute('data
 const tokenHeaders = { headers: { requesttoken: requestToken } };
 
 const sanitize = function(url) {
-    return url.replace(/\/$/, ''); // Remove last slash of url
-}
+	return url.replace(/\/$/, ''); // Remove last slash of url
+};
 
 export default {
-    requireAdmin() {
-        return new Promise(function(resolve, reject) {
-            setTimeout(reject, 5000); // automatically reject 5s if not ok
-            function waitForpassword() {
-                if (OC.PasswordConfirmation.requiresPasswordConfirmation()) {
-                    setTimeout(waitForpassword, 500);
-                    return;
-                }
-                resolve();
-            }
-            waitForpassword();
-            OC.PasswordConfirmation.requirePasswordConfirmation();
-        }).catch((error) => console.log('Required password not entered'));
-    },
-    get(url) {
-        return axios.get(sanitize(url), tokenHeaders)
-            .then((response) => Promise.resolve(response))
-            .catch((error) => Promise.reject(error));
-    },
-    post(url, data) {
-        return axios.post(sanitize(url), data, tokenHeaders)
-            .then((response) => Promise.resolve(response))
-            .catch((error) => Promise.reject(error));
-    },
-    patch(url, data) {
-        return axios.patch(sanitize(url), data, tokenHeaders)
-            .then((response) => Promise.resolve(response))
-            .catch((error) => Promise.reject(error));
-    },
-    put(url, data) {
-        return axios.put(sanitize(url), data, tokenHeaders)
-            .then((response) => Promise.resolve(response))
-            .catch((error) => Promise.reject(error));
-    },
-    delete(url, data) {
-        return axios.delete(sanitize(url), { data: data, headers: tokenHeaders.headers })
-            .then((response) => Promise.resolve(response))
-            .catch((error) => Promise.reject(error));
-    }
+
+	/**
+	 * This Promise is used to chain a request that require an admin password confirmation
+	 * Since chaining Promise have a very precise behavior concerning catch and then,
+	 * you'll need to be careful when using it.
+	 * e.g
+	 * // store
+	 * 	action(context) {
+	 *		return api.requireAdmin().then((response) => {
+	 *			return api.get('url')
+	 *				.then((response) => {API success})
+	 *				.catch((error) => {API failure});
+	 *		}).catch((error) => {requireAdmin failure});
+	 *	}
+	 * // vue
+	 *	this.$store.dispatch('action').then(() => {always executed})
+	 *
+	 * Since Promise.then().catch().then() will always execute the last then
+	 * this.$store.dispatch('action').then will always be executed
+	 * 
+	 * If you want requireAdmin failure to also catch the API request failure
+	 * you will need to throw a new error in the api.get.catch()
+	 * 
+	 * e.g
+	 *	api.requireAdmin().then((response) => {
+	 *		api.get('url')
+	 *			.then((response) => {API success})
+	 *			.catch((error) => {throw error;});
+	 *	}).catch((error) => {requireAdmin OR API failure});
+	 */
+	requireAdmin() {
+		return new Promise(function(resolve, reject) {
+			// TODO: migrate the OC.dialog to Vue and avoid this mess
+			// wait for password confirmation
+			let passwordTimeout;
+			let waitForpassword = function() {
+				if (OC.PasswordConfirmation.requiresPasswordConfirmation()) {
+					passwordTimeout = setTimeout(waitForpassword, 500);
+					return;
+				}
+				clearTimeout(passwordTimeout);
+				clearTimeout(promiseTimeout);
+				resolve();
+			};
+
+			// automatically reject after 5s if not resolved
+			let promiseTimeout = setTimeout(() => {
+				clearTimeout(passwordTimeout);
+				// close dialog
+				if (document.getElementsByClassName('oc-dialog-close').length>0) {
+					document.getElementsByClassName('oc-dialog-close')[0].click();
+				}
+				OC.Notification.showTemporary(t('settings', 'You did not enter the password in time'));
+				reject('Password request cancelled');
+			}, 7000); 
+
+			// request password
+			OC.PasswordConfirmation.requirePasswordConfirmation();
+			waitForpassword();
+		});
+	},
+	get(url) {
+		return axios.get(sanitize(url), tokenHeaders)
+			.then((response) => Promise.resolve(response))
+			.catch((error) => Promise.reject(error));
+	},
+	post(url, data) {
+		return axios.post(sanitize(url), data, tokenHeaders)
+			.then((response) => Promise.resolve(response))
+			.catch((error) => Promise.reject(error));
+	},
+	patch(url, data) {
+		return axios.patch(sanitize(url), data, tokenHeaders)
+			.then((response) => Promise.resolve(response))
+			.catch((error) => Promise.reject(error));
+	},
+	put(url, data) {
+		return axios.put(sanitize(url), data, tokenHeaders)
+			.then((response) => Promise.resolve(response))
+			.catch((error) => Promise.reject(error));
+	},
+	delete(url, data) {
+		return axios.delete(sanitize(url), { data: data, headers: tokenHeaders.headers })
+			.then((response) => Promise.resolve(response))
+			.catch((error) => Promise.reject(error));
+	}
 };

settings/src/store/users.js

@@ -1,420 +1,420 @@
 import api from './api';
 
 const orderGroups = function(groups, orderBy) {
-    /* const SORT_USERCOUNT = 1;
-     * const SORT_GROUPNAME = 2;
-     * https://github.com/nextcloud/server/blob/208e38e84e1a07a49699aa90dc5b7272d24489f0/lib/private/Group/MetaData.php#L34
-     */
-    if (orderBy === 1) {
-        return groups.sort((a, b) => a.usercount < b.usercount);
-    } else {
-        return groups.sort((a, b) => a.name.localeCompare(b.name));
-    }
+	/* const SORT_USERCOUNT = 1;
+	 * const SORT_GROUPNAME = 2;
+	 * https://github.com/nextcloud/server/blob/208e38e84e1a07a49699aa90dc5b7272d24489f0/lib/private/Group/MetaData.php#L34
+	 */
+	if (orderBy === 1) {
+		return groups.sort((a, b) => a.usercount < b.usercount);
+	} else {
+		return groups.sort((a, b) => a.name.localeCompare(b.name));
+	}
 }
 
 const state = {
-    users: [],
-    groups: [],
-    orderBy: 1,
-    minPasswordLength: 0,
-    usersOffset: 0,
-    usersLimit: 25,
-    userCount: 0
+	users: [],
+	groups: [],
+	orderBy: 1,
+	minPasswordLength: 0,
+	usersOffset: 0,
+	usersLimit: 25,
+	userCount: 0
 };
 
 const mutations = {
-    appendUsers(state, usersObj) {
-        // convert obj to array
-        let users = state.users.concat(Object.keys(usersObj).map(userid => usersObj[userid]));
-        state.usersOffset += state.usersLimit;
-        state.users = users;
-    },
-    setPasswordPolicyMinLength(state, length) {
-        state.minPasswordLength = length!=='' ? length : 0;
-    },
-    initGroups(state, {groups, orderBy, userCount}) {
-        state.groups = groups;
-        state.orderBy = orderBy;
-        state.userCount = userCount;
-        state.groups = orderGroups(state.groups, state.orderBy);
-    },
-    addGroup(state, groupid) {
-        try {
-            state.groups.push({
-                id: groupid,
-                name: groupid,
-                usercount: 0 // user will be added after the creation
-            });
-            state.groups = orderGroups(state.groups, state.orderBy);
-        } catch (e) {
-            console.log('Can\'t create group', e);
-        }
-    },
-    addUserGroup(state, { userid, gid }) {
-        // this should not be needed as it would means the user contains a group
-        // the server database doesn't have.
-        let group = state.groups.find(groupSearch => groupSearch.id == gid);
-        if (group) {
-            group.usercount++; // increase count
-        }
-        let groups = state.users.find(user => user.id == userid).groups;
-        groups.push(gid);
-        state.groups = orderGroups(state.groups, state.orderBy);
-    },
-    removeUserGroup(state, { userid, gid }) {
-        // this should not be needed as it would means the user contains a group
-        // the server database doesn't have.
-        let group = state.groups.find(groupSearch => groupSearch.id == gid);
-        if (group) {
-            group.usercount--; // lower count
-        }
-        let groups = state.users.find(user => user.id == userid).groups;
-        groups.splice(groups.indexOf(gid),1);
-        state.groups = orderGroups(state.groups, state.orderBy);
-    },
-    addUserSubAdmin(state, { userid, gid }) {
-        let groups = state.users.find(user => user.id == userid).subadmin;
-        groups.push(gid);
-    },
-    removeUserSubAdmin(state, { userid, gid }) {
-        let groups = state.users.find(user => user.id == userid).subadmin;
-        groups.splice(groups.indexOf(gid),1);
-    },
-    deleteUser(state, userid) {
-        let userIndex = state.users.findIndex(user => user.id == userid);
-        state.users.splice(userIndex, 1);
-    },
-    addUserData(state, response) {
-        state.users.push(response.data.ocs.data);
-    },
-    enableDisableUser(state, { userid, enabled }) {
-        state.users.find(user => user.id == userid).enabled = enabled;
-        // increment or not
-        state.groups.find(group => group.id == '_disabled').usercount += enabled ? -1 : 1;
-        state.userCount += enabled ? 1 : -1;
-        console.log(enabled);
-    },
-    setUserData(state, { userid, key, value }) {
-        if (key === 'quota') {
-            let humanValue = OC.Util.computerFileSize(value);
-            state.users.find(user => user.id == userid)[key][key] = humanValue?humanValue:value;
-        } else {
-            state.users.find(user => user.id == userid)[key] = value;
-        }
-    },
+	appendUsers(state, usersObj) {
+		// convert obj to array
+		let users = state.users.concat(Object.keys(usersObj).map(userid => usersObj[userid]));
+		state.usersOffset += state.usersLimit;
+		state.users = users;
+	},
+	setPasswordPolicyMinLength(state, length) {
+		state.minPasswordLength = length!=='' ? length : 0;
+	},
+	initGroups(state, {groups, orderBy, userCount}) {
+		state.groups = groups;
+		state.orderBy = orderBy;
+		state.userCount = userCount;
+		state.groups = orderGroups(state.groups, state.orderBy);
+	},
+	addGroup(state, groupid) {
+		try {
+			state.groups.push({
+				id: groupid,
+				name: groupid,
+				usercount: 0 // user will be added after the creation
+			});
+			state.groups = orderGroups(state.groups, state.orderBy);
+		} catch (e) {
+			console.log('Can\'t create group', e);
+		}
+	},
+	addUserGroup(state, { userid, gid }) {
+		// this should not be needed as it would means the user contains a group
+		// the server database doesn't have.
+		let group = state.groups.find(groupSearch => groupSearch.id == gid);
+		if (group) {
+			group.usercount++; // increase count
+		}
+		let groups = state.users.find(user => user.id == userid).groups;
+		groups.push(gid);
+		state.groups = orderGroups(state.groups, state.orderBy);
+	},
+	removeUserGroup(state, { userid, gid }) {
+		// this should not be needed as it would means the user contains a group
+		// the server database doesn't have.
+		let group = state.groups.find(groupSearch => groupSearch.id == gid);
+		if (group) {
+			group.usercount--; // lower count
+		}
+		let groups = state.users.find(user => user.id == userid).groups;
+		groups.splice(groups.indexOf(gid),1);
+		state.groups = orderGroups(state.groups, state.orderBy);
+	},
+	addUserSubAdmin(state, { userid, gid }) {
+		let groups = state.users.find(user => user.id == userid).subadmin;
+		groups.push(gid);
+	},
+	removeUserSubAdmin(state, { userid, gid }) {
+		let groups = state.users.find(user => user.id == userid).subadmin;
+		groups.splice(groups.indexOf(gid),1);
+	},
+	deleteUser(state, userid) {
+		let userIndex = state.users.findIndex(user => user.id == userid);
+		state.users.splice(userIndex, 1);
+	},
+	addUserData(state, response) {
+		state.users.push(response.data.ocs.data);
+	},
+	enableDisableUser(state, { userid, enabled }) {
+		state.users.find(user => user.id == userid).enabled = enabled;
+		// increment or not
+		state.groups.find(group => group.id == '_disabled').usercount += enabled ? -1 : 1;
+		state.userCount += enabled ? 1 : -1;
+		console.log(enabled);
+	},
+	setUserData(state, { userid, key, value }) {
+		if (key === 'quota') {
+			let humanValue = OC.Util.computerFileSize(value);
+			state.users.find(user => user.id == userid)[key][key] = humanValue?humanValue:value;
+		} else {
+			state.users.find(user => user.id == userid)[key] = value;
+		}
+	},
 
-    /**
-     * Reset users list
-     */
-    resetUsers(state) {
-        state.users = [];
-        state.usersOffset = 0;
-    }
+	/**
+	 * Reset users list
+	 */
+	resetUsers(state) {
+		state.users = [];
+		state.usersOffset = 0;
+	}
 };
 
 const getters = {
-    getUsers(state) {
-        return state.users;
-    },
-    getGroups(state) {
-        return state.groups;
-    },
-    getPasswordPolicyMinLength(state) {
-        return state.minPasswordLength;
-    },
-    getUsersOffset(state) {
-        return state.usersOffset;
-    },
-    getUsersLimit(state) {
-        return state.usersLimit;
-    },
-    getUserCount(state) {
-        return state.userCount;
-    }
+	getUsers(state) {
+		return state.users;
+	},
+	getGroups(state) {
+		return state.groups;
+	},
+	getPasswordPolicyMinLength(state) {
+		return state.minPasswordLength;
+	},
+	getUsersOffset(state) {
+		return state.usersOffset;
+	},
+	getUsersLimit(state) {
+		return state.usersLimit;
+	},
+	getUserCount(state) {
+		return state.userCount;
+	}
 };
 
 const actions = {
 
-    /**
-     * Get all users with full details
-     * 
-     * @param {Object} context
-     * @param {Object} options
-     * @param {int} options.offset List offset to request
-     * @param {int} options.limit List number to return from offset
-     * @param {string} options.search Search amongst users
-     * @param {string} options.group Get users from group
-     * @returns {Promise}
-     */
-    getUsers(context, { offset, limit, search, group }) {
-        search = typeof search === 'string' ? search : '';
-        group = typeof group === 'string' ? group : '';
-        if (group !== '') {
-            return api.get(OC.linkToOCS(`cloud/groups/${group}/users/details?offset=${offset}&limit=${limit}&search=${search}`, 2))
-            .then((response) => {
-                if (Object.keys(response.data.ocs.data.users).length > 0) {
-                    context.commit('appendUsers', response.data.ocs.data.users);
-                    return true;
-                }
-                return false;
-            })
-            .catch((error) => context.commit('API_FAILURE', error));
-        }
+	/**
+	 * Get all users with full details
+	 * 
+	 * @param {Object} context
+	 * @param {Object} options
+	 * @param {int} options.offset List offset to request
+	 * @param {int} options.limit List number to return from offset
+	 * @param {string} options.search Search amongst users
+	 * @param {string} options.group Get users from group
+	 * @returns {Promise}
+	 */
+	getUsers(context, { offset, limit, search, group }) {
+		search = typeof search === 'string' ? search : '';
+		group = typeof group === 'string' ? group : '';
+		if (group !== '') {
+			return api.get(OC.linkToOCS(`cloud/groups/${group}/users/details?offset=${offset}&limit=${limit}&search=${search}`, 2))
+			.then((response) => {
+				if (Object.keys(response.data.ocs.data.users).length > 0) {
+					context.commit('appendUsers', response.data.ocs.data.users);
+					return true;
+				}
+				return false;
+			})
+			.catch((error) => context.commit('API_FAILURE', error));
+		}
 
-        return api.get(OC.linkToOCS(`cloud/users/details?offset=${offset}&limit=${limit}&search=${search}`, 2))
-            .then((response) => {
-                if (Object.keys(response.data.ocs.data.users).length > 0) {
-                    context.commit('appendUsers', response.data.ocs.data.users);
-                    return true;
-                }
-                return false;
-            })
-            .catch((error) => context.commit('API_FAILURE', error));
-    },
+		return api.get(OC.linkToOCS(`cloud/users/details?offset=${offset}&limit=${limit}&search=${search}`, 2))
+			.then((response) => {
+				if (Object.keys(response.data.ocs.data.users).length > 0) {
+					context.commit('appendUsers', response.data.ocs.data.users);
+					return true;
+				}
+				return false;
+			})
+			.catch((error) => context.commit('API_FAILURE', error));
+	},
 
-    /**
-     * Get all users with full details
-     * 
-     * @param {Object} context
-     * @param {Object} options
-     * @param {int} options.offset List offset to request
-     * @param {int} options.limit List number to return from offset
-     * @returns {Promise}
-     */
-    getUsersFromList(context, { offset, limit, search }) {
-        search = typeof search === 'string' ? search : '';
-        return api.get(OC.linkToOCS(`cloud/users/details?offset=${offset}&limit=${limit}&search=${search}`, 2))
-            .then((response) => {
-                if (Object.keys(response.data.ocs.data.users).length > 0) {
-                    context.commit('appendUsers', response.data.ocs.data.users);
-                    return true;
-                }
-                return false;
-            })
-            .catch((error) => context.commit('API_FAILURE', error));
-    },
+	/**
+	 * Get all users with full details
+	 * 
+	 * @param {Object} context
+	 * @param {Object} options
+	 * @param {int} options.offset List offset to request
+	 * @param {int} options.limit List number to return from offset
+	 * @returns {Promise}
+	 */
+	getUsersFromList(context, { offset, limit, search }) {
+		search = typeof search === 'string' ? search : '';
+		return api.get(OC.linkToOCS(`cloud/users/details?offset=${offset}&limit=${limit}&search=${search}`, 2))
+			.then((response) => {
+				if (Object.keys(response.data.ocs.data.users).length > 0) {
+					context.commit('appendUsers', response.data.ocs.data.users);
+					return true;
+				}
+				return false;
+			})
+			.catch((error) => context.commit('API_FAILURE', error));
+	},
 
-    /**
-     * Get all users with full details from a groupid
-     * 
-     * @param {Object} context
-     * @param {Object} options
-     * @param {int} options.offset List offset to request
-     * @param {int} options.limit List number to return from offset
-     * @returns {Promise}
-     */
-    getUsersFromGroup(context, { groupid, offset, limit }) {
-        return api.get(OC.linkToOCS(`cloud/users/${groupid}/details?offset=${offset}&limit=${limit}`, 2))
-            .then((response) => context.commit('getUsersFromList', response.data.ocs.data.users))
-            .catch((error) => context.commit('API_FAILURE', error));
-    },
-    
+	/**
+	 * Get all users with full details from a groupid
+	 * 
+	 * @param {Object} context
+	 * @param {Object} options
+	 * @param {int} options.offset List offset to request
+	 * @param {int} options.limit List number to return from offset
+	 * @returns {Promise}
+	 */
+	getUsersFromGroup(context, { groupid, offset, limit }) {
+		return api.get(OC.linkToOCS(`cloud/users/${groupid}/details?offset=${offset}&limit=${limit}`, 2))
+			.then((response) => context.commit('getUsersFromList', response.data.ocs.data.users))
+			.catch((error) => context.commit('API_FAILURE', error));
+	},
+	
 
-    getPasswordPolicyMinLength(context) {
-        return api.get(OC.linkToOCS('apps/provisioning_api/api/v1/config/apps/password_policy/minLength', 2))
-            .then((response) => context.commit('setPasswordPolicyMinLength', response.data.ocs.data.data))
-            .catch((error) => context.commit('API_FAILURE', error));
-    },
+	getPasswordPolicyMinLength(context) {
+		return api.get(OC.linkToOCS('apps/provisioning_api/api/v1/config/apps/password_policy/minLength', 2))
+			.then((response) => context.commit('setPasswordPolicyMinLength', response.data.ocs.data.data))
+			.catch((error) => context.commit('API_FAILURE', error));
+	},
 
-    /**
-     * Add group
-     * 
-     * @param {Object} context
-     * @param {string} gid Group id
-     * @returns {Promise}
-     */
-    addGroup(context, gid) {
-        return api.requireAdmin().then((response) => {
-            return api.post(OC.linkToOCS(`cloud/groups`, 2), {groupid: gid})
-                .then((response) => context.commit('addGroup', gid))
-                .catch((error) => context.commit('API_FAILURE', error));
-        });
-    },
+	/**
+	 * Add group
+	 * 
+	 * @param {Object} context
+	 * @param {string} gid Group id
+	 * @returns {Promise}
+	 */
+	addGroup(context, gid) {
+		return api.requireAdmin().then((response) => {
+			return api.post(OC.linkToOCS(`cloud/groups`, 2), {groupid: gid})
+				.then((response) => context.commit('addGroup', gid))
+				.catch((error) => {throw error;});
+		}).catch((error) => context.commit('API_FAILURE', { userid, error }));
+	},
 
-    /**
-     * Remove group
-     * 
-     * @param {Object} context
-     * @param {string} gid Group id
-     * @returns {Promise}
-     */
-    removeGroup(context, gid) {
-        return api.requireAdmin().then((response) => {
-            return api.post(OC.linkToOCS(`cloud/groups`, 2), {groupid: gid})
-                .then((response) => context.commit('removeGroup', gid))
-                .catch((error) => context.commit('API_FAILURE', error));
-        });
-    },
+	/**
+	 * Remove group
+	 * 
+	 * @param {Object} context
+	 * @param {string} gid Group id
+	 * @returns {Promise}
+	 */
+	removeGroup(context, gid) {
+		return api.requireAdmin().then((response) => {
+			return api.post(OC.linkToOCS(`cloud/groups`, 2), {groupid: gid})
+				.then((response) => context.commit('removeGroup', gid))
+				.catch((error) => {throw error;});
+		}).catch((error) => context.commit('API_FAILURE', { userid, error }));
+	},
 
-    /**
-     * Add user to group
-     * 
-     * @param {Object} context
-     * @param {Object} options
-     * @param {string} options.userid User id
-     * @param {string} options.gid Group id
-     * @returns {Promise}
-     */
-    addUserGroup(context, { userid, gid }) {
-        return api.requireAdmin().then((response) => {
-            return api.post(OC.linkToOCS(`cloud/users/${userid}/groups`, 2), { groupid: gid })
-                .then((response) => context.commit('addUserGroup', { userid, gid }))
-                .catch((error) => context.commit('API_FAILURE', error));
-        });
-    },
+	/**
+	 * Add user to group
+	 * 
+	 * @param {Object} context
+	 * @param {Object} options
+	 * @param {string} options.userid User id
+	 * @param {string} options.gid Group id
+	 * @returns {Promise}
+	 */
+	addUserGroup(context, { userid, gid }) {
+		return api.requireAdmin().then((response) => {
+			return api.post(OC.linkToOCS(`cloud/users/${userid}/groups`, 2), { groupid: gid })
+				.then((response) => context.commit('addUserGroup', { userid, gid }))
+				.catch((error) => {throw error;});
+		}).catch((error) => context.commit('API_FAILURE', { userid, error }));
+	},
 
-    /**
-     * Remove user from group
-     * 
-     * @param {Object} context
-     * @param {Object} options
-     * @param {string} options.userid User id
-     * @param {string} options.gid Group id
-     * @returns {Promise}
-     */
-    removeUserGroup(context, { userid, gid }) {
-        return api.requireAdmin().then((response) => {
-            return api.delete(OC.linkToOCS(`cloud/users/${userid}/groups`, 2), { groupid: gid })
-                .then((response) => context.commit('removeUserGroup', { userid, gid }))
-                .catch((error) => context.commit('API_FAILURE', { userid, error }));
-        });
-    },
+	/**
+	 * Remove user from group
+	 * 
+	 * @param {Object} context
+	 * @param {Object} options
+	 * @param {string} options.userid User id
+	 * @param {string} options.gid Group id
+	 * @returns {Promise}
+	 */
+	removeUserGroup(context, { userid, gid }) {
+		return api.requireAdmin().then((response) => {
+			return api.delete(OC.linkToOCS(`cloud/users/${userid}/groups`, 2), { groupid: gid })
+				.then((response) => context.commit('removeUserGroup', { userid, gid }))
+				.catch((error) => {throw error;});
+		}).catch((error) => context.commit('API_FAILURE', { userid, error }));
+	},
 
-    /**
-     * Add user to group admin
-     * 
-     * @param {Object} context
-     * @param {Object} options
-     * @param {string} options.userid User id
-     * @param {string} options.gid Group id
-     * @returns {Promise}
-     */
-    addUserSubAdmin(context, { userid, gid }) {
-        return api.requireAdmin().then((response) => {
-            return api.post(OC.linkToOCS(`cloud/users/${userid}/subadmins`, 2),  { groupid: gid })
-                .then((response) => context.commit('addUserSubAdmin', { userid, gid }))
-                .catch((error) => context.commit('API_FAILURE', error));
-        });
-    },
+	/**
+	 * Add user to group admin
+	 * 
+	 * @param {Object} context
+	 * @param {Object} options
+	 * @param {string} options.userid User id
+	 * @param {string} options.gid Group id
+	 * @returns {Promise}
+	 */
+	addUserSubAdmin(context, { userid, gid }) {
+		return api.requireAdmin().then((response) => {
+			return api.post(OC.linkToOCS(`cloud/users/${userid}/subadmins`, 2),  { groupid: gid })
+				.then((response) => context.commit('addUserSubAdmin', { userid, gid }))
+				.catch((error) => {throw error;});
+		}).catch((error) => context.commit('API_FAILURE', { userid, error }));
+	},
 
-    /**
-     * Remove user from group admin
-     * 
-     * @param {Object} context
-     * @param {Object} options
-     * @param {string} options.userid User id
-     * @param {string} options.gid Group id
-     * @returns {Promise}
-     */
-    removeUserSubAdmin(context, { userid, gid }) {
-        return api.requireAdmin().then((response) => {
-            return api.delete(OC.linkToOCS(`cloud/users/${userid}/subadmins`, 2), { groupid: gid })
-                .then((response) => context.commit('removeUserSubAdmin', { userid, gid }))
-                .catch((error) => context.commit('API_FAILURE', { userid, error }));
-        });
-    },
+	/**
+	 * Remove user from group admin
+	 * 
+	 * @param {Object} context
+	 * @param {Object} options
+	 * @param {string} options.userid User id
+	 * @param {string} options.gid Group id
+	 * @returns {Promise}
+	 */
+	removeUserSubAdmin(context, { userid, gid }) {
+		return api.requireAdmin().then((response) => {
+			return api.delete(OC.linkToOCS(`cloud/users/${userid}/subadmins`, 2), { groupid: gid })
+				.then((response) => context.commit('removeUserSubAdmin', { userid, gid }))
+				.catch((error) => {throw error;});
+		}).catch((error) => context.commit('API_FAILURE', { userid, error }));
+	},
 
-    /**
-     * Delete a user
-     * 
-     * @param {Object} context
-     * @param {string} userid User id 
-     * @returns {Promise}
-     */
-    deleteUser(context, { userid }) {
-        return api.requireAdmin().then((response) => {
-            return api.delete(OC.linkToOCS(`cloud/users/${userid}`, 2))
-                .then((response) => context.commit('deleteUser', userid))
-                .catch((error) => context.commit('API_FAILURE', { userid, error }));
-        });
-    },
+	/**
+	 * Delete a user
+	 * 
+	 * @param {Object} context
+	 * @param {string} userid User id 
+	 * @returns {Promise}
+	 */
+	deleteUser(context, { userid }) {
+		return api.requireAdmin().then((response) => {
+			return api.delete(OC.linkToOCS(`cloud/users/${userid}`, 2))
+				.then((response) => context.commit('deleteUser', userid))
+				.catch((error) => {throw error;});
+		}).catch((error) => context.commit('API_FAILURE', { userid, error }));
+	},
 
-    /**
-     * Add a user
-     * 
-     * @param {Object} context
-     * @param {Object} options
-     * @param {string} options.userid User id
-     * @param {string} options.password User password 
-     * @param {string} options.email User email
-     * @param {string} options.groups User groups
-     * @param {string} options.subadmin User subadmin groups
-     * @param {string} options.quota User email
-     * @returns {Promise}
-     */
-    addUser({context, dispatch}, { userid, password, email, groups, subadmin, quota }) {
-        console.log(subadmin, quota);
-        return api.requireAdmin().then((response) => {
-            return api.post(OC.linkToOCS(`cloud/users`, 2), { userid, password, email, groups, subadmin, quota })
-                .then((response) =>  {
-                    //let quotaDis = dispatch('setUserData', { userid, key: 'quota', value:quota });
-                    //let subadminDis = dispatch('addUserSubAdmin', userid);
-                })
-                .catch((error) => context.commit('API_FAILURE', { userid, error }));
-        });
-    },
+	/**
+	 * Add a user
+	 * 
+	 * @param {Object} context
+	 * @param {Object} options
+	 * @param {string} options.userid User id
+	 * @param {string} options.password User password 
+	 * @param {string} options.email User email
+	 * @param {string} options.groups User groups
+	 * @param {string} options.subadmin User subadmin groups
+	 * @param {string} options.quota User email
+	 * @returns {Promise}
+	 */
+	addUser({context, dispatch}, { userid, password, email, groups, subadmin, quota }) {
+		console.log(subadmin, quota);
+		return api.requireAdmin().then((response) => {
+			return api.post(OC.linkToOCS(`cloud/users`, 2), { userid, password, email, groups, subadmin, quota })
+				.then((response) =>  {
+					//let quotaDis = dispatch('setUserData', { userid, key: 'quota', value:quota });
+					//let subadminDis = dispatch('addUserSubAdmin', userid);
+				})
+				.catch((error) => {throw error;});
+		}).catch((error) => context.commit('API_FAILURE', { userid, error }));
+	},
 
-    /**
-     * Get user data and commit addition
-     * 
-     * @param {Object} context
-     * @param {string} userid User id 
-     * @returns {Promise}
-     */
-    addUserData(context, userid) {
-        return api.requireAdmin().then((response) => {
-            return api.get(OC.linkToOCS(`cloud/users/${userid}`, 2))
-                .then((response) => context.commit('addUserData', response))
-                .catch((error) => context.commit('API_FAILURE', { userid, error }));
-        });
-    },
+	/**
+	 * Get user data and commit addition
+	 * 
+	 * @param {Object} context
+	 * @param {string} userid User id 
+	 * @returns {Promise}
+	 */
+	addUserData(context, userid) {
+		return api.requireAdmin().then((response) => {
+			return api.get(OC.linkToOCS(`cloud/users/${userid}`, 2))
+				.then((response) => context.commit('addUserData', response))
+				.catch((error) => {throw error;});
+		}).catch((error) => context.commit('API_FAILURE', { userid, error }));
+	},
 
-    /** Enable or disable user 
-     * 
-     * @param {Object} context
-     * @param {Object} options
-     * @param {string} options.userid User id
-     * @param {boolean} options.enabled User enablement status
-     * @returns {Promise}
-     */
-    enableDisableUser(context, { userid, enabled = true }) {
-        let userStatus = enabled ? 'enable' : 'disable';
-        return api.requireAdmin().then((response) => {
-            return api.put(OC.linkToOCS(`cloud/users/${userid}/${userStatus}`, 2))
-                .then((response) => context.commit('enableDisableUser', { userid, enabled }))
-                .catch((error) => context.commit('API_FAILURE', { userid, error }));
-        });
-    },
+	/** Enable or disable user 
+	 * 
+	 * @param {Object} context
+	 * @param {Object} options
+	 * @param {string} options.userid User id
+	 * @param {boolean} options.enabled User enablement status
+	 * @returns {Promise}
+	 */
+	enableDisableUser(context, { userid, enabled = true }) {
+		let userStatus = enabled ? 'enable' : 'disable';
+		return api.requireAdmin().then((response) => {
+			return api.put(OC.linkToOCS(`cloud/users/${userid}/${userStatus}`, 2))
+				.then((response) => context.commit('enableDisableUser', { userid, enabled }))
+				.catch((error) => {throw error;});
+		}).catch((error) => context.commit('API_FAILURE', { userid, error }));
+	},
 
-    /**
-     * Edit user data
-     * 
-     * @param {Object} context 
-     * @param {Object} options
-     * @param {string} options.userid User id
-     * @param {string} options.key User field to edit
-     * @param {string} options.value Value of the change
-     * @returns {Promise}
-     */
-    setUserData(context, { userid, key, value }) {
-        let allowedEmpty = ['email', 'displayname'];
-        if (['email', 'language', 'quota', 'displayname', 'password'].indexOf(key) !== -1) {
-            // We allow empty email or displayname
-            if (typeof value === 'string' &&
-                (
-                    (allowedEmpty.indexOf(key) === -1 && value.length > 0) ||
-                    allowedEmpty.indexOf(key) !== -1
-                )
-            ) {
-                return api.requireAdmin().then((response) => {
-                    return api.put(OC.linkToOCS(`cloud/users/${userid}`, 2), { key: key, value: value })
-                        .then((response) => context.commit('setUserData', { userid, key, value }))
-                        .catch((error) => context.commit('API_FAILURE', { userid, error }));
-                });
-            }
-        }
-        return Promise.reject(new Error('Invalid request data'));
-    }
+	/**
+	 * Edit user data
+	 * 
+	 * @param {Object} context 
+	 * @param {Object} options
+	 * @param {string} options.userid User id
+	 * @param {string} options.key User field to edit
+	 * @param {string} options.value Value of the change
+	 * @returns {Promise}
+	 */
+	setUserData(context, { userid, key, value }) {
+		let allowedEmpty = ['email', 'displayname'];
+		if (['email', 'language', 'quota', 'displayname', 'password'].indexOf(key) !== -1) {
+			// We allow empty email or displayname
+			if (typeof value === 'string' &&
+				(
+					(allowedEmpty.indexOf(key) === -1 && value.length > 0) ||
+					allowedEmpty.indexOf(key) !== -1
+				)
+			) {
+				return api.requireAdmin().then((response) => {
+					return api.put(OC.linkToOCS(`cloud/users/${userid}`, 2), { key: key, value: value })
+						.then((response) => context.commit('setUserData', { userid, key, value }))
+						.catch((error) => {throw error;});
+				}).catch((error) => context.commit('API_FAILURE', { userid, error }));
+			}
+		}
+		return Promise.reject(new Error('Invalid request data'));
+	}
 };
 
 export default { state, mutations, getters, actions };

settings/src/views/Users.vue

@@ -138,7 +138,7 @@ export default {
 
 			// Adjust data
 			let adminGroup = groups.find(group => group.id == 'admin');
-       		let disabledGroup = groups.find(group => group.id == '_disabled');
+	   		let disabledGroup = groups.find(group => group.id == '_disabled');
 			if (adminGroup.text) {
 				adminGroup.text = t('settings', 'Admins');}			// rename admin group
 			if (disabledGroup.text) {