nathanwoodburn/eth-oidc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade dependencies (#84)

Browse Source 
Close #82
This commit is contained in:
njxyz 2024-03-25 11:33:08 +01:00 committed by GitHub
parent da69a3a58b
commit 5f704a6ac3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15099 additions and 2455 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17478
js/ui/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

9
js/ui/package.json
View File

@ -49,12 +49,13 @@
"validate": "svelte-check" "validate": "svelte-check"
}, },
"dependencies": { "dependencies": {
"@wagmi/core": "^1.4.2", "@wagmi/core": "^2.6.9",
"@web3modal/ethereum": "^2.7.1", "@web3modal/wagmi": "^4.1.1",
"@web3modal/html": "^2.7.1", "@web3modal/core": "^4.1.1",
"@web3modal/ui": "^4.1.1",
"js-cookie": "^3.0.5", "js-cookie": "^3.0.5",
"siwe": "^2.1.4", "siwe": "^2.1.4",
"url": "^0.11.0", "url": "^0.11.0",
"viem": "^1.11.1" "viem": "^2.8.18"
} }
} }

67
js/ui/src/App.svelte
View File

@ -1,10 +1,11 @@
<script lang="ts"> <script lang="ts">
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { EthereumClient, w3mConnectors, w3mProvider } from '@web3modal/ethereum';
import { Web3Modal } from '@web3modal/html';
import { configureChains, createConfig } from '@wagmi/core'; import { createWeb3Modal, defaultWagmiConfig } from '@web3modal/wagmi'
import { arbitrum, mainnet, polygon } from '@wagmi/core/chains'; import { arbitrum, mainnet, polygon } from '@wagmi/core/chains';
import { getAccount } from '@wagmi/core'; import { getAccount, signMessage, reconnect, getConnections} from '@wagmi/core';
import { SiweMessage } from 'siwe'; import { SiweMessage } from 'siwe';
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
@ -20,16 +21,24 @@
$: status = 'Not Logged In'; $: status = 'Not Logged In';
const chains = [arbitrum, mainnet, polygon]; const chains = [mainnet, arbitrum, polygon];
const { publicClient } = configureChains(chains, [w3mProvider({ projectId })]); const config = defaultWagmiConfig({
const wagmiConfig = createConfig({ chains,
autoConnect: true, projectId,
connectors: w3mConnectors({ projectId, chains }), enableCoinbase: false,
publicClient, enableInjected: false,
})
const web3modal = createWeb3Modal({
defaultChain: mainnet,
wagmiConfig: config,
projectId,
themeMode: 'dark',
featuredWalletIds: [],
}); });
const ethereumClient = new EthereumClient(wagmiConfig, chains);
const web3modal = new Web3Modal({ projectId }, ethereumClient); reconnect(config)
let client_metadata = {}; let client_metadata = {};
onMount(async () => { onMount(async () => {
@ -39,36 +48,40 @@
console.error(e); console.error(e);
} }
}); });
web3modal.subscribeModal(async () => {
const account = getAccount(); web3modal.subscribeState(async (newState) => {
const account = getAccount(config);
if (account.isConnected) { if (account.isConnected) {
try { try {
const expirationTime = new Date( const expirationTime = new Date(
new Date().getTime() + 2 * 24 * 60 * 60 * 1000, // 48h new Date().getTime() + 2 * 24 * 60 * 60 * 1000, // 48h
); );
const signMessage = new SiweMessage({
const msgToSign = new SiweMessage({
domain: window.location.host, domain: window.location.host,
address: account.address, address: account.address,
chainId: await account.connector.getChainId(), chainId: account.chainId,
expirationTime: expirationTime.toISOString(), expirationTime: expirationTime.toISOString(),
uri: window.location.origin, uri: window.location.origin,
version: '1', version: '1',
statement: `You are signing-in to ${window.location.host}.`, statement: `You are signing-in to ${window.location.host}.`,
nonce, nonce,
resources: [redirect], resources: [redirect],
}).prepareMessage();
const signature = await (
await account.connector.getWalletClient()
).signMessage({
account: account.address,
message: signMessage,
}); });
const message = new SiweMessage(signMessage); const preparedMessage = msgToSign.prepareMessage();
await new Promise((resolve) => setTimeout(resolve, 1000));
const signature = await signMessage(config,{
message: preparedMessage,
});
const session = { const session = {
message, message: new SiweMessage(preparedMessage),
raw: signMessage, raw: msgToSign,
signature, signature,
}; };
Cookies.set('siwe', JSON.stringify(session), { Cookies.set('siwe', JSON.stringify(session), {
@ -114,7 +127,7 @@
<button <button
class="h-12 border hover:scale-105 justify-evenly shadow-xl border-white mt-4 duration-100 ease-in-out transition-all transform flex items-center" class="h-12 border hover:scale-105 justify-evenly shadow-xl border-white mt-4 duration-100 ease-in-out transition-all transform flex items-center"
on:click={() => { on:click={() => {
web3modal.openModal(); web3modal.open();
}} }}
> >
<svg <svg