From 2ce80eeaef46b1c17475aa949bb962818abe0a68d307f766577e8810c09f8609 Mon Sep 17 00:00:00 2001 From: AidarKC Date: Thu, 29 Oct 2026 13:24:05 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5=20HEA?= =?UTF-8?q?DER-=D0=B1=D0=BB=D0=BE=D0=BA=D0=B0=20=D0=BF=D0=BE=D1=81=D0=BB?= =?UTF-8?q?=D0=B5=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION.properties | 2 +- .../js/pages/registration-payment-view.js | 9 +++ .../registration-header-bootstrap.test.mjs | 79 +++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 shine-UI/tests/registration-header-bootstrap.test.mjs diff --git a/VERSION.properties b/VERSION.properties index d8f7aacd..414fe225 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.20.10 +client.version=1.20.11 server.version=1.16.10 diff --git a/shine-UI/js/pages/registration-payment-view.js b/shine-UI/js/pages/registration-payment-view.js index 2228d117..b6d1e092 100644 --- a/shine-UI/js/pages/registration-payment-view.js +++ b/shine-UI/js/pages/registration-payment-view.js @@ -114,6 +114,15 @@ export async function completeRegistrationLogin({ navigate, keyBundle }) { storagePwd: resumedStoragePwd, }); + // Создаём HEADER сразу после успешной регистрации (Solana и Arweave). + // При сбое регистрация остаётся успешной: перед первым блоком AddBlock + // повторно создаст отсутствующий HEADER существующим механизмом. + try { + await authService.ensureBlockchainHeader(resumedLogin, resumedStoragePwd); + } catch (error) { + console.warn('Не удалось создать HEADER после регистрации; повторим перед первым блоком', error); + } + state.loginDraft.login = resumedLogin; state.loginDraft.password = ''; state.loginDraft.passwordMode = 'single'; diff --git a/shine-UI/tests/registration-header-bootstrap.test.mjs b/shine-UI/tests/registration-header-bootstrap.test.mjs new file mode 100644 index 00000000..bf6abcc5 --- /dev/null +++ b/shine-UI/tests/registration-header-bootstrap.test.mjs @@ -0,0 +1,79 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import fs from 'node:fs'; + +const paymentView = fs.readFileSync(new URL('../js/pages/registration-payment-view.js', import.meta.url), 'utf8'); +const emailView = fs.readFileSync(new URL('../js/pages/registration-email-view.js', import.meta.url), 'utf8'); +const authService = fs.readFileSync(new URL('../js/services/auth-service.js', import.meta.url), 'utf8'); +const finish = paymentView.split('export async function completeRegistrationLogin')[1]?.split('\nexport function render(')[0] || ''; + +test('Solana и Arweave используют единое завершение регистрации', () => { + assert.match(paymentView, /await completeRegistrationLogin\(\{ navigate, keyBundle \}\)/); + assert.match(emailView, /await completeRegistrationLogin\(\{navigate,keyBundle:draft\.preGeneratedKeyBundle\}\)/); +}); + +test('после авторизации на завершении регистрации создаётся HEADER с актуальными логином и ключом', () => { + assert.match(finish, /authorizeSession\(\{[\s\S]*?login: resumedLogin,[\s\S]*?storagePwd: resumedStoragePwd,[\s\S]*?\}\);[\s\S]*?await authService\.ensureBlockchainHeader\(resumedLogin, resumedStoragePwd\)/); + assert.equal((finish.match(/ensureBlockchainHeader\(/g) || []).length, 1); +}); + +test('сбой HEADER не отменяет регистрацию; защита перед первым блоком сохранена', () => { + assert.match(finish, /try \{\s*await authService\.ensureBlockchainHeader\(resumedLogin, resumedStoragePwd\);\s*\} catch \(error\) \{[\s\S]*?console\.warn\(/); + assert.match(authService, /if \(!_skipHeaderEnsure && !isHeader\) \{\s*await this\.ensureBlockchainHeader\(cleanLogin, storagePwd\)/); +}); + +// Проверяем выполнение настоящей функции с изолированными зависимостями: +// ошибка HEADER не должна прерывать завершение регистрации. +async function simulateCompletion({ headerFails = false } = {}) { + const vm = await import('node:vm'); + const calls = []; + const state = { + entrySettings: { shineServer: 'wss://test.invalid' }, + registrationDraft: { login: 'AlexSmith@shine', password: 'secret' }, + loginDraft: {}, + registrationPayment: {}, + authReturnHash: '', + }; + const authService = { + async reconnect() {}, + async createSessionForExistingUser() { + return { login: 'AlexSmith@shine', storagePwd: 'stored', sessionId: 'test-session', sessionMaterial: {} }; + }, + async persistSelectedKeys() {}, + async persistSessionMaterial() {}, + async resumeSession() { + return { login: 'AlexSmith@shine', storagePwd: 'stored', sessionId: 'test-session' }; + }, + async ensureBlockchainHeader(login, storagePwd) { + calls.push(['header', login, storagePwd]); + if (headerFails) throw new Error('temporary error'); + }, + }; + const context = { + authService, + state, + EMPTY_PASSWORD_WORDS: Array(12).fill(''), + clearStoredMessages: async () => {}, + authorizeSession: ({ login }) => calls.push(['authorized', login]), + refreshSessions: async () => calls.push(['refreshed']), + setAuthInfo: () => calls.push(['info']), + console: { warn: (...args) => calls.push(['warning', ...args]) }, + }; + const func = vm.runInNewContext(`async function completeRegistrationLogin${finish}\ncompleteRegistrationLogin`, context); + await func({ keyBundle: {}, navigate: target => calls.push(['navigate', target]) }); + return { calls, state }; +} + +test('после регистрации HEADER отправляется до открытия профиля', async () => { + const { calls } = await simulateCompletion(); + assert.deepEqual(calls[0], ['authorized', 'AlexSmith@shine']); + assert.deepEqual(calls[1], ['header', 'AlexSmith@shine', 'stored']); + assert.deepEqual(calls.at(-1), ['navigate', 'profile-view']); +}); + +test('при ошибке HEADER регистрацию не откатываем и остаёмся в аккаунте', async () => { + const { calls, state } = await simulateCompletion({ headerFails: true }); + assert.ok(calls.some(item => item[0] === 'warning')); + assert.deepEqual(calls.at(-1), ['navigate', 'profile-view']); + assert.equal(state.registrationDraft.password, ''); +});