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

package/src/index.tsx

@@ -20,12 +20,12 @@ interface VkAuthModule extends NativeModule {
   startAuth: () => void;
   closeAuth: () => void;
   logout: () => void;
-  getUserSessions: () => void;
-  initialize: (app: VK.App, vkid: VKID) => void;
+  getUserSessions: () => Promise<Array<{ type: string }>>;
+  initialize: (app: VK.App, vkid: VKIDInitPayload) => void;
   openURL: (url: string) => void;
 
-  accessTokenChangedSuccess: (token: string, userId: bigint) => void;
-  accessTokenChangedFailed: (error: Error) => void;
+  accessTokenChangedSuccess: (token: string, userId: number) => void;
+  accessTokenChangedFailed: (error: Record<string, unknown>) => void;
 }
 
 const VkAuth: VkAuthModule = NativeModules.VkAuth
@@ -39,9 +39,22 @@ const VkAuth: VkAuthModule = NativeModules.VkAuth
       }
     );
 
+/** Плоский объект для нативного моста (см. jsinput/VKID.kt). */
+export type VKIDInitPayload = {
+  appName: string;
+  appVersion: string;
+  appIcon: ImageResolvedAssetSource;
+  appLinks: VKID.Links;
+};
+
 export class VK {
   static initialize(app: VK.App, vkid: VKID) {
-    VkAuth.initialize(app, vkid);
+    VkAuth.initialize(app, {
+      appName: vkid.appName,
+      appVersion: vkid.appVersion,
+      appIcon: vkid.appIcon,
+      appLinks: vkid.appLinks,
+    });
   }
 
   static openURL(url: string) {
@@ -67,43 +80,81 @@ export namespace VK {
   }
 }
 
+function parseOnAuthPayload(
+  raw: Record<string, unknown>
+): { kind: 'error'; message: string } | { kind: 'ok'; payload: VKID.AuthSuccessPayload } {
+  if (raw.type === 'error') {
+    return {
+      kind: 'error',
+      message: String(raw.error ?? 'VK ID authorization failed'),
+    };
+  }
+
+  if (raw.type === 'authorized') {
+    const vkid = raw.vkid as Record<string, unknown> | undefined;
+    if (vkid && typeof vkid.accessToken === 'string') {
+      const uid =
+        vkid.userID != null && String(vkid.userID) !== ''
+          ? String(vkid.userID)
+          : profileUserIdFromProfile(raw.profile);
+      if (!uid) {
+        return { kind: 'error', message: 'VK user id missing in auth payload' };
+      }
+      return {
+        kind: 'ok',
+        payload: {
+          accessToken: vkid.accessToken,
+          userId: uid,
+          profile: raw.profile as VKID.UserProfile | undefined,
+          vkidNative: vkid,
+        },
+      };
+    }
+
+    if (typeof raw.accessToken === 'string' && typeof raw.userId === 'string') {
+      if (!raw.userId) {
+        return { kind: 'error', message: 'VK user id missing in auth payload' };
+      }
+      return {
+        kind: 'ok',
+        payload: {
+          accessToken: raw.accessToken,
+          userId: raw.userId,
+          profile: raw.profile as VKID.UserProfile | undefined,
+        },
+      };
+    }
+  }
+
+  return { kind: 'error', message: 'Unexpected VK auth payload' };
+}
+
+function profileUserIdFromProfile(profile: unknown): string {
+  if (!profile || typeof profile !== 'object') {
+    return '';
+  }
+  const u = (profile as { userID?: { value?: string } }).userID;
+  return u?.value != null ? String(u.value) : '';
+}
+
 export class VKID {
   readonly appName: string;
   readonly appVersion: string;
   readonly appIcon: ImageResolvedAssetSource;
   readonly appLinks: VKID.Links;
-  private readonly silentTokenExchanger: VKID.SilentTokenExchanger;
   private readonly eventEmitter: NativeEventEmitter;
 
   constructor(
     appName: string,
     appVersion: string,
     appIcon: ImageResolvedAssetSource,
-    appLinks: VKID.Links,
-    silentTokenExchanger: VKID.SilentTokenExchanger
+    appLinks: VKID.Links
   ) {
     this.appName = appName;
     this.appVersion = appVersion;
     this.appIcon = appIcon;
     this.appLinks = appLinks;
-    this.silentTokenExchanger = silentTokenExchanger;
     this.eventEmitter = new NativeEventEmitter(VkAuth);
-
-    this.initSilentDataReceive();
-  }
-
-  private initSilentDataReceive() {
-    this.eventEmitter.removeAllListeners('onSilentDataReceive');
-    this.eventEmitter.addListener(
-      'onSilentDataReceive',
-      async (silentToken: VKID.SilentToken) => {
-        let exchangeResult: VKID.TokenExchangeResult =
-          await this.silentTokenExchanger.exchange(silentToken).catch(() => {
-            return { ok: false, error: Error('Exchange failed') };
-          });
-        VKID.accessTokenChanged(exchangeResult);
-      }
-    );
   }
 
   startAuth() {
@@ -123,12 +174,8 @@ export class VKID {
   }
 
   userSessions(): Promise<Array<VKID.Session.UserSession>> {
-    // @ts-ignore
-    let promise: Promise<Array<UserSessionInternal.UserSession>> =
-      VkAuth.getUserSessions();
-    return promise.then((sessions) => {
-      return sessions.map((session) => {
-        console.log(session);
+    return VkAuth.getUserSessions().then(sessions => {
+      return sessions.map(session => {
         return session.type === UserSessionInternal.Type.AUTHORIZED
           ? new VKID.Session.Authorized()
           : new VKID.Session.Authenticated();
@@ -136,38 +183,26 @@ export class VKID {
     });
   }
 
-  setOnAuthChanged(onAuthChanged: VKID.AuthChangedCallback) {
+  setOnAuthChanged(callbacks: VKID.AuthChangedCallback) {
     this.eventEmitter.removeAllListeners('onLogout');
     this.eventEmitter.removeAllListeners('onAuth');
 
     this.eventEmitter.addListener('onLogout', () => {
-      onAuthChanged.onLogout();
+      callbacks.onLogout();
     });
+
     this.eventEmitter.addListener(
       'onAuth',
-      (session: UserSessionInternal.UserSession) => {
-        console.log(session);
-        let externalSession =
-          session.type === UserSessionInternal.Type.AUTHORIZED
-            ? new VKID.Session.Authorized()
-            : new VKID.Session.Authenticated();
-        onAuthChanged.onAuth(externalSession);
+      (raw: Record<string, unknown>) => {
+        const parsed = parseOnAuthPayload(raw);
+        if (parsed.kind === 'error') {
+          callbacks.onAuthFailed?.(parsed.message);
+          return;
+        }
+        callbacks.onAuthorized(parsed.payload);
       }
     );
   }
-
-  private static accessTokenChanged(
-    result: VKID.TokenExchangeResult<VKID.AccessToken, Error>
-  ) {
-    if (result.ok) {
-      VkAuth.accessTokenChangedSuccess(
-        result.accessToken.token.value,
-        result.accessToken.userID.value
-      );
-    } else {
-      VkAuth.accessTokenChangedFailed(result.error);
-    }
-  }
 }
 
 export namespace VKID {
@@ -187,24 +222,6 @@ export namespace VKID {
     }
   }
 
-  export interface SilentToken {
-    token: Token;
-    uuid: string;
-    firstName: string;
-    lastName: string;
-  }
-
-  export interface SilentTokenExchanger {
-    exchange(
-      silentData: VKID.SilentToken
-    ): Promise<VKID.TokenExchangeResult<VKID.AccessToken, Error>>;
-  }
-
-  export interface AccessToken {
-    token: Token;
-    userID: UserID;
-  }
-
   export interface Links {
     serviceUserAgreement: string;
     servicePrivacyPolicy: string;
@@ -221,10 +238,19 @@ export namespace VKID {
     userHash: string | null;
   }
 
-  export interface AuthChangedCallback {
-    onAuth(userSession: VKID.Session.UserSession): void;
+  /** Успешная авторизация VK ID (OAuth 2.1): access token и id пользователя VK. */
+  export interface AuthSuccessPayload {
+    accessToken: string;
+    userId: string;
+    profile?: UserProfile;
+    /** Android: полный ответ VK ID SDK (отладка). */
+    vkidNative?: Record<string, unknown>;
+  }
 
+  export interface AuthChangedCallback {
+    onAuthorized(payload: AuthSuccessPayload): void;
     onLogout(): void;
+    onAuthFailed?(message: string): void;
   }
 
   export namespace Session {
@@ -250,10 +276,6 @@ export namespace VKID {
       }
     }
   }
-
-  export type TokenExchangeResult<T = VKID.AccessToken, E = Error> =
-    | { ok: true; accessToken: T }
-    | { ok: false; error: E };
 }
 
 namespace UserSessionInternal {

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

@@ -1,33 +0,0 @@
-package com.vkauth.vkid
-
-import com.facebook.react.bridge.ReactApplicationContext
-import com.vk.auth.main.SilentAuthSource
-import com.vk.auth.main.VkFastLoginModifiedUser
-import com.vk.auth.main.VkSilentTokenExchanger
-import com.vkauth.vkid.dto.SilentAuthInfo
-import com.vkauth.vkid.dto.Token
-import com.vkauth.vkid.jstutils.JsCbSender
-
-internal class JSSilentTokenExchanger(
-  private val context: ReactApplicationContext
-) : VkSilentTokenExchanger {
-  private val jsCallbackSender = JsCbSender()
-
-  override fun exchangeSilentToken(
-    user: com.vk.silentauth.SilentAuthInfo,
-    modifiedUser: VkFastLoginModifiedUser?,
-    source: SilentAuthSource
-  ): VkSilentTokenExchanger.Result {
-    jsCallbackSender.sendCallback(context, SILENT_DATA_EVENT, SilentAuthInfo(
-      silentToken = Token(user.token),
-      uuid = user.uuid,
-      firstName = user.firstName,
-      lastName = user.lastName,
-    ).toMap())
-    return VkSilentTokenExchanger.Result.Success(accessToken = "will be exchanged in js part", uid = 1)
-  }
-
-  private companion object {
-    private const val SILENT_DATA_EVENT = "onSilentDataReceive"
-  }
-}

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

@@ -1,75 +0,0 @@
-package com.vkauth.vkid
-
-import android.app.Application
-import android.content.Context
-import android.content.res.Resources
-import android.graphics.BitmapFactory
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
-import android.net.Uri
-import com.facebook.react.bridge.ReactApplicationContext
-import com.vk.auth.main.VkClientAuthLibConfig
-import com.vk.auth.main.VkClientLibverifyInfo
-import com.vk.auth.main.VkClientUiInfo
-import com.vk.superapp.SuperappKit
-import com.vk.superapp.SuperappKitConfig
-import com.vk.superapp.core.SuperappConfig
-import com.vkauth.vkid.jsinput.App
-import com.vkauth.vkid.jsinput.VKID
-import java.net.URL
-
-internal object SuperAppKitInitUtils {
-  private const val DRAWABLE_DEF_TYPE = "drawable"
-  private val HTTP_SCHEMES = listOf("http", "https")
-
-  fun initSuperappKit(reactAppContext: ReactApplicationContext, app: App, vkid: VKID) {
-    if (SuperappKit.isInitialized()) {
-      return
-    }
-
-    val appInfo = SuperappConfig.AppInfo(
-      appName = vkid.appName,
-      appVersion = vkid.appVersion,
-      appId = app.credentials.clientId,
-    )
-
-    val logo = resolveLogoUri(reactAppContext, Uri.parse(vkid.icon.getString("uri")))
-
-    val builder = SuperappKitConfig.Builder(reactAppContext.applicationContext as Application)
-      .setAuthModelData(
-        VkClientAuthLibConfig.AuthModelData(
-          clientSecret = app.credentials.clientSecret,
-          libverifyInfo = VkClientLibverifyInfo.disabled(),
-          ignoreSuccessAuth = true
-        )
-      )
-      .setAuthUiManagerData(VkClientUiInfo(icon48 = logo, icon56 = logo, appName = vkid.appName))
-      .setLegalInfoLinks(
-        serviceUserAgreement = vkid.links.serviceUserAgreement,
-        servicePrivacyPolicy = vkid.links.servicePrivacyPolicy,
-        serviceSupport = vkid.links.serviceSupport
-      )
-      .setApplicationInfo(appInfo)
-      .setSilentTokenExchanger(JSSilentTokenExchanger(reactAppContext))
-      .sslPinningEnabled(false)
-      .build()
-
-    SuperappKit.init(builder)
-  }
-
-  private fun resolveLogoUri(context: Context, uri: Uri): Drawable {
-    return if (uri.scheme in HTTP_SCHEMES) {
-      URL(uri.toString()).openConnection()
-        .apply { connect() }
-        .getInputStream()
-        .use {
-          BitmapDrawable(Resources.getSystem(), BitmapFactory.decodeStream(it))
-        }
-    } else {
-      val fileName = uri.toString()
-      val resourceId = context.resources.getIdentifier(fileName, DRAWABLE_DEF_TYPE, context.packageName)
-      val bitmap = BitmapFactory.decodeResource(context.resources, resourceId)
-      BitmapDrawable(Resources.getSystem(), bitmap)
-    }
-  }
-}

package/android/src/main/java/com/vkauth/vkid/dto/AcessToken.kt

@@ -1,19 +0,0 @@
-package com.vkauth.vkid.dto
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.WritableMap
-import com.vk.dto.common.id.UserId
-import com.vkauth.vkid.jstutils.JsOutputParam
-
-internal data class AccessToken(
-  val token: Token,
-  val userId: UserId
-) : JsOutputParam {
-
-  override fun toMap(): WritableMap {
-    return Arguments.createMap().apply {
-      putMap("token", token.toMap())
-      putMap("userId", userId.toMap())
-    }
-  }
-}

package/android/src/main/java/com/vkauth/vkid/dto/DtoExt.kt

@@ -1,24 +0,0 @@
-package com.vkauth.vkid.dto
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.WritableMap
-import com.vk.auth.main.VkClientAuthLib
-import com.vk.dto.common.id.UserId
-import com.vk.superapp.api.dto.account.ProfileShortInfo
-
-fun UserId.toMap(): WritableMap {
-  return Arguments.createMap().apply {
-    putDouble("value", value.toDouble())
-  }
-}
-
-fun ProfileShortInfo.toMap(): WritableMap {
-  return Arguments.createMap().apply {
-    putMap("userID", VkClientAuthLib.getUserId().toMap())
-    putString("firstName", firstName)
-    putString("lastName", lastName)
-    putString("phone", phone)
-    putString("photo200", photo200)
-    putString("userHash", userHash)
-  }
-}

package/android/src/main/java/com/vkauth/vkid/dto/SilentAuthInfo.kt

@@ -1,22 +0,0 @@
-package com.vkauth.vkid.dto
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.WritableMap
-import com.vkauth.vkid.jstutils.JsOutputParam
-
-
-internal data class SilentAuthInfo(
-  val silentToken: Token,
-  val uuid: String,
-  val firstName: String,
-  val lastName: String,
-) : JsOutputParam {
-  override fun toMap(): WritableMap {
-    return Arguments.createMap().apply {
-      putMap("token", silentToken.toMap())
-      putString("uuid", uuid)
-      putString("firstName", firstName)
-      putString("lastName", lastName)
-    }
-  }
-}

package/android/src/main/java/com/vkauth/vkid/dto/Token.kt

@@ -1,15 +0,0 @@
-package com.vkauth.vkid.dto
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.WritableMap
-import com.vkauth.vkid.jstutils.JsOutputParam
-
-internal data class Token(
-  val value: String
-) : JsOutputParam {
-  override fun toMap(): WritableMap {
-    return Arguments.createMap().apply {
-      putString("value", value)
-    }
-  }
-}

package/android/src/main/java/com/vkauth/vkid/dto/UserSession.kt

@@ -1,28 +0,0 @@
-package com.vkauth.vkid.dto
-
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.WritableMap
-import com.vkauth.vkid.jstutils.JsOutputParam
-
-internal sealed class UserSession(val type: String) : JsOutputParam {
-  object Authorized: UserSession(AUTHORIZED) {
-    override fun toMap(): WritableMap {
-      return Arguments.createMap().apply {
-        putString("type", type)
-      }
-    }
-  }
-
-  object Authenticated : UserSession(AUTHENTICATED) {
-    override fun toMap(): WritableMap {
-      return Arguments.createMap().apply {
-        putString("type", type)
-      }
-    }
-  }
-
-  private companion object {
-    private const val AUTHORIZED = "authorized"
-    private const val AUTHENTICATED = "authenticated"
-  }
-}

package/android/src/main/java/com/vkauth/vkid/jstutils/JsCbSender.kt

@@ -1,16 +0,0 @@
-package com.vkauth.vkid.jstutils
-
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.modules.core.DeviceEventManagerModule
-
-class JsCbSender {
-  fun sendCallback(
-    context: ReactContext,
-    callbackName: String,
-    callbackParams: WritableMap?
-  ) {
-    context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-      .emit(callbackName, callbackParams)
-  }
-}

package/android/src/main/java/com/vkauth/vkid/jstutils/JsOutputParam.kt

@@ -1,7 +0,0 @@
-package com.vkauth.vkid.jstutils
-
-import com.facebook.react.bridge.WritableMap
-
-internal interface JsOutputParam {
-  fun toMap(): WritableMap
-}