Skip to content
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.

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

Web3Auth bug fix #47

Open
wants to merge 5 commits into
base: feat/v0.3
Choose a base branch
from
Open
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
25 changes: 18 additions & 7 deletions contexts/AuthContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@ import { createContext, useContext, useEffect, useMemo, useState } from "react"
import Channel4Icon from "@/assets/channel-4-icon-v2.svg"
import { useJwtStore } from "@/store/jwt"
import { Web3Auth } from "@web3auth/modal"
import {
BrowserProvider,
Eip1193Provider,
JsonRpcSigner,
Provider,
} from "ethers"
import { BrowserProvider, Eip1193Provider, JsonRpcSigner } from "ethers"

type AuthContextType = {
initializingW3A: boolean
Expand All @@ -34,14 +29,28 @@ export const AuthProvider: React.FC<{ children: JSX.Element }> = ({
const [web3Auth, setWeb3Auth] = useState<Web3Auth | null>(null)
const { token, userId, updateToken, updateUserId } = useJwtStore()

const connectWeb3Auth = async () => {
// If web3auth has not been initialized correctly then call init modal
if (web3Auth?.status === "not_ready") {
await web3Auth?.initModal()
}
if (web3Auth?.status === "errored" || web3Auth?.status === "not_ready") {
alert(
"Web3Auth is not initialized. Please click sign-in again. If the issue persists refresh the page and try again."
)
} else {
return await web3Auth?.connect()
}
}

const getSigner = async (web3AuthProvider: Eip1193Provider) => {
const provider = new BrowserProvider(web3AuthProvider)
return await provider.getSigner()
}

const signIn = async () => {
try {
const web3AuthProvider = await web3Auth?.connect()
const web3AuthProvider = await connectWeb3Auth()
if (web3AuthProvider) {
// Create ethers provider from web3 auth provider
const rpcSigner = await getSigner(web3AuthProvider)
Expand Down Expand Up @@ -75,6 +84,8 @@ export const AuthProvider: React.FC<{ children: JSX.Element }> = ({
updateToken(null)
updateUserId(null)
setSigner(null)
// Reload window to avoid Web3Auth disconnect / reconnect bug
window.location.reload()
}

const signedIn = useMemo(() => {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@radix-ui/react-slider": "^1.1.2",
"@swetrix/nextjs": "^1.0.1",
"@walletconnect/sign-client": "^2.10.6",
"@web3auth/modal": "^7.0.3",
"@web3auth/modal": "^7.2.0",
"airtable": "^0.12.1",
"class-variance-authority": "^0.4.0",
"clsx": "^1.2.1",
Expand Down
Loading