Skip to content

Extend getSsoLoginUrl for MSC2858 #1541

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

Merged
t3chguy merged 3 commits into from
Dec 2, 2020
Merged

Extend getSsoLoginUrl for MSC2858 #1541

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd906e6
Extend getSsoLoginUrl for MSC2858
t3chguy Nov 17, 2020
99bff04
Update base-apis.js
t3chguy Nov 17, 2020
ea35a29
Merge branch 'develop' of github.com:matrix-org/matrix-js-sdk into t3…
t3chguy Dec 2, 2020
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
16 changes: 12 additions & 4 deletions src/base-apis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,15 +356,23 @@ MatrixBaseApis.prototype.getCasLoginUrl = function(redirectUrl) {
* authenticates with the SSO.
* @param {string} loginType The type of SSO login we are doing (sso or cas).
* Defaults to 'sso'.
* @param {string} idpId The ID of the Identity Provider being targeted, optional.
* @return {string} The HS URL to hit to begin the SSO login process.
*/
MatrixBaseApis.prototype.getSsoLoginUrl = function(redirectUrl, loginType) {
MatrixBaseApis.prototype.getSsoLoginUrl = function(redirectUrl, loginType, idpId) {
if (loginType === undefined) {
loginType = "sso";
}
return this._http.getUrl("/login/"+loginType+"/redirect", {
"redirectUrl": redirectUrl,
}, PREFIX_R0);

let prefix = PREFIX_R0;
let url = "/login/" + loginType + "/redirect";
if (idpId) {
url += "/" + idpId;
prefix = "/_matrix/client/unstable/org.matrix.msc2858";
}


return this._http.getUrl(url, { redirectUrl }, prefix);
};

/**
Expand Down