Docker/planka
Docker/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-18 20:59:44 +02:00
Code Issues Releases Activity

ref: Little change for consistency

Browse source
This commit is contained in:
Maksim Eltyshev 2022-08-09 22:31:43 +02:00
parent cf1fba9267
commit 21cbe527b0
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
client/src/sagas/core/services/users.js
View file

@ -110,17 +110,22 @@ export function* updateUserPassword(id, data) {
yield put(actions.updateUserPassword(id, data)); yield put(actions.updateUserPassword(id, data));
let user; let user;
let accessToken; let accessTokens;
try { try {
({ item: user, accessToken } = yield call(request, api.updateUserPassword, id, data)); ({ item: user, included: { accessTokens } = {} } = yield call(
request,
api.updateUserPassword,
id,
data,
));
} catch (error) { } catch (error) {
yield put(actions.updateUserPassword.failure(id, error)); yield put(actions.updateUserPassword.failure(id, error));
return; return;
} }
if (accessToken) { if (accessTokens && accessTokens[0]) {
yield call(setAccessToken, accessToken); yield call(setAccessToken, accessTokens[0]);
} }
yield put(actions.updateUserPassword.success(user)); yield put(actions.updateUserPassword.success(user));

4
server/api/controllers/users/update-password.js
View file

@ -70,8 +70,10 @@ module.exports = {
const accessToken = sails.helpers.utils.createToken(user.id, user.passwordUpdatedAt); const accessToken = sails.helpers.utils.createToken(user.id, user.passwordUpdatedAt);
return { return {
accessToken,
item: user, item: user,
included: {
accessTokens: [accessToken],
},
}; };
} }