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

Update for Dataporten closing #3580 #3608

Merged
merged 7 commits into from
Jun 22, 2016
Merged

Update for Dataporten closing #3580 #3608

merged 7 commits into from
Jun 22, 2016

Conversation

kasperrt
Copy link

@kasperrt kasperrt commented Jun 22, 2016

@RocketChat/core

Closes #3580

identity.email = identity.user.email

# Fix general 'userid' instead of 'id' from provider
if identity?.userid and not identityid
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't identityid be identity.id?

@rodrigok
Copy link
Member

Thanks by the contribution 😃

@rodrigok
Copy link
Member

LGTM

@rodrigok
Copy link
Member

@RocketChat/core I need one more review here 😸

@rodrigok rodrigok merged commit 826abc8 into RocketChat:develop Jun 22, 2016
@engelgabriel engelgabriel added this to the 0.35.0 milestone Jul 13, 2016
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.

Custom OAuth not validating.
3 participants