PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #5499 from matrix-org/t3chguy/msc2858.1

Browse source 
Social Login support both https and mxc icons
This commit is contained in:
Michael Telatynski 2020-12-17 12:31:33 +00:00 committed by GitHub
commit 7bd2f2c6ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/views/elements/SSOButtons.tsx
View file

@ -45,8 +45,13 @@ const SSOButton: React.FC<ISSOButtonProps> = ({
}; };
let icon; let icon;
if (idp && idp.icon && idp.icon.startsWith("https://")) { if (typeof idp?.icon === "string" && (idp.icon.startsWith("mxc://") || idp.icon.startsWith("https://"))) {
icon = <img src={idp.icon} height="24" width="24" alt={label} />; icon = <img
src={matrixClient.mxcUrlToHttp(idp.icon, 24, 24, "crop", true)}
height="24"
width="24"
alt={label}
/>;
} }
const classes = classNames("mx_SSOButton", { const classes = classNames("mx_SSOButton", {