change codeVerifier on codeChallenge

This commit is contained in:
smanylov
2026-01-07 18:13:53 +07:00
parent be98bcba3f
commit fe5fd79d85
4 changed files with 94 additions and 33 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
SESSION_SECRET=odW+sq1yKte/gMgUUu/B/OyXqr45/LMYplPVOlWc+uo= SESSION_SECRET=odW+sq1yKte/gMgUUu/B/OyXqr45/LMYplPVOlWc+uo=
DEV_URL=http://localhost DEV_URL=http://localhost:81
+1 -1
View File
@@ -3,7 +3,7 @@
"version": "0.12.0", "version": "0.12.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev -p 2999", "dev": "next dev -p 80",
"build": "next build", "build": "next build",
"start": "next start -p 2999", "start": "next start -p 2999",
"lint": "eslint" "lint": "eslint"
+4 -3
View File
@@ -5,14 +5,14 @@ import { createSession } from '@/app/actions/session';
import { redirect } from 'next/navigation'; import { redirect } from 'next/navigation';
export async function vkAuthorization(data : any, codeVerifier: string) { export async function vkAuthorization(data : any, codeChallenge: string) {
console.log(data); console.log(data);
console.log(codeVerifier); console.log(codeChallenge);
const { code, state, device_id } = data const { code, state, device_id } = data
try { try {
const response = await fetch(`${API_BASE_URL}/api/v1/vk/authorization/${code}/${state}/${codeVerifier}/${device_id}`, { const response = await fetch(`${API_BASE_URL}/api/v1/vk/authorization/${code}/${state}/${codeChallenge}/${device_id}`, {
method: 'GET', method: 'GET',
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
@@ -21,6 +21,7 @@ export async function vkAuthorization(data : any, codeVerifier: string) {
}); });
if (response.ok) { if (response.ok) {
let parsed = await response.json(); let parsed = await response.json();
console.log(parsed);
if (parsed.message_desc === 'Operation successful') { if (parsed.message_desc === 'Operation successful') {
/* await createSession(parsed.message_body.token, email); */ /* await createSession(parsed.message_body.token, email); */
} else { } else {
+88 -28
View File
@@ -1,15 +1,14 @@
'use client' 'use client'
import { useEffect, useRef, useState } from 'react'; import { useEffect, useState } from 'react';
import * as VKID from '@vkid/sdk'; import * as VKID from '@vkid/sdk';
import { vkAuthorization } from '@/app/actions/vkAuth'; import { vkAuthorization } from '@/app/actions/vkAuth';
export default function VKLogin() { export default function VKLogin() {
let [codeVerifier, setCodeVerifier] = useState(''); const [codeVerifier, setCodeVerifier] = useState<string>('');
const [codeChallenge, setCodeChallenge] = useState<string>('');
const vkButton = useRef<HTMLDivElement>(null) async function generateAuthString() {
function generateAuthString() {
const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-'; const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-';
const minLength = 43; const minLength = 43;
const maxLength = 128; const maxLength = 128;
@@ -26,36 +25,97 @@ export default function VKLogin() {
return result; return result;
} }
async function generateCodeChallenge(codeVerifier: string) {
function clickHandler() { try {
/* alert('Кнопка пока не подключена к бизнес аккаунту!'); */ const encoder = new TextEncoder();
console.log('clickHandler'); const data = encoder.encode(codeVerifier);
console.log(codeVerifier); const digest = await crypto.subtle.digest('SHA-256', data);
VKID.Auth.login() const base64 = btoa(String.fromCharCode(...new Uint8Array(digest)));
.then(vkidOnSuccess) const base64url = base64
.catch(console.error); .replace(/\+/g, '-')
.replace(/\//g, '_')
.replace(/=/g, '');
return base64url;
} catch (error) {
console.error('Error generating code challenge:', error);
throw error;
}
} }
function vkidOnSuccess(data: any) {
async function clickHandler() {
console.log('clickHandler');
console.log('codeChallenge:', codeChallenge);
try {
// Если codeVerifier пустой, генерируем новый
if (!codeVerifier) {
const newCodeVerifier = await generateAuthString();
const newCodeChallenge = await generateCodeChallenge(newCodeVerifier);
setCodeVerifier(newCodeVerifier);
setCodeChallenge(newCodeChallenge);
// Обновляем конфигурацию VKID
VKID.Config.update({
codeChallenge: newCodeChallenge
});
}
// Выполняем авторизацию
const data = await VKID.Auth.login();
vkidOnSuccess(data);
} catch (error) {
console.error('Authorization error:', error);
}
}
async function vkidOnSuccess(data: any) {
console.log('vkidOnSuccess'); console.log('vkidOnSuccess');
console.log(data); console.log('vk data:', data);
console.log(codeVerifier); console.log('codeChallenge :', codeChallenge);
vkAuthorization(data, codeVerifier)
setCodeVerifier(generateAuthString()); vkAuthorization(data, codeChallenge);
const newCodeVerifier = await generateAuthString();
const newCodeChallenge = await generateCodeChallenge(newCodeVerifier);
setCodeVerifier(newCodeVerifier);
setCodeChallenge(newCodeChallenge);
VKID.Config.update({
codeChallenge: newCodeChallenge
});
console.log('new codeChallenge:', newCodeChallenge);
} }
useEffect(() => { useEffect(() => {
setCodeVerifier(generateAuthString()); async function initVKID() {
console.log(codeVerifier); try {
const newCodeVerifier = await generateAuthString();
const newCodeChallenge = await generateCodeChallenge(newCodeVerifier);
VKID.Config.init({ setCodeVerifier(newCodeVerifier);
app: 54389559, setCodeChallenge(newCodeChallenge);
redirectUrl: 'http://localhost',
responseMode: VKID.ConfigResponseMode.Callback, VKID.Config.init({
source: VKID.ConfigSource.LOWCODE, app: 54389559,
scope: 'email phone vkid.personal_info', redirectUrl: 'http://localhost',
codeVerifier: "codeVerifier" responseMode: VKID.ConfigResponseMode.Callback,
}); source: VKID.ConfigSource.LOWCODE,
scope: 'email phone vkid.personal_info',
codeChallenge: newCodeChallenge
});
console.log('Generated codeVerifier:', newCodeVerifier);
console.log('Generated codeChallenge:', newCodeChallenge);
} catch (error) {
console.error('Error initializing VKID:', error);
}
}
initVKID();
}, []); }, []);
return ( return (