@mezo-org/passport 0.4.0-dev.7 → 0.4.0-dev.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAuthenticateWithWallet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAuthenticateWithWallet.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useAuthenticateWithWallet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAuthenticateWithWallet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAe,MAAM,uBAAuB,CAAA;AAMpE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAGrC,iBAAS,yBAAyB,CAChC,mBAAmB,UAAQ,EAC3B,eAAe,GAAE,IAAI,CACnB,eAAe,CAAC,OAAO,CAAC,EACxB,YAAY,GAAG,aAAa,CACxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgFP;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAA"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { useSignMessage } from "wagmi";
|
|
2
|
-
import { useBitcoinAccount } from "@mezo-org/orangekit";
|
|
3
2
|
import { useMutation } from "@tanstack/react-query";
|
|
4
|
-
import { useMemo } from "react";
|
|
5
3
|
import { useCreateAccount } from "./useCreateAccount";
|
|
6
4
|
import { useCreateSession } from "./useCreateSession";
|
|
7
5
|
import { useEnsureNoSessionAndFetchNonce } from "./useEnsureNoSessionAndFetchNonce";
|
|
@@ -10,20 +8,21 @@ import { useGetAccountByAddress } from "./useGetAccountByAddress";
|
|
|
10
8
|
import useWalletAccount from "./useWalletAccount";
|
|
11
9
|
function useAuthenticateWithWallet(shouldCreateAccount = false, mutationOptions = {}) {
|
|
12
10
|
const { address, chainId, connector, networkFamily } = useWalletAccount();
|
|
13
|
-
const { btcAddress } = useBitcoinAccount();
|
|
14
11
|
const { ensureNoSessionAndFetchNonce } = useEnsureNoSessionAndFetchNonce();
|
|
15
12
|
const { createSessionAsync } = useCreateSession();
|
|
16
13
|
const { createAccountAsync } = useCreateAccount();
|
|
17
14
|
const { signMessageAsync } = useSignMessage();
|
|
18
|
-
const
|
|
19
|
-
|
|
15
|
+
const { refetch: getAccountByAddress } = useGetAccountByAddress(address, {
|
|
16
|
+
enabled: false,
|
|
17
|
+
retry: false,
|
|
18
|
+
});
|
|
20
19
|
const { mutate, mutateAsync, ...signInMutationRestParameters } = useMutation({
|
|
21
20
|
mutationFn: async () => {
|
|
22
21
|
if (!address) {
|
|
23
22
|
throw new Error("Sign in error: Wallet not connected!");
|
|
24
23
|
}
|
|
25
24
|
const nonce = await ensureNoSessionAndFetchNonce();
|
|
26
|
-
const messageResult = createSignInWithWalletMessage(
|
|
25
|
+
const messageResult = createSignInWithWalletMessage(address, nonce, networkFamily, chainId);
|
|
27
26
|
const signatureResult = await signMessageAsync({
|
|
28
27
|
message: messageResult,
|
|
29
28
|
connector,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAuthenticateWithWallet.js","sourceRoot":"","sources":["../../../src/hooks/useAuthenticateWithWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,
|
|
1
|
+
{"version":3,"file":"useAuthenticateWithWallet.js","sourceRoot":"","sources":["../../../src/hooks/useAuthenticateWithWallet.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { useSignMessage } from "wagmi"
|
|
2
|
-
import { useBitcoinAccount } from "@mezo-org/orangekit"
|
|
3
2
|
import { MutationOptions, useMutation } from "@tanstack/react-query"
|
|
4
|
-
import { useMemo } from "react"
|
|
5
3
|
import { useCreateAccount } from "./useCreateAccount"
|
|
6
4
|
import { useCreateSession } from "./useCreateSession"
|
|
7
5
|
import { useEnsureNoSessionAndFetchNonce } from "./useEnsureNoSessionAndFetchNonce"
|
|
@@ -18,20 +16,15 @@ function useAuthenticateWithWallet(
|
|
|
18
16
|
> = {},
|
|
19
17
|
) {
|
|
20
18
|
const { address, chainId, connector, networkFamily } = useWalletAccount()
|
|
21
|
-
const { btcAddress } = useBitcoinAccount()
|
|
22
19
|
const { ensureNoSessionAndFetchNonce } = useEnsureNoSessionAndFetchNonce()
|
|
23
20
|
const { createSessionAsync } = useCreateSession()
|
|
24
21
|
const { createAccountAsync } = useCreateAccount()
|
|
25
22
|
const { signMessageAsync } = useSignMessage()
|
|
26
|
-
const walletAddress = useMemo(
|
|
27
|
-
() => (connector?.type === "orangekit" ? btcAddress : address),
|
|
28
|
-
[btcAddress, address, connector],
|
|
29
|
-
)
|
|
30
23
|
|
|
31
|
-
const { refetch: getAccountByAddress } = useGetAccountByAddress(
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
)
|
|
24
|
+
const { refetch: getAccountByAddress } = useGetAccountByAddress(address, {
|
|
25
|
+
enabled: false,
|
|
26
|
+
retry: false,
|
|
27
|
+
})
|
|
35
28
|
|
|
36
29
|
const { mutate, mutateAsync, ...signInMutationRestParameters } = useMutation({
|
|
37
30
|
mutationFn: async () => {
|
|
@@ -42,7 +35,7 @@ function useAuthenticateWithWallet(
|
|
|
42
35
|
const nonce = await ensureNoSessionAndFetchNonce()
|
|
43
36
|
|
|
44
37
|
const messageResult = createSignInWithWalletMessage(
|
|
45
|
-
|
|
38
|
+
address,
|
|
46
39
|
nonce,
|
|
47
40
|
networkFamily,
|
|
48
41
|
chainId,
|