@reown/appkit-controllers 1.8.9 → 1.8.10-wallet-button-fix.0
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.
- package/dist/esm/src/utils/ConnectorControllerUtil.js +36 -54
- package/dist/esm/src/utils/ConnectorControllerUtil.js.map +1 -1
- package/dist/esm/tests/utils/ConnectorControllerUtil.test.js +54 -4
- package/dist/esm/tests/utils/ConnectorControllerUtil.test.js.map +1 -1
- package/dist/esm/tsconfig.tsbuildinfo +1 -1
- package/dist/types/src/utils/ConnectorControllerUtil.d.ts +1 -1
- package/package.json +3 -3
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
/* eslint-disable max-depth */
|
|
2
|
-
import { ref } from 'valtio';
|
|
3
2
|
import { ParseUtil } from '@reown/appkit-common';
|
|
4
3
|
import { ConstantsUtil as CommonConstantsUtil } from '@reown/appkit-common';
|
|
5
4
|
import { W3mFrameRpcConstants } from '@reown/appkit-wallet/utils';
|
|
@@ -66,10 +65,8 @@ export const ConnectorControllerUtil = {
|
|
|
66
65
|
});
|
|
67
66
|
});
|
|
68
67
|
},
|
|
69
|
-
connectSocial({ social, namespace, closeModalOnConnect = true, onOpenFarcaster, onConnect }) {
|
|
70
|
-
|
|
71
|
-
let socialWindow = accountData?.socialWindow;
|
|
72
|
-
let socialProvider = accountData?.socialProvider;
|
|
68
|
+
connectSocial({ social: socialProvider, namespace, closeModalOnConnect = true, onOpenFarcaster, onConnect }) {
|
|
69
|
+
let socialWindow = undefined;
|
|
73
70
|
let isConnectingSocial = false;
|
|
74
71
|
let popupWindow = null;
|
|
75
72
|
const namespaceToUse = namespace || ChainController.state.activeChain;
|
|
@@ -89,54 +86,45 @@ export const ConnectorControllerUtil = {
|
|
|
89
86
|
try {
|
|
90
87
|
const authConnector = ConnectorController.getAuthConnector(namespaceToUse);
|
|
91
88
|
if (authConnector && !isConnectingSocial) {
|
|
92
|
-
const _accountData = ChainController.getAccountData(namespaceToUse);
|
|
93
89
|
if (socialWindow) {
|
|
94
90
|
socialWindow.close();
|
|
95
|
-
ChainController.setAccountProp('socialWindow', undefined, namespaceToUse);
|
|
96
|
-
socialWindow = _accountData?.socialWindow;
|
|
97
91
|
}
|
|
98
92
|
isConnectingSocial = true;
|
|
99
93
|
const uri = event.data.resultUri;
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
if (!caipAddress) {
|
|
116
|
-
reject(new Error('Failed to connect'));
|
|
117
|
-
return;
|
|
118
|
-
}
|
|
119
|
-
resolve(ParseUtil.parseCaipAddress(caipAddress));
|
|
120
|
-
EventsController.sendEvent({
|
|
121
|
-
type: 'track',
|
|
122
|
-
event: 'SOCIAL_LOGIN_SUCCESS',
|
|
123
|
-
properties: { provider: socialProvider }
|
|
124
|
-
});
|
|
94
|
+
EventsController.sendEvent({
|
|
95
|
+
type: 'track',
|
|
96
|
+
event: 'SOCIAL_LOGIN_REQUEST_USER_DATA',
|
|
97
|
+
properties: { provider: socialProvider }
|
|
98
|
+
});
|
|
99
|
+
StorageUtil.setConnectedSocialProvider(socialProvider);
|
|
100
|
+
await ConnectionController.connectExternal({
|
|
101
|
+
id: authConnector.id,
|
|
102
|
+
type: authConnector.type,
|
|
103
|
+
socialUri: uri
|
|
104
|
+
}, authConnector.chain);
|
|
105
|
+
const caipAddress = ChainController.state.activeCaipAddress;
|
|
106
|
+
if (!caipAddress) {
|
|
107
|
+
reject(new Error('Failed to connect'));
|
|
108
|
+
return;
|
|
125
109
|
}
|
|
126
|
-
|
|
127
|
-
}
|
|
128
|
-
catch (err) {
|
|
129
|
-
if (socialProvider) {
|
|
110
|
+
resolve(ParseUtil.parseCaipAddress(caipAddress));
|
|
130
111
|
EventsController.sendEvent({
|
|
131
112
|
type: 'track',
|
|
132
|
-
event: '
|
|
133
|
-
properties: { provider: socialProvider
|
|
113
|
+
event: 'SOCIAL_LOGIN_SUCCESS',
|
|
114
|
+
properties: { provider: socialProvider }
|
|
134
115
|
});
|
|
135
116
|
}
|
|
117
|
+
}
|
|
118
|
+
catch (err) {
|
|
119
|
+
EventsController.sendEvent({
|
|
120
|
+
type: 'track',
|
|
121
|
+
event: 'SOCIAL_LOGIN_ERROR',
|
|
122
|
+
properties: { provider: socialProvider, message: CoreHelperUtil.parseError(err) }
|
|
123
|
+
});
|
|
136
124
|
reject(new Error('Failed to connect'));
|
|
137
125
|
}
|
|
138
126
|
}
|
|
139
|
-
else
|
|
127
|
+
else {
|
|
140
128
|
EventsController.sendEvent({
|
|
141
129
|
type: 'track',
|
|
142
130
|
event: 'SOCIAL_LOGIN_ERROR',
|
|
@@ -146,20 +134,15 @@ export const ConnectorControllerUtil = {
|
|
|
146
134
|
}
|
|
147
135
|
}
|
|
148
136
|
async function connectSocial() {
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
type: 'track',
|
|
155
|
-
event: 'SOCIAL_LOGIN_STARTED',
|
|
156
|
-
properties: { provider: socialProvider }
|
|
157
|
-
});
|
|
158
|
-
}
|
|
137
|
+
EventsController.sendEvent({
|
|
138
|
+
type: 'track',
|
|
139
|
+
event: 'SOCIAL_LOGIN_STARTED',
|
|
140
|
+
properties: { provider: socialProvider }
|
|
141
|
+
});
|
|
159
142
|
if (socialProvider === 'farcaster') {
|
|
160
143
|
onOpenFarcaster?.();
|
|
161
144
|
const unsubscribeModalController = ModalController.subscribeKey('open', val => {
|
|
162
|
-
if (!val &&
|
|
145
|
+
if (!val && socialProvider === 'farcaster') {
|
|
163
146
|
reject(new Error('Popup closed'));
|
|
164
147
|
onConnect?.();
|
|
165
148
|
unsubscribeModalController();
|
|
@@ -183,14 +166,13 @@ export const ConnectorControllerUtil = {
|
|
|
183
166
|
const authConnector = ConnectorController.getAuthConnector();
|
|
184
167
|
popupWindow = CoreHelperUtil.returnOpenHref(`${CommonConstantsUtil.SECURE_SITE_SDK_ORIGIN}/loading`, 'popupWindow', 'width=600,height=800,scrollbars=yes');
|
|
185
168
|
try {
|
|
186
|
-
if (authConnector
|
|
169
|
+
if (authConnector) {
|
|
187
170
|
const { uri } = await authConnector.provider.getSocialRedirectUri({
|
|
188
171
|
provider: socialProvider
|
|
189
172
|
});
|
|
190
173
|
if (popupWindow && uri) {
|
|
191
|
-
ChainController.setAccountProp('socialWindow', ref(popupWindow), namespaceToUse);
|
|
192
|
-
socialWindow = accountData?.socialWindow;
|
|
193
174
|
popupWindow.location.href = uri;
|
|
175
|
+
socialWindow = popupWindow;
|
|
194
176
|
const interval = setInterval(() => {
|
|
195
177
|
if (socialWindow?.closed && !isConnectingSocial) {
|
|
196
178
|
reject(new Error('Popup closed'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectorControllerUtil.js","sourceRoot":"","sources":["../../../../src/utils/ConnectorControllerUtil.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,OAAO,
|
|
1
|
+
{"version":3,"file":"ConnectorControllerUtil.js","sourceRoot":"","sources":["../../../../src/utils/ConnectorControllerUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import { describe, expect, it, vi } from 'vitest';
|
|
1
|
+
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
2
2
|
import { ConstantsUtil as CommonConstantsUtil } from '@reown/appkit-common';
|
|
3
|
-
import { StorageUtil } from '../../exports/index.js';
|
|
4
|
-
import { ConnectorController } from '../../src/controllers/ConnectorController.js';
|
|
5
|
-
import { ModalController } from '../../src/controllers/ModalController.js';
|
|
3
|
+
import { ChainController, ConnectorController, EventsController, ModalController, StorageUtil } from '../../exports/index.js';
|
|
6
4
|
import { ConnectorControllerUtil } from '../../src/utils/ConnectorControllerUtil.js';
|
|
7
5
|
describe('checkNamespaceConnectorId', () => {
|
|
8
6
|
it('should return true if the namespace is associated with the specified connector id', () => {
|
|
@@ -41,4 +39,56 @@ describe('updateEmail', () => {
|
|
|
41
39
|
}));
|
|
42
40
|
});
|
|
43
41
|
});
|
|
42
|
+
describe('connectSocial', () => {
|
|
43
|
+
const mockNamespace = 'eip155';
|
|
44
|
+
const mockSocialProvider = 'google';
|
|
45
|
+
const mockPopupWindow = {
|
|
46
|
+
close: vi.fn(),
|
|
47
|
+
closed: false,
|
|
48
|
+
location: { href: '' }
|
|
49
|
+
};
|
|
50
|
+
beforeEach(() => {
|
|
51
|
+
vi.restoreAllMocks();
|
|
52
|
+
vi.spyOn(ChainController, 'state', 'get').mockReturnValue({
|
|
53
|
+
...ChainController.state,
|
|
54
|
+
activeChain: mockNamespace,
|
|
55
|
+
chains: new Map([
|
|
56
|
+
[
|
|
57
|
+
mockNamespace,
|
|
58
|
+
{
|
|
59
|
+
accountState: {
|
|
60
|
+
socialProvider: mockSocialProvider,
|
|
61
|
+
socialWindow: mockPopupWindow
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
]
|
|
65
|
+
])
|
|
66
|
+
});
|
|
67
|
+
vi.spyOn(ConnectorController, 'getAuthConnector').mockReturnValue({
|
|
68
|
+
id: CommonConstantsUtil.CONNECTOR_ID.AUTH,
|
|
69
|
+
type: 'AUTH',
|
|
70
|
+
chain: mockNamespace,
|
|
71
|
+
provider: {
|
|
72
|
+
getSocialRedirectUri: vi.fn().mockResolvedValue({ uri: 'https://reown.com' }),
|
|
73
|
+
getFarcasterUri: vi.fn().mockResolvedValue({ url: 'https://reown.com' })
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
vi.spyOn(EventsController, 'sendEvent').mockImplementation(vi.fn());
|
|
77
|
+
vi.spyOn(ModalController, 'close').mockImplementation(vi.fn());
|
|
78
|
+
vi.spyOn(window, 'open').mockReturnValue(mockPopupWindow);
|
|
79
|
+
});
|
|
80
|
+
it('should call getSocialRedirectUri from auth provider when calling connectSocial', async () => {
|
|
81
|
+
const mockAuthConnector = ConnectorController.getAuthConnector();
|
|
82
|
+
const getSocialRedirectUriSpy = vi.spyOn(mockAuthConnector.provider, 'getSocialRedirectUri');
|
|
83
|
+
ConnectorControllerUtil.connectSocial({
|
|
84
|
+
social: mockSocialProvider,
|
|
85
|
+
namespace: mockNamespace
|
|
86
|
+
});
|
|
87
|
+
await vi.waitFor(() => {
|
|
88
|
+
expect(getSocialRedirectUriSpy).toHaveBeenCalledWith({
|
|
89
|
+
provider: mockSocialProvider
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
});
|
|
44
94
|
//# sourceMappingURL=ConnectorControllerUtil.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectorControllerUtil.test.js","sourceRoot":"","sources":["../../../../tests/utils/ConnectorControllerUtil.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"ConnectorControllerUtil.test.js","sourceRoot":"","sources":["../../../../tests/utils/ConnectorControllerUtil.test.ts"],"names":[],"mappings":"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"}
|