feat: implement OIDC settings
This commit is contained in:
@@ -0,0 +1,65 @@
|
||||
/* eslint-disable no-undef */
|
||||
import { useState } from "react";
|
||||
import styled from "styled-components";
|
||||
import StyledModal from "../../common/component/styled/Modal";
|
||||
import Modal from "../../common/component/Modal";
|
||||
import { StyledSocialButton } from "./styled";
|
||||
import solidSvg from "../../assets/icons/solid.svg?url";
|
||||
import StyledButton from "../../common/component/styled/Button";
|
||||
import SolidLoginButton from "./SolidLoginButton";
|
||||
|
||||
const StyledOicdLoginModal = styled(StyledModal)`
|
||||
text-align: center;
|
||||
padding: 32px 32px 16px;
|
||||
|
||||
> *:first-child {
|
||||
margin-bottom: 32px;
|
||||
}
|
||||
|
||||
> .button {
|
||||
> .icon {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
}
|
||||
|
||||
&Cancel {
|
||||
color: #8f8f8f;
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
export default function OidcLoginButton({ issuers }) {
|
||||
const [modal, setModal] = useState(true);
|
||||
if (!issuers) return null;
|
||||
return (
|
||||
<>
|
||||
<StyledSocialButton
|
||||
onClick={() => {
|
||||
setModal(true);
|
||||
}}
|
||||
>
|
||||
<img src={solidSvg} className="icon" alt="solid icon" />
|
||||
Sign in with OIDC
|
||||
</StyledSocialButton>
|
||||
{modal && (
|
||||
<Modal id="modal-modal">
|
||||
<StyledOicdLoginModal title="Login with OIDC">
|
||||
{issuers
|
||||
.filter((issuer) => issuer.enable)
|
||||
.map((issuer, index) => (
|
||||
<SolidLoginButton issuer={issuer} key={index} />
|
||||
))}
|
||||
<StyledButton
|
||||
className="border_less ghost buttonCancel"
|
||||
onClick={() => {
|
||||
setModal(false);
|
||||
}}
|
||||
>
|
||||
Close
|
||||
</StyledButton>
|
||||
</StyledOicdLoginModal>
|
||||
</Modal>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -1,16 +1,15 @@
|
||||
/* eslint-disable no-undef */
|
||||
import { useEffect } from "react";
|
||||
import { useGetOpenidMutation } from "../../app/services/auth";
|
||||
import solidSvg from "../../assets/icons/solid.svg?url";
|
||||
import { StyledSocialButton } from "./styled";
|
||||
|
||||
export default function SolidLoginButton({ issuers }) {
|
||||
export default function SolidLoginButton({ issuer }) {
|
||||
const [getOpenId, { data, isLoading, isSuccess }] = useGetOpenidMutation();
|
||||
|
||||
const handleSolidLogin = () => {
|
||||
getOpenId({
|
||||
// issuer: "solidweb.org",
|
||||
issuer: issuers[0],
|
||||
issuer,
|
||||
redirect_uri: `${location.origin}/#/login`
|
||||
});
|
||||
};
|
||||
@@ -24,8 +23,8 @@ export default function SolidLoginButton({ issuers }) {
|
||||
|
||||
return (
|
||||
<StyledSocialButton disabled={isLoading} onClick={handleSolidLogin}>
|
||||
<img src={solidSvg} className="icon" alt="solid icon" />
|
||||
{isLoading ? `Redirecting...` : `Sign in with Solid`}
|
||||
<img src={issuer.favicon} className="icon" alt="icon" />
|
||||
Login with {issuer.domain}
|
||||
</StyledSocialButton>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ import BASE_URL from "../../app/config";
|
||||
// import web3 from "web3";
|
||||
import StyledWrapper from "./styled";
|
||||
import MetamaskLoginButton from "./MetamaskLoginButton";
|
||||
import SolidLoginButton from "./SolidLoginButton";
|
||||
import OidcLoginButton from "./OidcLoginButton";
|
||||
import Input from "../../common/component/styled/Input";
|
||||
import Button from "../../common/component/styled/Button";
|
||||
import GoogleLoginButton from "./GoogleLoginButton";
|
||||
@@ -16,7 +16,6 @@ import { useGetLoginConfigQuery, useGetSMTPStatusQuery } from "../../app/service
|
||||
import useGoogleAuthConfig from "../../common/hook/useGoogleAuthConfig";
|
||||
import GithubLoginButton from "./GithubLoginButton";
|
||||
import useGithubAuthConfig from "../../common/hook/useGithubAuthConfig";
|
||||
|
||||
export default function LoginPage() {
|
||||
const { data: enableSMTP } = useGetSMTPStatusQuery();
|
||||
const [login, { isSuccess, isLoading, error }] = useLoginMutation();
|
||||
@@ -171,7 +170,7 @@ export default function LoginPage() {
|
||||
{googleLogin && <GoogleLoginButton login={login} clientId={clientId} />}
|
||||
{enableGithubLogin && <GithubLoginButton config={githubAuthConfig} />}
|
||||
{enableMetamaskLogin && <MetamaskLoginButton login={login} />}
|
||||
{oidc.length > 0 && <SolidLoginButton issuers={oidc} />}
|
||||
{oidc.length > 0 && <OidcLoginButton issuers={oidc} />}
|
||||
{whoCanSignUp === "EveryOne" && <SignUpLink />}
|
||||
</div>
|
||||
</StyledWrapper>
|
||||
|
||||
@@ -8,13 +8,16 @@ import Styled from "./styled";
|
||||
// import IconPlus from "../../../../assets/icons/plus.circle.svg";
|
||||
import IconMinus from "../../../../assets/icons/minus.circle.svg";
|
||||
|
||||
export default function IssuerList({ issuers = [] }) {
|
||||
const [select, setSelect] = useState(undefined);
|
||||
export default function IssuerList({ issuers = [], onChange }) {
|
||||
const [select, setSelect] = useState({});
|
||||
const [newDomain, setNewDomain] = useState("");
|
||||
const handleNewDomain = (evt) => {
|
||||
setNewDomain(evt.target.value);
|
||||
};
|
||||
const disableBtn = !(newDomain || !!select?.value);
|
||||
const disableBtn =
|
||||
(!newDomain && !select?.value) ||
|
||||
!select?.title ||
|
||||
issuers.some((issuer) => issuer.domain === newDomain);
|
||||
return (
|
||||
<Styled>
|
||||
<ul className="issuers">
|
||||
@@ -22,9 +25,14 @@ export default function IssuerList({ issuers = [] }) {
|
||||
return (
|
||||
<li key={domain} className="issuer">
|
||||
<div className="left">
|
||||
<IconMinus className="remove" />
|
||||
<IconMinus
|
||||
className="remove"
|
||||
onClick={() => {
|
||||
onChange(issuers.filter((issuer) => issuer.domain !== domain));
|
||||
}}
|
||||
/>
|
||||
<div className="data">
|
||||
<img src={favicon} alt="logo" className="icon" />
|
||||
{Boolean(favicon) && <img src={favicon} alt="logo" className="icon" />}
|
||||
<Input
|
||||
readOnly
|
||||
value={domain}
|
||||
@@ -35,7 +43,17 @@ export default function IssuerList({ issuers = [] }) {
|
||||
</div>
|
||||
</div>
|
||||
<div className="right">
|
||||
<Toggle data-checked={enable} />
|
||||
<Toggle
|
||||
data-checked={enable}
|
||||
onClick={() => {
|
||||
onChange(
|
||||
issuers.map((issuer) => ({
|
||||
...issuer,
|
||||
enable: issuer.domain === domain ? !enable : issuer.enable
|
||||
}))
|
||||
);
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</li>
|
||||
);
|
||||
@@ -43,7 +61,14 @@ export default function IssuerList({ issuers = [] }) {
|
||||
|
||||
<li className="issuer add">
|
||||
<div className="left">
|
||||
<Select options={options} updateSelect={setSelect} />
|
||||
<Select
|
||||
options={options.map((option) => ({
|
||||
...option,
|
||||
selected: issuers.some((issuer) => issuer.domain === option.value)
|
||||
}))}
|
||||
current={select}
|
||||
updateSelect={setSelect}
|
||||
/>
|
||||
<div className="data">
|
||||
<Input
|
||||
onChange={handleNewDomain}
|
||||
@@ -56,7 +81,23 @@ export default function IssuerList({ issuers = [] }) {
|
||||
</div>
|
||||
</div>
|
||||
<div className="right">
|
||||
<Button disabled={disableBtn}>Add</Button>
|
||||
<Button
|
||||
disabled={disableBtn}
|
||||
onClick={() => {
|
||||
const { icon, value } = options.find((option) => option.value === select.value);
|
||||
onChange(
|
||||
issuers.concat({
|
||||
enable: true,
|
||||
favicon: icon || "",
|
||||
domain: value || newDomain
|
||||
})
|
||||
);
|
||||
setSelect({});
|
||||
setNewDomain("");
|
||||
}}
|
||||
>
|
||||
Add
|
||||
</Button>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -18,14 +18,13 @@ const Styled = styled.div`
|
||||
flex: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 16px;
|
||||
justify-content: space-between;
|
||||
.remove {
|
||||
cursor: pointer;
|
||||
}
|
||||
.data {
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
align-items: center;
|
||||
gap: 16px;
|
||||
justify-content: space-between;
|
||||
> .icon {
|
||||
|
||||
@@ -182,7 +182,15 @@ export default function Logins() {
|
||||
</div>
|
||||
</div>
|
||||
<div className="row">
|
||||
<IssuerList issuers={oidc} />
|
||||
<IssuerList
|
||||
issuers={oidc}
|
||||
onChange={(newOidc) => {
|
||||
setValues((prev) => ({
|
||||
...prev,
|
||||
oidc: newOidc
|
||||
}));
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user