Skip to content

Hide GoogleLoginButton if no Google OAuth key provided. #3740

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

Open
Ryszard-Trojnacki wants to merge 1 commit into
base: integration
Choose a base branch
from
+15 −7
Open

Hide GoogleLoginButton if no Google OAuth key provided. #3740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 10 additions & 6 deletions packages/webapp/src/components/CustomSignUp/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,16 @@ export default function PureCustomSignUp({
</div>
)}

<div data-cy="continueGoogle" className={styles.ssoButton}>
{GoogleLoginButton}
</div>
<div className={styles.lineBreak}>
<LineBreak />
</div>
{GoogleLoginButton && (
<div data-cy="continueGoogle" className={styles.ssoButton}>
{GoogleLoginButton}
</div>
)}
{GoogleLoginButton && (
<div className={styles.lineBreak}>
<LineBreak />
</div>
)}

<div className={styles.continueButton}>
<Input data-cy="email" classes={inputClasses} {...inputs[0]} />
Expand Down
6 changes: 5 additions & 1 deletion packages/webapp/src/containers/CustomSignUp/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ const PureCustomSignUpStyle = {
},
};

const showGoogleOAuth = !!import.meta.env.VITE_GOOGLE_OAUTH_CLIENT_ID;

function CustomSignUp() {
const {
register,
Expand Down Expand Up @@ -168,7 +170,9 @@ function CustomSignUp() {
classes={PureCustomSignUpStyle}
onSubmit={handleSubmit(onSubmit)}
disabled={disabled}
GoogleLoginButton={<GoogleLoginButton className={'google-login-button'} />}
GoogleLoginButton={
showGoogleOAuth && <GoogleLoginButton className={'google-login-button'} />
}
isChrome={isChrome()}
errorMessage={errorMessage}
inputs={[
Expand Down