This repository was archived by the owner on Sep 11, 2024. It is now read-only.
Fix the team server integration#738
Closed
dbkr wants to merge 2 commits into
Closed
Conversation
Get HS / IS from the client, not the regidter logic which no longer exists
Add callback so we can get at the UI auth object to extract the email sid & client secret.
dbkr
commented
Mar 3, 2017
| homeserverUrl: this.state.hsUrl, | ||
| identityServerUrl: this.state.isUrl, | ||
| accessToken: response.access_token, | ||
| }); |
Member
Author
There was a problem hiding this comment.
This was the same thing as was done after the trackPromise: we should just do it then.
dbkr
commented
Mar 3, 2017
| // is the client they initiated registration). | ||
| let trackPromise = q(null); | ||
| if (this._rtsClient) { | ||
| if (this._rtsClient && this._authLogic.getEmailSid()) { |
Member
Author
There was a problem hiding this comment.
The referral tracking only makes sense if we registered with an email
dbkr
commented
Mar 3, 2017
| }, teamToken); | ||
| }).then(() => { | ||
| return this._setupPushers(); | ||
| }).done(); |
Member
Author
There was a problem hiding this comment.
The promise returned from this is not a q promise, and so does not have a .done, as it turns out. :/
richvdh
reviewed
Mar 6, 2017
| // has been created. This allows the component to | ||
| // access more specific functions only available on | ||
| // the auth object itself. | ||
| onAuthObject: React.PropTypes.func, |
Member
There was a problem hiding this comment.
this is surely horrible. why not pass an opts object into the onAuthFinished callback with the emailSid and clientSecret?
Member
Author
|
Have made another one that passes them in the onAuthFinished callback: #741 |
martindale
pushed a commit
to FabricLabs/matrix-react-sdk
that referenced
this pull request
Dec 8, 2018
…/roomnamealias Revert "room name should only take canonical alias into account"
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The UI auth refactor broke team server integration as it used variables from the register Signup class. Get that information (email sid & client secret) from the UI auth session.
I don't love the idea of passing the UI auth session around, I'm not really sure of a better way to do this though.
Requires matrix-org/matrix-js-sdk#383