Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Invalid Code message for password protected channel #8491

Merged
merged 1 commit into from
Oct 15, 2017

Conversation

rodrigok
Copy link
Member

@rodrigok rodrigok commented Oct 14, 2017

@RocketChat/core

Closes #6106

  • Fix: Room preview not opening on first click or redirecting to home on reload
  • Fix: Console errors when room is in preview mode but code is trying to access the input
  • Fix: Some locations uses the old label Code
  • Fix: Password input not showing when room is protected

@rodrigok rodrigok added this to the 0.59.0-rc.14 milestone Oct 14, 2017
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-8491 October 14, 2017 20:08 Inactive
@@ -18,7 +18,7 @@ Meteor.methods({
}

if ((room.joinCodeRequired === true) && (code !== room.joinCode) && !RocketChat.authz.hasPermission(Meteor.userId(), 'join-without-join-code')) {
throw new Meteor.Error('error-code-invalid', 'Invalid Code', { method: 'joinRoom' });
throw new Meteor.Error('error-code-invalid', 'Invalid Password', { method: 'joinRoom' });
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we say room password or room join code? I think password here is still just as ambiguous

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'll change to Room Password

@rodrigok
Copy link
Member Author

@geekgonecrazy Can you review again?

@rodrigok rodrigok merged commit 50cce81 into develop Oct 15, 2017
@rodrigok rodrigok deleted the hotfix/join-code branch October 15, 2017 00:39
rodrigok added a commit that referenced this pull request Oct 17, 2017
[FIX] Invalid Code message for password protected channel
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Invalid Code message for password protected channel
3 participants