Skip to content

Commit 5d913aa

Browse files
vgrichinavgrichina
authored
Merge pull request #8 from vgrichina/wallet-selector
Allow login with different wallets
2 parents e8adc68 + 23ac2d1 commit 5d913aa

15 files changed

+59680
-177
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
node_modules
22
neardev
3-
dist
3+
/dist
44
.DS_Store
55
*.pem
66
.nyc_output

‎app.js

+106-71
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
const {
22
connect,
33
keyStores: { InMemoryKeyStore },
4-
transactions: { Transaction, functionCall },
54
KeyPair,
65
} = require('near-api-js');
7-
const { PublicKey } = require('near-api-js/lib/utils');
8-
const { signInURL, signTransactionsURL } = require('./util/web-wallet-api');
96

107
const fetch = require('node-fetch');
118
const qs = require('qs');
@@ -66,14 +63,14 @@ const getRawBody = require('raw-body');
6663

6764
const FAST_NEAR_URL = process.env.FAST_NEAR_URL;
6865

69-
const callViewFunction = async ({ near }, contractId, methodName, methodParams) => {
66+
const callViewFunction = async ({ near }, contractId, methodName, args) => {
7067
if (FAST_NEAR_URL) {
7168
const res = await fetch(`${FAST_NEAR_URL}/account/${contractId}/view/${methodName}`, {
7269
method: 'POST',
7370
headers: {
7471
'Content-Type': 'application/json'
7572
},
76-
body: JSON.stringify(methodParams)
73+
body: JSON.stringify(args)
7774
});
7875
if (!res.ok) {
7976
throw new Error(await res.text());
@@ -82,7 +79,7 @@ const callViewFunction = async ({ near }, contractId, methodName, methodParams)
8279
}
8380

8481
const account = await near.account(contractId);
85-
return await account.viewFunction(contractId, methodName, methodParams);
82+
return await account.viewFunction({ contractId, methodName, args });
8683
}
8784

8885
router.get('/web4/contract/:contractId/:methodName', withNear, async ctx => {
@@ -100,26 +97,36 @@ router.get('/web4/contract/:contractId/:methodName', withNear, async ctx => {
10097
ctx.body = await callViewFunction(ctx, contractId, methodName, methodParams);
10198
});
10299

100+
const fs = require('fs/promises');
101+
102+
// TODO: Less hacky templating?
103+
async function renderTemplate(templatePath, params) {
104+
let result = await fs.readFile(`${__dirname}/${templatePath}`, 'utf8');
105+
for (key of Object.keys(params)) {
106+
result = result.replace(`$${key}$`, JSON.stringify(params[key]));
107+
}
108+
return result;
109+
}
110+
103111
router.get('/web4/login', withNear, withContractId, async ctx => {
104112
let {
105113
contractId,
106114
query: { web4_callback_url, web4_contract_id }
107115
} = ctx;
108116

109-
const keyPair = KeyPair.fromRandom('ed25519');
110-
ctx.cookies.set('web4_private_key', keyPair.toString(), { httpOnly: false });
111-
ctx.cookies.set('web4_account_id', null, { httpOnly: false });
112-
113117
const callbackUrl = new URL(web4_callback_url || ctx.get('referrer') || '/', ctx.origin).toString();
114118

115-
const loginCompleteUrl = `${ctx.origin}/web4/login/complete?${qs.stringify({ web4_callback_url: callbackUrl })}`;
116-
ctx.redirect(signInURL({
117-
walletUrl: config.walletUrl,
118-
contractId: web4_contract_id || contractId,
119-
publicKey: keyPair.getPublicKey().toString(),
120-
successUrl: loginCompleteUrl,
121-
failureUrl: loginCompleteUrl
122-
}));
119+
ctx.type = 'text/html';
120+
ctx.body = await renderTemplate('wallet-adapter/login.html', {
121+
CONTRACT_ID: web4_contract_id || contractId,
122+
CALLBACK_URL: callbackUrl,
123+
NETWORK_ID: ctx.near.connection.networkId,
124+
});
125+
});
126+
127+
router.get('/web4/wallet-adapter.js', async ctx => {
128+
ctx.type = 'text/javascript';
129+
ctx.body = await fs.readFile(`${__dirname}/wallet-adapter/dist/wallet-adapter.js`);
123130
});
124131

125132
router.get('/web4/login/complete', async ctx => {
@@ -134,6 +141,29 @@ router.get('/web4/login/complete', async ctx => {
134141
ctx.redirect(web4_callback_url);
135142
});
136143

144+
router.get('/web4/sign', withAccountId, requireAccountId, async ctx => {
145+
const {
146+
query: {
147+
web4_contract_id,
148+
web4_method_name,
149+
web4_args,
150+
web4_gas,
151+
web4_deposit,
152+
web4_callback_url
153+
}
154+
} = ctx;
155+
156+
ctx.type = 'text/html';
157+
ctx.body = await renderTemplate('wallet-adapter/sign.html', {
158+
CONTRACT_ID: web4_contract_id,
159+
METHOD_NAME: web4_method_name,
160+
ARGS: web4_args,
161+
GAS: web4_gas,
162+
DEPOSIT: web4_deposit,
163+
CALLBACK_URL: web4_callback_url
164+
});
165+
});
166+
137167
router.get('/web4/logout', async ctx => {
138168
let {
139169
query: { web4_callback_url }
@@ -167,6 +197,7 @@ router.post('/web4/contract/:contractId/:methodName', withNear, withAccountId, r
167197
.filter(key => !key.startsWith('web4_'))
168198
.map(key => ({ [key]: body[key] }))
169199
.reduce((a, b) => ({...a, ...b}), {});
200+
args = Buffer.from(JSON.stringify(args));
170201
// TODO: Allow to pass web4_ stuff in headers as well
171202
if (body.web4_gas) {
172203
gas = body.web4_gas;
@@ -194,60 +225,67 @@ router.post('/web4/contract/:contractId/:methodName', withNear, withAccountId, r
194225
const near = await connect({ ...ctx.near.config, keyStore: appKeyStore });
195226

196227
debug('Checking access key', keyPair.getPublicKey().toString());
197-
const { permission: { FunctionCall }} = await near.connection.provider.query({
198-
request_type: 'view_access_key',
199-
account_id: accountId,
200-
public_key: keyPair.getPublicKey().toString(),
201-
finality: 'optimistic'
202-
});
203-
if (FunctionCall && FunctionCall.receiver_id == contractId) {
204-
debug('Access key found');
205-
const account = await near.account(accountId);
206-
const result = await account.functionCall({ contractId, methodName, args, gas, deposit });
207-
debug('Result', result);
208-
// TODO: when used from fetch, etc shouldn't really redirect. Judge based on Accepts header?
209-
if (ctx.request.type == 'application/x-www-form-urlencoded') {
210-
ctx.redirect(callbackUrl);
211-
// TODO: Pass transaction hashes, etc to callback?
212-
} else {
213-
const { status } = result;
214-
215-
if (status?.SuccessValue !== undefined) {
216-
const callResult = Buffer.from(status.SuccessValue, 'base64')
217-
debug('Call succeeded with result', callResult);
218-
// TODO: Detect content type from returned result
219-
ctx.type = 'application/json';
220-
ctx.status = 200;
221-
ctx.body = callResult;
222-
// TODO: Return extra info in headers like tx hash, etc
223-
return;
228+
try {
229+
// TODO: Migrate towards fast-near REST API
230+
const { permission: { FunctionCall }} = await near.connection.provider.query({
231+
request_type: 'view_access_key',
232+
account_id: accountId,
233+
public_key: keyPair.getPublicKey().toString(),
234+
finality: 'optimistic'
235+
});
236+
if (FunctionCall && FunctionCall.receiver_id == contractId) {
237+
debug('Access key found');
238+
const account = await near.account(accountId);
239+
const result = await account.functionCall({ contractId, methodName, args, gas, deposit });
240+
debug('Result', result);
241+
// TODO: when used from fetch, etc shouldn't really redirect. Judge based on Accepts header?
242+
if (ctx.request.type == 'application/x-www-form-urlencoded') {
243+
ctx.redirect(callbackUrl);
244+
// TODO: Pass transaction hashes, etc to callback?
245+
} else {
246+
const { status } = result;
247+
248+
if (status?.SuccessValue !== undefined) {
249+
const callResult = Buffer.from(status.SuccessValue, 'base64')
250+
debug('Call succeeded with result', callResult);
251+
// TODO: Detect content type from returned result
252+
ctx.type = 'application/json';
253+
ctx.status = 200;
254+
ctx.body = callResult;
255+
// TODO: Return extra info in headers like tx hash, etc
256+
return;
257+
}
258+
259+
debug('Call failed with result', result);
260+
// TODO: Decide what exactly to return
261+
ctx.status = 409;
262+
ctx.body = result;
224263
}
225-
226-
debug('Call failed with result', result);
227-
// TODO: Decide what exactly to return
228-
ctx.status = 409;
229-
ctx.body = result;
264+
return;
230265
}
231-
return;
266+
} catch (e) {
267+
if (!e.toString().includes('does not exist while viewing')) {
268+
debug('Error checking access key', e);
269+
throw e;
270+
}
271+
272+
debug('Access key not found, falling back to wallet');
232273
}
233274
}
234275

235-
// NOTE: publicKey, nonce, blockHash keys are faked as reconstructed by wallet
236-
const transaction = new Transaction({
237-
signerId: accountId,
238-
publicKey: new PublicKey({ type: 0, data: Buffer.from(new Array(32))}),
239-
nonce: 0,
240-
receiverId: contractId,
241-
actions: [
242-
functionCall(methodName, args, gas, deposit)
243-
],
244-
blockHash: Buffer.from(new Array(32))
245-
});
246-
const url = signTransactionsURL({
247-
walletUrl: config.walletUrl,
248-
transactions: [transaction],
249-
callbackUrl
250-
});
276+
debug('Signing with wallet');
277+
278+
const url = `/web4/sign?${
279+
qs.stringify({
280+
web4_contract_id: contractId,
281+
web4_method_name: methodName,
282+
web4_args: Buffer.from(args).toString('base64'),
283+
web4_contract_id: contractId,
284+
web4_gas: gas,
285+
web4_deposit: deposit,
286+
web4_callback_url: callbackUrl
287+
})}`;
288+
debug('Redirecting to', url);
251289
ctx.redirect(url);
252290
// TODO: Need to do something else than wallet redirect for CORS-enabled fetch
253291
});
@@ -272,7 +310,7 @@ async function withContractId(ctx, next) {
272310
try {
273311
const addresses = await dns.resolveCname(host);
274312
const address = addresses.find(contractFromHost);
275-
if (address) {
313+
if (address) {
276314
contractId = contractFromHost(address);
277315
break;
278316
}
@@ -331,9 +369,6 @@ router.get('/(.*)', withNear, withContractId, withAccountId, async ctx => {
331369
}
332370
}
333371

334-
if (e.toString().includes('block height')) {
335-
console.error('error', e);
336-
}
337372
throw e;
338373
}
339374

‎config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function getConfig(env) {
1717
case 'development':
1818
case 'testnet':
1919
return {
20-
networkId: 'default',
20+
networkId: 'testnet',
2121
nodeUrl: 'https://rpc.testnet.near.org',
2222
contractName: CONTRACT_NAME,
2323
walletUrl: 'https://wallet.testnet.near.org',

0 commit comments

Comments
 (0)