mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Make the riot-desktop callback args more generic and encrypt the args

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2020-04-09 16:21:52 +01:00
parent 67cf1e7536
commit 6fdeca93b6
3 changed files with 39 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/vector/platform/ElectronPlatform.js
View file

@ -230,8 +230,8 @@ export default class ElectronPlatform extends VectorBasePlatform {
}
// we assume this happens before any SSO actions occur but do not block.
this._ipcCall('getUserDataPath').then(userDataPath => {
this.userDataPath = userDataPath;
this._ipcCall('getRiotDesktopSsoArgs').then(riotDesktopSsoArgs => {
this.riotDesktopSsoArgs = riotDesktopSsoArgs;
});
}
@ -429,8 +429,8 @@ export default class ElectronPlatform extends VectorBasePlatform {
getSSOCallbackUrl(hsUrl: string, isUrl: string): URL {
const url = super.getSSOCallbackUrl(hsUrl, isUrl);
url.protocol = "riot";
if (this.userDataPath) {
url.searchParams.set("riot-desktop-user-data-path", this.userDataPath);
if (this.riotDesktopSsoArgs) {
url.searchParams.set("riot-desktop-args", this.riotDesktopSsoArgs);
}
return url;
}