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 the team server registration #741

Merged
merged 1 commit into from Mar 6, 2017
Merged

Fix the team server registration #741

merged 1 commit into from Mar 6, 2017

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented Mar 6, 2017

Pass extra info from the UI auth process as a second parameter to
onAuthFinished. Allows the email sid & client secret to be used
outside of the UI auth process.

New version of: #738
Requires matrix-org/matrix-js-sdk#383

Pass extra info from the UI auth process as a second parameter to
onAuthFinished. Allows the email sid & client secret to be used
outside of the UI auth process.
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

looks fine, if a bit ugh

@richvdh
Copy link
Member

richvdh commented Mar 6, 2017

are the tests just failing because matrix-org/matrix-js-sdk#383?

@richvdh richvdh assigned dbkr and unassigned richvdh Mar 6, 2017
@dbkr
Copy link
Member Author

dbkr commented Mar 6, 2017

They pass on mine, so I assume so, but the error message isn't terribly helpful :/

@dbkr dbkr merged commit 65ce8c2 into develop Mar 6, 2017
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.

None yet

2 participants