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

Improve wagmi version support #82

Merged
merged 6 commits into from Feb 23, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion examples/ssx-test-nextauth-email/.env.example
@@ -1,4 +1,3 @@
NEXT_PUBLIC_ENABLE_TESTNETS=
NEXT_PUBLIC_ALCHEMY_API_KEY=
NEXT_AUTH_SECRET=any string
EMAIL_SERVER=smtp://localhost:1025
Expand Down
8 changes: 4 additions & 4 deletions examples/ssx-test-nextauth-email/package.json
Expand Up @@ -13,9 +13,9 @@
"dependencies": {
"@next-auth/prisma-adapter": "^1.0.5",
"@prisma/client": "^4.9.0",
"@rainbow-me/rainbowkit": "^0.7.2",
"@spruceid/ssx-react": "*",
"@spruceid/ssx-server": "*",
"@rainbow-me/rainbowkit": "^0.11.0",
"@spruceid/ssx-react": "file:../../packages/ssx-react",
"@spruceid/ssx-server": "file:../../packages/ssx-server",
"ethers": "^5.0.0",
"next": "^12.1.6",
"next-auth": "^4.10.3",
Expand All @@ -24,7 +24,7 @@
"react": "^18.1.0",
"react-dom": "^18.1.0",
"sass": "^1.58.0",
"wagmi": "^0.7.5"
"wagmi": "^0.11.6"
},
"devDependencies": {
"@types/node": "^17.0.35",
Expand Down
13 changes: 4 additions & 9 deletions examples/ssx-test-nextauth-email/pages/_app.tsx
@@ -1,7 +1,7 @@
import '../styles/globals.scss';
import '@rainbow-me/rainbowkit/styles.css';
import { RainbowKitProvider, getDefaultWallets } from '@rainbow-me/rainbowkit';
import { chain, configureChains, createClient, WagmiConfig } from 'wagmi';
import { configureChains, createClient, goerli, mainnet, WagmiConfig } from 'wagmi';
import { alchemyProvider } from 'wagmi/providers/alchemy';
import { publicProvider } from 'wagmi/providers/public';
import { SSXProvider } from '@spruceid/ssx-react';
Expand All @@ -24,19 +24,14 @@ if (!process.env.NEXT_PUBLIC_ALCHEMY_API_KEY) {

const { chains, provider, webSocketProvider } = configureChains(
[
chain.mainnet,
chain.polygon,
chain.optimism,
chain.arbitrum,
...(process.env.NEXT_PUBLIC_ENABLE_TESTNETS === 'true'
? [chain.goerli, chain.kovan, chain.rinkeby, chain.ropsten]
: []),
mainnet,
goerli,
],
[
alchemyProvider({
// This is Alchemy's default API key.
// You can get your own at https://dashboard.alchemyapi.io
apiKey: process.env.NEXT_PUBLIC_ALCHEMY_API_KEY,
apiKey: process.env.NEXT_PUBLIC_ALCHEMY_API_KEY ?? "",
}),
publicProvider(),
]
Expand Down
1,532 changes: 1,135 additions & 397 deletions examples/ssx-test-nextauth-email/yarn.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions examples/ssx-test-nextauth/package.json
Expand Up @@ -12,14 +12,14 @@
},
"dependencies": {
"@rainbow-me/rainbowkit": "^0.7.2",
"@spruceid/ssx-react": "*",
"@spruceid/ssx-server": "*",
"@spruceid/ssx-react": "file:../../packages/ssx-react",
"@spruceid/ssx-server": "file:../../packages/ssx-server",
"ethers": "^5.0.0",
"next": "^12.1.6",
"next-auth": "^4.10.3",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"wagmi": "^0.7.5"
"wagmi": "^0.5.0"
},
"devDependencies": {
"@types/node": "^17.0.35",
Expand Down
10 changes: 5 additions & 5 deletions examples/ssx-test-nextauth/pages/_app.tsx
Expand Up @@ -20,14 +20,14 @@ const { chains, provider, webSocketProvider } = configureChains(
chain.optimism,
chain.arbitrum,
...(process.env.NEXT_PUBLIC_ENABLE_TESTNETS === 'true'
? [chain.goerli, chain.kovan, chain.rinkeby, chain.ropsten]
? [chain.goerli, chain.ropsten]
: []),
],
[
alchemyProvider({
// This is Alchemy's default API key.
// You can get your own at https://dashboard.alchemyapi.io
apiKey: process.env.NEXT_PUBLIC_ALCHEMY_API_KEY,
alchemyId: process.env.NEXT_PUBLIC_ALCHEMY_API_KEY,
}),
publicProvider(),
]
Expand All @@ -45,12 +45,12 @@ const wagmiClient = createClient({
webSocketProvider,
});

const { server } = SSXNextAuthRouteConfig({ signInOptions: { callbackUrl:'/protected' }});
const { server } = SSXNextAuthRouteConfig({ signInOptions: { callbackUrl: '/protected' } });
const ssxConfig: any = {
siweConfig: {
domain: "localhost:3000",
},
providers: {
providers: {
server,
},
};
Expand All @@ -60,7 +60,7 @@ function MyApp({ Component, pageProps }: any) {
return (
<WagmiConfig client={wagmiClient}>
<RainbowKitProvider chains={chains}>
<SSXProvider ssxConfig={ssxConfig}>
<SSXProvider ssxConfig={ssxConfig}>
<SessionProvider session={pageProps.session} refetchInterval={0}>
<Component {...pageProps} />
</SessionProvider>
Expand Down
4 changes: 2 additions & 2 deletions examples/ssx-test-nextauth/pages/api/auth/[...nextauth].ts
Expand Up @@ -7,7 +7,7 @@ import { SSXServer } from "@spruceid/ssx-server";
export default async function auth(req: NextApiRequest, res: NextApiResponse) {
const ssxConfig = {};
const ssx = new SSXServer(ssxConfig);
const { credentials, authorize, session } = SSXNextAuth(req, res, ssx);
const { credentials, authorize, session } = SSXNextAuth(req, ssx);
const providers = [
CredentialsProvider({
name: "Ethereum",
Expand All @@ -23,7 +23,7 @@ export default async function auth(req: NextApiRequest, res: NextApiResponse) {
},
secret: process.env.NEXT_AUTH_SECRET,
callbacks: {
session,
session,
},
});
}