Skip to content

Commit 63981a0

Browse files
committed
refactor: Log deprecation warning for setUserPassword method and update client-side usage to /v1/users.updateOwnBasicInfo endpoint
1 parent d655e7f commit 63981a0

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

apps/meteor/server/methods/setUserPassword.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { Meteor } from 'meteor/meteor';
66
import type { UpdateResult } from 'mongodb';
77

88
import { passwordPolicy } from '../../app/lib/server';
9+
import { methodDeprecationLogger } from '../../app/lib/server/lib/deprecationWarningLogger';
910
import { compareUserPassword } from '../lib/compareUserPassword';
1011

1112
declare module '@rocket.chat/ddp-client' {
@@ -17,6 +18,7 @@ declare module '@rocket.chat/ddp-client' {
1718

1819
Meteor.methods<ServerMethods>({
1920
async setUserPassword(password) {
21+
methodDeprecationLogger.method('setUserPassword', '8.0.0', 'Use the endpoint /v1/users.updateOwnBasicInfo instead');
2022
check(password, String);
2123

2224
const userId = Meteor.userId();

packages/web-ui-registration/src/ResetPassword/ResetPasswordPage.tsx

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,16 @@ import { Button, FieldGroup, Field, FieldLabel, ButtonGroup, PasswordInput, Fiel
33
import { Form } from '@rocket.chat/layout';
44
import { PasswordVerifier, useValidatePassword } from '@rocket.chat/ui-client';
55
import type { TranslationKey } from '@rocket.chat/ui-contexts';
6-
import { useSetting, useRouter, useRouteParameter, useUser, useMethod, useTranslation, useLoginWithToken } from '@rocket.chat/ui-contexts';
6+
import {
7+
useSetting,
8+
useRouter,
9+
useRouteParameter,
10+
useUser,
11+
useMethod,
12+
useTranslation,
13+
useLoginWithToken,
14+
useEndpoint,
15+
} from '@rocket.chat/ui-contexts';
716
import type { ReactElement } from 'react';
817
import { useEffect, useId, useRef } from 'react';
918
import { useForm } from 'react-hook-form';
@@ -18,7 +27,7 @@ const getChangePasswordReason = ({
1827
const ResetPasswordPage = (): ReactElement => {
1928
const user = useUser();
2029
const t = useTranslation();
21-
const setUserPassword = useMethod('setUserPassword');
30+
const setBasicInfo = useEndpoint('POST', '/v1/users.updateOwnBasicInfo');
2231
const resetPassword = useMethod('resetPassword');
2332
const token = useRouteParameter('token');
2433

@@ -67,7 +76,7 @@ const ResetPasswordPage = (): ReactElement => {
6776
await loginWithToken(result.token);
6877
router.navigate('/home');
6978
} else {
70-
await setUserPassword(password);
79+
await setBasicInfo({ data: { newPassword: password } });
7180
}
7281
} catch ({ error, reason }: any) {
7382
const _error = reason ?? error;

0 commit comments

Comments
 (0)