Skip to content

Commit

Permalink
Merge branch 'keycloak' into about-okapi-compat
Browse files Browse the repository at this point in the history
  • Loading branch information
zburke authored Jan 2, 2024
2 parents 343fff6 + 716edcc commit cc4d940
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/components/PreLoginLanding/PreLoginLanding.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function PreLoginLanding({ onSelectTenant }) {
const getLoginUrl = () => {
if (!okapi.tenant) return '';
if (okapi.authnUrl) {
return `${okapi.authnUrl}/realms/${okapi.tenant}/protocol/openid-connect/auth?client_id=${okapi.clientId}&response_type=code&redirect_uri=${redirectUri}&scope=openid`;
return `${okapi.authnUrl}/realms/${okapi.tenant}/protocol/openid-connect/auth?client_id=${okapi.clientId}&response_type=code&redirect_uri=${redirectUri}&scope=openid&isConsortium=true`;
}
return '';
};
Expand Down Expand Up @@ -51,7 +51,7 @@ function PreLoginLanding({ onSelectTenant }) {
<Button
buttonClass={styles.submitButton}
disabled={!okapi.tenant}
onClick={() => window.location.replace(getLoginUrl())}
onClick={() => window.location.assign(getLoginUrl())}
buttonStyle="primary"
fullWidth
>
Expand All @@ -61,7 +61,8 @@ function PreLoginLanding({ onSelectTenant }) {
</Row>
</div>
</div>
</main>);
</main>
);
}

PreLoginLanding.propTypes = {
Expand Down

0 comments on commit cc4d940

Please sign in to comment.