You've already forked matrix-react-sdk
mirror of
https://github.com/matrix-org/matrix-react-sdk.git
synced 2025-08-04 23:02:14 +03:00
Fix crash on null idp for SSO buttons (#8650)
* Add test case for null identity_providers for SSO * Fix typing for identity_providers * Make null idp explicit and handle in analytics * chore: whitespace fix Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
@@ -51,7 +51,7 @@ export interface IIdentityProvider {
|
|||||||
export interface ISSOFlow {
|
export interface ISSOFlow {
|
||||||
type: "m.login.sso" | "m.login.cas";
|
type: "m.login.sso" | "m.login.cas";
|
||||||
// eslint-disable-next-line camelcase
|
// eslint-disable-next-line camelcase
|
||||||
identity_providers: IIdentityProvider[];
|
identity_providers?: IIdentityProvider[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export type LoginFlow = ISSOFlow | IPasswordFlow;
|
export type LoginFlow = ISSOFlow | IPasswordFlow;
|
||||||
|
@@ -29,7 +29,7 @@ import { mediaFromMxc } from "../../../customisations/Media";
|
|||||||
import { PosthogAnalytics } from "../../../PosthogAnalytics";
|
import { PosthogAnalytics } from "../../../PosthogAnalytics";
|
||||||
|
|
||||||
interface ISSOButtonProps extends Omit<IProps, "flow"> {
|
interface ISSOButtonProps extends Omit<IProps, "flow"> {
|
||||||
idp: IIdentityProvider;
|
idp?: IIdentityProvider;
|
||||||
mini?: boolean;
|
mini?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -84,7 +84,7 @@ const SSOButton: React.FC<ISSOButtonProps> = ({
|
|||||||
const label = idp ? _t("Continue with %(provider)s", { provider: idp.name }) : _t("Sign in with single sign-on");
|
const label = idp ? _t("Continue with %(provider)s", { provider: idp.name }) : _t("Sign in with single sign-on");
|
||||||
|
|
||||||
const onClick = () => {
|
const onClick = () => {
|
||||||
const authenticationType = getAuthenticationType(idp.brand);
|
const authenticationType = getAuthenticationType(idp?.brand ?? "");
|
||||||
PosthogAnalytics.instance.setAuthenticationType(authenticationType);
|
PosthogAnalytics.instance.setAuthenticationType(authenticationType);
|
||||||
PlatformPeg.get().startSingleSignOn(matrixClient, loginType, fragmentAfterLogin, idp?.id);
|
PlatformPeg.get().startSingleSignOn(matrixClient, loginType, fragmentAfterLogin, idp?.id);
|
||||||
};
|
};
|
||||||
|
@@ -146,4 +146,19 @@ describe('Login', function() {
|
|||||||
const ssoButtons = ReactTestUtils.scryRenderedDOMComponentsWithClass(root, "mx_SSOButton");
|
const ssoButtons = ReactTestUtils.scryRenderedDOMComponentsWithClass(root, "mx_SSOButton");
|
||||||
expect(ssoButtons.length).toBe(3);
|
expect(ssoButtons.length).toBe(3);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should show single SSO button if identity_providers is null", async () => {
|
||||||
|
mockClient.loginFlows.mockResolvedValue({
|
||||||
|
flows: [{
|
||||||
|
"type": "m.login.sso",
|
||||||
|
}],
|
||||||
|
});
|
||||||
|
|
||||||
|
const root = render();
|
||||||
|
|
||||||
|
await flushPromises();
|
||||||
|
|
||||||
|
const ssoButtons = ReactTestUtils.scryRenderedDOMComponentsWithClass(root, "mx_SSOButton");
|
||||||
|
expect(ssoButtons.length).toBe(1);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
Reference in New Issue
Block a user