Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Rocket.Chat
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RocketChat
Rocket.Chat
Commits
19ca589b
Commit
19ca589b
authored
9 years ago
by
Diego Sampaio
Browse files
Options
Downloads
Patches
Plain Diff
fix reset password - closes #1502
parent
decaf130
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
packages/rocketchat-ui/lib/accounts.coffee
+14
-15
14 additions, 15 deletions
packages/rocketchat-ui/lib/accounts.coffee
packages/rocketchat-ui/package.js
+1
-0
1 addition, 0 deletions
packages/rocketchat-ui/package.js
server/lib/accounts.coffee
+1
-1
1 addition, 1 deletion
server/lib/accounts.coffee
with
16 additions
and
16 deletions
packages/rocketchat-ui/lib/accounts.coffee
+
14
−
15
View file @
19ca589b
Meteor
.
startup
->
Accounts
.
onEmailVerificationLink
(
token
,
done
)
->
Accounts
.
verifyEmail
token
,
(
error
)
->
if
not
error
?
alert
(
t
(
'Email_verified'
))
Accounts
.
onEmailVerificationLink
(
token
,
done
)
->
Accounts
.
verifyEmail
token
,
(
error
)
->
if
not
error
?
alert
(
t
(
'Email_verified'
))
done
()
done
()
Accounts
.
onResetPasswordLink
(
token
,
done
)
->
newPassword
=
prompt
(
t
(
'New_password'
))
Accounts
.
resetPassword
token
,
newPassword
,
(
error
)
->
if
error
?
console
.
log
error
alert
(
t
(
'Error_changing_password'
))
else
alert
(
'Password_changed'
)
done
()
\ No newline at end of file
Accounts
.
onResetPasswordLink
(
token
,
done
)
->
newPassword
=
prompt
(
t
(
'New_password'
))
Accounts
.
resetPassword
token
,
newPassword
,
(
error
)
->
if
error
?
console
.
log
error
alert
(
t
(
'Error_changing_password'
))
else
alert
(
'Password_changed'
)
done
()
This diff is collapsed.
Click to expand it.
packages/rocketchat-ui/package.js
+
1
−
0
View file @
19ca589b
...
...
@@ -14,6 +14,7 @@ Package.onUse(function(api) {
api
.
versionsFrom
(
'
1.2.1
'
);
api
.
use
([
'
accounts-base
'
,
'
mongo
'
,
'
session
'
,
'
jquery
'
,
...
...
This diff is collapsed.
Click to expand it.
server/lib/accounts.coffee
+
1
−
1
View file @
19ca589b
...
...
@@ -25,7 +25,7 @@ Accounts.emailTemplates.verifyEmail.text = (user, url) ->
resetPasswordText
=
Accounts
.
emailTemplates
.
resetPassword
.
text
Accounts
.
emailTemplates
.
resetPassword
.
text
=
(
user
,
url
)
->
url
=
url
.
replace
Meteor
.
absoluteUrl
(),
Meteor
.
absoluteUrl
()
+
'login/'
verifyEmail
Text
user
,
url
resetPassword
Text
user
,
url
if
RocketChat
.
settings
.
get
'Accounts_Enrollment_Email'
Accounts
.
emailTemplates
.
enrollAccount
.
text
=
(
user
,
url
)
->
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment