@pyrocancode/react-native-vk-auth 0.4.1 → 1.0.1

package/android/src/main/java/com/vkauth/vkid/InitDelegate.kt

@@ -1,13 +1,19 @@
 package com.vkauth.vkid
 
+import android.util.Log
 import com.facebook.react.bridge.ReactApplicationContext
 import com.vkauth.vkid.jsinput.App
 import com.vkauth.vkid.jsinput.VKID
 
 class InitDelegate(
-  private val context: ReactApplicationContext
+  @Suppress("unused") private val context: ReactApplicationContext,
 ) {
   fun initialize(app: App, vkid: VKID) {
-    SuperAppKitInitUtils.initSuperappKit(context, app, vkid)
+    // Конфигурация клиента — через manifest placeholders (VKIDClientID и т.д.) и VKID.init в Application.
+    Log.d(TAG, "initialize mode=${app.mode} appName=${vkid.appName}")
+  }
+
+  private companion object {
+    private const val TAG = "VkAuth"
   }
 }

package/android/src/main/java/com/vkauth/vkid/VkAuthPayload.kt

@@ -0,0 +1,61 @@
+package com.vkauth.vkid
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.vk.id.AccessToken
+import com.vk.id.VKIDUser
+
+/**
+ * Сериализация ответа VK ID SDK в WritableMap для JS (событие onAuth и отладка).
+ * Документация: https://vkcom.github.io/vkid-android-sdk/
+ */
+internal object VkAuthPayload {
+
+  fun fromAccessToken(token: AccessToken): WritableMap {
+    val map = Arguments.createMap()
+    map.putString("type", "authorized")
+    map.putMap("vkid", buildVkidDebugMap(token))
+    return map
+  }
+
+  fun buildVkidDebugMap(token: AccessToken): WritableMap {
+    val vkid = Arguments.createMap()
+    vkid.putString("accessToken", token.token)
+    vkid.putDouble("userID", token.userID.toDouble())
+    vkid.putDouble("expireTime", token.expireTime.toDouble())
+    token.idToken?.let { vkid.putString("idToken", it) }
+    token.scopes?.let { scopes ->
+      val arr = Arguments.createArray()
+      scopes.forEach { arr.pushString(it) }
+      vkid.putArray("scopes", arr)
+    }
+    vkid.putMap("userData", fromVKIDUser(token.userData))
+    return vkid
+  }
+
+  fun fromVKIDUser(user: VKIDUser): WritableMap {
+    val m = Arguments.createMap()
+    m.putString("firstName", user.firstName)
+    m.putString("lastName", user.lastName)
+    user.phone?.let { m.putString("phone", it) }
+    user.email?.let { m.putString("email", it) }
+    user.photo50?.let { m.putString("photo50", it) }
+    user.photo100?.let { m.putString("photo100", it) }
+    user.photo200?.let { m.putString("photo200", it) }
+    return m
+  }
+
+  fun profileForJs(userId: Long, user: VKIDUser): WritableMap {
+    val m = Arguments.createMap()
+    val userIdMap = Arguments.createMap()
+    userIdMap.putString("value", userId.toString())
+    m.putMap("userID", userIdMap)
+    m.putString("firstName", user.firstName)
+    m.putString("lastName", user.lastName)
+    m.putString("phone", user.phone)
+    m.putString("photo200", user.photo200)
+    m.putString("email", user.email)
+    m.putNull("userHash")
+    return m
+  }
+}

package/android/src/main/java/com/vkauth/vkid/VkAuthServiceHolder.kt

@@ -0,0 +1,8 @@
+package com.vkauth.vkid
+
+/**
+ * Общая ссылка на [AuthDelegate] для One Tap view и [com.vkauth.VkAuthModule].
+ */
+internal object VkAuthServiceHolder {
+  var authDelegate: AuthDelegate? = null
+}

package/android/src/main/java/com/vkauth/vkid/onetapbutton/OneTapButtonManager.kt

@@ -1,166 +1,69 @@
 package com.vkauth.vkid.onetapbutton
 
-import android.content.Context
-import android.graphics.Color
+import android.util.Log
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.views.text.ReactTextShadowNode
-import com.vk.auth.ui.fastloginbutton.VkFastLoginButton
+import com.vk.id.onetap.xml.OneTap
+import com.vkauth.vkid.VkAuthServiceHolder
 
-class OneTabButtonManager : SimpleViewManager<VkFastLoginButton>() {
-  override fun getName(): String = COMPONENT_NAME
+/**
+ * VK ID One Tap (XML). См. [OneTap.setCallbacks](https://vkcom.github.io/vkid-android-sdk/onetap-xml/com.vk.id.onetap.xml/-one-tap/set-callbacks.html).
+ */
+class OneTabButtonManager : SimpleViewManager<OneTap>() {
 
-  override fun createShadowNodeInstance(context: ReactApplicationContext): LayoutShadowNode {
-    return ReactTextShadowNode()
-  }
+  override fun getName(): String = COMPONENT_NAME
 
-  override fun createViewInstance(context: ThemedReactContext): VkFastLoginButton {
-    return VkFastLoginButton(context)
+  override fun createViewInstance(context: ThemedReactContext): OneTap {
+    val view = OneTap(context)
+    view.setCallbacks(
+      onAuth = { _, accessToken ->
+        VkAuthServiceHolder.authDelegate?.emitAuthSuccess(accessToken)
+      },
+      onFail = { _, fail ->
+        Log.e(TAG, "OneTap onFail: $fail")
+        VkAuthServiceHolder.authDelegate?.emitAuthFail(fail.toString())
+      },
+    )
+    return view
   }
 
   @ReactProp(name = "backgroundStyle")
-  fun setStyle(view: VkFastLoginButton, style: ReadableMap) {
-    android.util.Log.d(TAG, "setStyle($style)")
-
-    val vkStyle = when (style.getString("style")) {
-      "BLUE" -> VkFastLoginButton.ButtonStyle.BLUE
-      "WHITE" -> VkFastLoginButton.ButtonStyle.WHITE
-      "CUSTOM" -> VkFastLoginButton.ButtonStyle.CUSTOM
-      else -> null
-    } ?: return
-
-    if (vkStyle == VkFastLoginButton.ButtonStyle.CUSTOM) {
-      val vkIconColor = when (style.getString("customVkIconColor")) {
-        "BLUE" -> VkFastLoginButton.VkIconColor.BLUE
-        "WHITE" -> VkFastLoginButton.VkIconColor.WHITE
-        else -> null
-      } ?: return
-
-      view.setCustomStyle(
-        bgColor = Color.parseColor(style.getString("customBackgroundColor")),
-        textColor = Color.parseColor(style.getString("customTextColor")),
-        vkIconColor = vkIconColor
-      )
-    } else {
-      view.setButtonStyle(vkStyle)
-    }
-
+  fun setBackgroundStyle(@Suppress("UNUSED_PARAMETER") view: OneTap, @Suppress("UNUSED_PARAMETER") style: ReadableMap) {
+    // Стили One Tap задаются через [OneTap.style]; при необходимости сопоставьте с [com.vk.id.onetap.common.OneTapStyle].
   }
 
   @ReactProp(name = "iconGravity")
-  fun setGravity(view: VkFastLoginButton, gravity: String) {
-    android.util.Log.d(TAG, "setGravity($gravity)")
-
-    val vkGravity = when (gravity) {
-      "START" -> VkFastLoginButton.VkIconGravity.START
-      "TEXT" -> VkFastLoginButton.VkIconGravity.TEXT
-      else -> null
-    } ?: return
-
-    view.setVkIconGravity(vkGravity)
-  }
+  fun setIconGravity(@Suppress("UNUSED_PARAMETER") view: OneTap, @Suppress("UNUSED_PARAMETER") gravity: String) {}
 
   @ReactProp(name = "firstLineFieldType")
-  fun setFirstLineField(view: VkFastLoginButton, type: String) {
-    android.util.Log.d(TAG, "setFirstLineField($type)")
-
-    val vkType = when (type) {
-      "ACTION" -> VkFastLoginButton.LineFieldType.ACTION
-      "PHONE" -> VkFastLoginButton.LineFieldType.PHONE
-      "NONE" -> VkFastLoginButton.LineFieldType.NONE
-      else -> null
-    } ?: return
-
-    view.setFirstLineField(vkType)
-  }
+  fun setFirstLineField(@Suppress("UNUSED_PARAMETER") view: OneTap, @Suppress("UNUSED_PARAMETER") type: String) {}
 
   @ReactProp(name = "secondLineFieldType")
-  fun setSecondLineField(view: VkFastLoginButton, type: String) {
-    android.util.Log.d(TAG, "setSecondLineField($type)")
-    val vkType = when (type) {
-      "ACTION" -> VkFastLoginButton.LineFieldType.ACTION
-      "PHONE" -> VkFastLoginButton.LineFieldType.PHONE
-      "NONE" -> VkFastLoginButton.LineFieldType.NONE
-      else -> null
-    } ?: return
-
-    view.setSecondLineField(vkType)
-  }
+  fun setSecondLineField(@Suppress("UNUSED_PARAMETER") view: OneTap, @Suppress("UNUSED_PARAMETER") type: String) {}
 
   @ReactProp(name = "oneLineTextSize")
-  fun setOneLineTextSize(view: VkFastLoginButton, size: Float) {
-    android.util.Log.d(TAG, "setOneLineTextSize($size)")
-    view.setOneLineTextSize(size)
-  }
+  fun setOneLineTextSize(@Suppress("UNUSED_PARAMETER") view: OneTap, @Suppress("UNUSED_PARAMETER") size: Float) {}
 
   @ReactProp(name = "firstLineTextSize")
-  fun setFirstLineTextSize(view: VkFastLoginButton, size: Float) {
-    android.util.Log.d(TAG, "setFirstLineTextSize($size)")
-    view.setFirstLineTextSize(size)
-  }
+  fun setFirstLineTextSize(@Suppress("UNUSED_PARAMETER") view: OneTap, @Suppress("UNUSED_PARAMETER") size: Float) {}
 
   @ReactProp(name = "secondLineTextSize")
-  fun setSecondLineTextSize(view: VkFastLoginButton, size: Float) {
-    android.util.Log.d(TAG, "setSecondLineTextSize($size)")
-    view.setSecondLineTextSize(size)
-  }
+  fun setSecondLineTextSize(@Suppress("UNUSED_PARAMETER") view: OneTap, @Suppress("UNUSED_PARAMETER") size: Float) {}
 
   @ReactProp(name = "avatarSize")
-  fun setAvatarSize(view: VkFastLoginButton, size: Float) {
-    android.util.Log.d(TAG, "setAvatarSize($size)")
-
-    view.setAvatarSize(size.toInt())
-  }
+  fun setAvatarSize(@Suppress("UNUSED_PARAMETER") view: OneTap, @Suppress("UNUSED_PARAMETER") size: Float) {}
 
   @ReactProp(name = "iconSize")
-  fun setVkIconSize(view: VkFastLoginButton, size: Float) {
-    android.util.Log.d(TAG, "setVkIconSize($size)")
-    view.setVkIconSize(size.toInt())
-  }
+  fun setVkIconSize(@Suppress("UNUSED_PARAMETER") view: OneTap, @Suppress("UNUSED_PARAMETER") size: Float) {}
 
   @ReactProp(name = "progressSize")
-  fun setProgressSize(view: VkFastLoginButton, size: Float) {
-    android.util.Log.d(TAG, "setProgressSize($size)")
-    view.setProgressSize(size.toInt())
-  }
+  fun setProgressSize(@Suppress("UNUSED_PARAMETER") view: OneTap, @Suppress("UNUSED_PARAMETER") size: Float) {}
 
   @ReactProp(name = "texts")
-  fun setTexts(view: VkFastLoginButton, texts: ReadableMap) {
-    android.util.Log.d(TAG, "setTexts($texts)")
-
-    view.setTextGetter(
-      object : VkFastLoginButton.TextGetter() {
-        override fun getNoUserText(
-          context: Context,
-          actionTextSize: VkFastLoginButton.ActionTextSize
-        ): String {
-          return texts.getString("noUserText") ?: super.getNoUserText(context, VkFastLoginButton.ActionTextSize.BIG)
-        }
-
-        override fun getActionText(
-          context: Context,
-          firstName: String,
-          lastName: String,
-          actionTextSize: VkFastLoginButton.ActionTextSize
-        ): String {
-          val text = texts.getString("actionText")
-            ?.replace("{firstName}", firstName)
-            ?.replace("{lastName}", lastName)
-          return text ?: super.getActionText(context, firstName, lastName, VkFastLoginButton.ActionTextSize.BIG)
-        }
-
-        override fun getPhoneText(context: Context, phone: String): String {
-          val text = texts.getString("phoneText")
-            ?.replace("{phone}", phone)
-          return text ?: super.getPhoneText(context, phone)
-        }
-      }
-    )
-  }
+  fun setTexts(@Suppress("UNUSED_PARAMETER") view: OneTap, @Suppress("UNUSED_PARAMETER") texts: ReadableMap) {}
 
   private companion object {
     private const val COMPONENT_NAME = "RTCVkOneTapButton"

package/ios/Event.swift

@@ -1,7 +1,6 @@
 import Foundation
 import OSLog
-
-@_implementationOnly import VKSDK
+import VKID
 
 extension VkAuth {
     func send(event: Event) {
@@ -25,17 +24,11 @@ struct Event {
         self.event = event
     }
 
-    // MARK: - Accessors
-
     static let onLogout = Self(OnLogout())
 
-    static func onAuth(userSession: VKID.UserSession) -> Self {
+    static func onAuth(userSession: UserSession) -> Self {
         .init(OnAuth(userSession: userSession))
     }
-
-    static func onSilentDataReceive(silentToken: VKID.SilentToken) -> Self {
-        .init(OnSilentDataReceive(silentToken: silentToken))
-    }
 }
 
 extension Event: CustomStringConvertible {
@@ -54,17 +47,8 @@ extension Event {
         let name = "onAuth"
         let body: Any
 
-        init(userSession: VKID.UserSession) {
+        init(userSession: UserSession) {
             self.body = userSession.dictionary
         }
     }
-
-    private struct OnSilentDataReceive: RCTEvent {
-        let name = "onSilentDataReceive"
-        let body: Any
-
-        init(silentToken: VKID.SilentToken) {
-            self.body = ["token": ["value": silentToken.token.value], "uuid": silentToken.uuid]
-        }
-    }
 }

package/ios/RCTDomain.swift

@@ -1,26 +1,30 @@
 import Foundation
-
-@_implementationOnly import VKSDK
+import VKID
 
 protocol RCTDomain {
     var dictionary: [String: Any?] { get }
 }
 
-extension VKID.Profile: RCTDomain {
-    #warning("Use value instead of description for userID")
-    var dictionary: [String : Any?] {
+extension User: RCTDomain {
+    var dictionary: [String: Any?] {
         [
-            "userID": ["value": self.id.description],
-            "firstName": self.name?.firstName,
-            "lastName": self.name?.lastName,
-            "phone": self.phoneMask,
-            "photo200": self.image?.url?.absoluteString
+            "userID": ["value": String(self.id.value)],
+            "firstName": self.firstName,
+            "lastName": self.lastName,
+            "phone": self.phone,
+            "photo200": self.avatarURL?.absoluteString,
+            "email": self.email,
+            "userHash": nil,
         ]
     }
 }
 
-extension VKID.UserSession: RCTDomain {
-    var dictionary: [String : Any?] {
-        ["type": self.authorized == nil ? "authenticated" : "authorized"]
+extension UserSession {
+    var dictionary: [String: Any?] {
+        [
+            "type": "authorized",
+            "userId": String(self.userId.value),
+            "accessToken": self.accessToken.value,
+        ]
     }
 }

package/ios/VkAuth.swift

@@ -1,22 +1,40 @@
 import UIKit
 import OSLog
+import React
+import VKID
+import VKIDCore
+
+// MARK: - Общие хелперы (VK ID SDK 2.x, OAuth 2.1)
+
+fileprivate func vkAuthTopViewController() -> UIViewController? {
+    let keyWindow: UIWindow?
+    if #available(iOS 13.0, *) {
+        keyWindow = UIApplication.shared.connectedScenes
+            .compactMap { $0 as? UIWindowScene }
+            .flatMap(\.windows)
+            .first { $0.isKeyWindow }
+    } else {
+        keyWindow = UIApplication.shared.keyWindow
+    }
+    guard var top = keyWindow?.rootViewController else { return nil }
+    while let presented = top.presentedViewController {
+        top = presented
+    }
+    return top
+}
 
-@_implementationOnly import VKSDK
+/// Публичный клиент + PKCE внутри SDK. Для обмена кода на бэкенде позже можно сменить на `confidentialClientFlow`.
+fileprivate func vkAuthMakeConfiguration() -> AuthConfiguration {
+    AuthConfiguration(
+        flow: .publicClientFlow(),
+        scope: Scope([])
+    )
+}
 
+/// React Native мост для VK ID SDK. См. https://id.vk.com/about/business/go/docs/ru/vkid/latest/vk-id/connection/migration/ios/migration-ios
 @objc(VkAuth)
 final class VkAuth: RCTEventEmitter {
-    private static var _sharedSDK: VKSDK.VK.Type2<App, VKID>? // DO NOT USE THIS DIRECTLY
-    fileprivate static var _sharedSuperappKit: VkAuth?
-
-    fileprivate static var sharedSDK: VKSDK.VK.Type2<App, VKID> {
-        guard let _shared = Self._sharedSDK else {
-            fatalError("VKSDK is not initialized. Call initialize(_:vkid:) method before using VkAuth.")
-        }
-
-        return _shared
-    }
-
-    private var activeAuthCompletion: ((Result<VKSDK.VKID.AccessToken, Error>) -> Void)?
+    fileprivate static weak var _sharedEmitter: VkAuth?
 
     @objc(initialize:vkid:)
     func initialize(_ app: NSDictionary, vkid: NSDictionary) {
@@ -30,50 +48,50 @@ final class VkAuth: RCTEventEmitter {
         }
 
         do {
-            Self._sharedSDK = try VK {
-                App(credentials: .init(clientId: clientId, clientSecret: clientSecret))
-                VKID()
-            }
-            Self._sharedSuperappKit = self
+            try VKID.shared.set(
+                config: Configuration(
+                    appCredentials: AppCredentials(
+                        clientId: clientId,
+                        clientSecret: clientSecret
+                    )
+                )
+            )
+            VkAuth._sharedEmitter = self
+            VKID.shared.add(observer: self)
         } catch {
-            os_log("VKSDK initialization failed", type: .error, error.localizedDescription)
+            os_log("VKID initialization failed: %{public}@", type: .error, error.localizedDescription)
         }
     }
 
     @objc(openURL:)
-    func openURL(_ url: String) {
-        guard let url = URL(string: url) else {
-            return
-        }
-
-        try? Self.sharedSDK.open(url: url)
+    func openURL(_ urlString: String) {
+        guard let url = URL(string: urlString) else { return }
+        _ = VKID.shared.open(url: url)
     }
 
-    // MARK: - Auth
-
     @objc func startAuth() {
-        let flow = VKID.AuthFlow.exchanging(tokenExchanger: .custom(weak: self))
-        let authController = VKID.AuthController(flow: flow, delegate: self)
-
-        let viewController = try! Self.sharedSDK.vkid.ui(for: authController).uiViewController()
-        UIApplication.shared.keyWindow?.rootViewController?.present(viewController, animated: true)
+        guard let presenter = vkAuthTopViewController() else {
+            os_log("No presenter for VKID authorize", type: .error)
+            return
+        }
+        VKID.shared.authorize(
+            with: vkAuthMakeConfiguration(),
+            using: .uiViewController(presenter)
+        ) { _ in }
     }
 
     @objc func closeAuth() {
-        UIApplication.shared.keyWindow?.rootViewController?.dismiss(animated: true)
-        os_log("Authorization closed", type: .info)
+        vkAuthTopViewController()?.dismiss(animated: true)
+        os_log("Authorization UI dismissed", type: .info)
     }
 
     @objc func logout() {
-        guard let userSession = Self.sharedSDK.vkid.userSessions.first else {
-            return
-        }
-
-        userSession.authorized?.logout { [weak self] _ in
-            self?.send(event: .onLogout)
+        guard let session = VKID.shared.authorizedSessions.first else { return }
+        session.logout { [weak self] result in
+            if case .success = result {
+                self?.send(event: .onLogout)
+            }
         }
-
-        os_log("Logout user session", type: .info, "\(userSession)")
     }
 
     @objc(getUserSessions:rejecter:)
@@ -81,7 +99,7 @@ final class VkAuth: RCTEventEmitter {
         resolver resolve: RCTPromiseResolveBlock,
         rejecter reject: RCTPromiseRejectBlock
     ) {
-        resolve(Self.sharedSDK.vkid.userSessions.map(\.dictionary))
+        resolve(VKID.shared.authorizedSessions.map(\.dictionary))
     }
 
     @objc(getUserProfile:rejecter:)
@@ -89,92 +107,90 @@ final class VkAuth: RCTEventEmitter {
         resolver resolve: @escaping RCTPromiseResolveBlock,
         rejecter reject: @escaping RCTPromiseRejectBlock
     ) {
-        guard let authorized = Self.sharedSDK.vkid.userSessions.first?.authorized else {
-            reject(nil, nil, nil)
+        guard let session = VKID.shared.authorizedSessions.first else {
+            reject("no_session", "No authorized VK ID session", nil)
             return
         }
-
-        authorized.requestProfile { result in
-            do {
-                let profile = try result.get()
-                resolve(profile.dictionary)
-            } catch {
-                reject(nil, nil, nil)
+        session.fetchUser { result in
+            switch result {
+            case .success:
+                if let user = session.user {
+                    resolve(user.dictionary)
+                } else {
+                    resolve(["userID": ["value": String(session.userId.value)]])
+                }
+            case .failure(let error):
+                reject("profile_failed", error.localizedDescription, error)
             }
         }
     }
-}
-
-extension VkAuth: TokenExchanging {
-    func exchange(silentToken: VKSDK.VKID.SilentToken, completion: @escaping (Result<VKSDK.VKID.AccessToken, Error>) -> Void) {
-        self.activeAuthCompletion = completion
-        self.send(event: .onSilentDataReceive(silentToken: silentToken))
-    }
 
     @objc(accessTokenChangedSuccess:userId:)
     func accessTokenChangedSuccess(_ token: String, userId: NSNumber) {
-        let accessToken = VKID.AccessToken(.init(token), userID: .init(userId.uint64Value))
-        self.activeAuthCompletion?(.success(accessToken))
-        self.activeAuthCompletion = nil
-        
-        os_log("Token exchange succeeded", type: .info)
+        os_log("accessTokenChangedSuccess ignored on VK ID iOS (no silent exchange)", type: .info)
     }
 
     @objc(accessTokenChangedFailed:)
     func accessTokenChangedFailed(_ error: NSDictionary) {
-        let reactError = NSError(domain: "React Native", code: -9999, userInfo: error as! [String : Any])
-        self.activeAuthCompletion?(.failure(reactError))
-        self.activeAuthCompletion = nil
+        os_log("accessTokenChangedFailed ignored on VK ID iOS", type: .info)
+    }
 
-        os_log("Token exchange failed", type: .error, reactError.localizedDescription)
+    @objc(supportedEvents)
+    override func supportedEvents() -> [String]! {
+        ["onLogout", "onAuth"]
     }
 }
 
-extension VkAuth: VKIDFlowDelegate {
-    func vkid(_ vkid: VKSDK.VKID.Module, didCompleteAuthWith result: Result<VKSDK.VKID.UserSession, Error>) {
+extension VkAuth: VKIDObserver {
+    func vkid(_ vkid: VKID, didCompleteAuthWith result: AuthResult, in oAuth: OAuthProvider) {
         do {
-            self.send(event: .onAuth(userSession: try result.get()))
+            let session = try result.get()
+            send(event: .onAuth(userSession: session))
+        } catch AuthError.cancelled {
+            os_log("VKID auth cancelled", type: .info)
         } catch {
-            os_log("Authorization failed", type: .error, error.localizedDescription)
+            os_log("VKID auth failed: %{public}@", type: .error, error.localizedDescription)
         }
     }
+
+    func vkid(_ vkid: VKID, didLogoutFrom session: UserSession, with result: LogoutResult) {
+        if case .success = result {
+            send(event: .onLogout)
+        }
+    }
+
+    func vkid(_ vkid: VKID, didStartAuthUsing oAuth: OAuthProvider) {}
+
+    func vkid(_ vkid: VKID, didUpdateUserIn session: UserSession, with result: UserFetchingResult) {}
+
+    func vkid(_ vkid: VKID, didRefreshAccessTokenIn session: UserSession, with result: TokenRefreshingResult) {}
 }
 
 @objc(RTCVkOneTapButton)
 final class OneTapButtonManager: RCTViewManager {
     override func view() -> UIView! {
-        guard let sharedSuperappKit = VkAuth._sharedSuperappKit else {
-            fatalError("VkAuth is not initialized. Call initialize(_:vkid:) method before using VkAuth.")
+        guard VkAuth._sharedEmitter != nil else {
+            os_log("VkAuth not initialized before OneTap", type: .fault)
             return UIView()
         }
-        var authPresenter: VKSDK.UIKitPresenter = .newUIWindow
-        if let root = UIApplication.shared.keyWindow?.rootViewController {
-            authPresenter = .uiViewController(root)
+        guard let root = vkAuthTopViewController() else {
+            return UIView()
         }
 
-        let flow = VKID.AuthFlow.exchanging(tokenExchanger: .custom(weak: sharedSuperappKit))
-        let authController = VKID.AuthController(flow: flow, delegate: sharedSuperappKit)
-
-        let button = VKID.OneTapButton(
-            mode: .default,
-            controllerConfiguration: .authController(
-                authController,
-                presenter: authPresenter
-            )
+        let button = OneTapButton(
+            layout: .regular(
+                height: .medium(.h44),
+                cornerRadius: 8
+            ),
+            presenter: .uiViewController(root),
+            authConfiguration: vkAuthMakeConfiguration(),
+            onCompleteAuth: nil
         )
 
-        guard let buttonView = try? VkAuth.sharedSDK.vkid.ui(for: button).uiView() else {
-            fatalError("OneTapButton configuration problem")
+        guard let view = try? VKID.shared.ui(for: button).uiView() else {
+            os_log("OneTapButton uiView failed", type: .error)
             return UIView()
         }
-
-        return buttonView
-    }
-}
-
-extension VkAuth {
-    @objc(supportedEvents)
-    override func supportedEvents() -> [String] {
-        ["onLogout", "onAuth", "onSilentDataReceive"]
+        return view
     }
 }