Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

[Release] Iterate Social Logins work around edge cases and branding #5610

Merged
merged 3 commits into from
Feb 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 0 additions & 11 deletions res/css/views/elements/_SSOButtons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,3 @@ limitations under the License.
}
}
}

.mx_SSOButton.mx_SSOButton_brand_facebook {
background-color: #3c5a99;
border-color: #3c5a99;
color: #ffffff;
}
.mx_SSOButton.mx_SSOButton_brand_twitter {
background-color: #47acdf;
border-color: #47acdf;
color: #ffffff;
}
9 changes: 7 additions & 2 deletions res/img/element-icons/brands/facebook.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion res/img/element-icons/brands/twitter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/structures/auth/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,8 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
};

onTryRegisterClick = ev => {
const hasPasswordFlow = this.state.flows.find(flow => flow.type === "m.login.password");
const ssoFlow = this.state.flows.find(flow => flow.type === "m.login.sso" || flow.type === "m.login.cas");
const hasPasswordFlow = this.state.flows?.find(flow => flow.type === "m.login.password");
const ssoFlow = this.state.flows?.find(flow => flow.type === "m.login.sso" || flow.type === "m.login.cas");
// If has no password flow but an SSO flow guess that the user wants to register with SSO.
// TODO: instead hide the Register button if registration is disabled by checking with the server,
// has no specific errCode currently and uses M_FORBIDDEN.
Expand Down