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.

Sign up for GitHub

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

Jump to bottom

Update for Dataporten closing #3580 #3608

Merged
merged 7 commits into from
Jun 22, 2016
Merged

Update for Dataporten closing #3580 #3608

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5dbe0e0
Update for Dataporten closing #3580
Jun 22, 2016
295ea99
Update custom_oauth_server.coffee
Jun 22, 2016
644d115
Added support for email-fetching with dataporten
Jun 22, 2016
0a396eb
Added general option for userid instead of id
Jun 22, 2016
3a7db7b
Codeprotecting
Jun 22, 2016
81eee4c
Merge branch 'develop' into patch-1
Jun 22, 2016
05d20d2
Merge branch 'develop' into patch-1
Jun 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions packages/rocketchat-custom-oauth/custom_oauth_server.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,16 @@ class CustomOAuth

if identity?.CharacterID and not identity.id
identity.id = identity.CharacterID


# Fix Dataporten having 'user.userid' instead of 'id'
if identity?.user.userid and not identity.id
identity.id = identity.user.userid
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?

identity.id = identity.userid

# console.log 'id:', JSON.stringify identity, null, ' '

serviceData =
Expand All @@ -135,7 +144,7 @@ class CustomOAuth
serviceData: serviceData
options:
profile:
name: identity.name or identity.username or identity.nickname or identity.CharacterName
name: identity.name or identity.username or identity.nickname or identity.CharacterName or identity.user.name
Copy link
Member

@rodrigok rodrigok Jun 22, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

Can you protect the code replacing identity.user.name by identity.user?.name?

Copy link
Author

Choose a reason for hiding this comment

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

`identity.user?.nameoridentity.user?.name?``

Copy link
Member

Choose a reason for hiding this comment

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

identity.user?.name

Copy link
Author

Choose a reason for hiding this comment

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

Done! :)


# console.log data

Expand Down