@rownd/react-native 0.2.5 → 2.2.0

package/LICENSE

@@ -1,7 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Matt Hamann
-
+Copyright (c) 2022 rownd
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

package/README.md

@@ -13,59 +13,49 @@ First, install the Rownd SDK for React Native.
 npm install @rownd/react-native
 ```
 
-Due to some native peer-dependencies, you'll also need to run the following command to get modules with native code working properly.
+### Android
 
-> If you already use `react-native-gesture-handler` and/or `react-native-reanimated` run the following command:
-
-  ```sh
-  npm install @gorhom/bottom-sheet@2 @react-native-clipboard/clipboard \
-  react-native-device-info react-native-gesture-handler@1 react-native-mmkv \
-  react-native-reanimated@1 react-native-sha256 react-native-svg
-  ```
-
-> If you **do not** use the aforementioned libraries _or_ are on v2.x, run this command instead:
-
-  ```sh
-  npm install @gorhom/bottom-sheet @react-native-clipboard/clipboard \
-  react-native-device-info react-native-gesture-handler react-native-mmkv \
-  react-native-reanimated react-native-sha256 react-native-svg
-  ```
+```sh
+cd android
+```
+```sh
+./gradlew build
+```
 
+### iOS
 
-Once those are installed, run this command to ensure the iOS build can find the native components.
+Add the code below to ios/Podfile. Place inside target
+```
+dynamic_frameworks = ['Sodium']
+  pre_install do |installer|
+    installer.pod_targets.each do |pod|
+      if dynamic_frameworks.include?(pod.name)
+        puts "Overriding the dynamic_framework? method for #{pod.name}"
+        def pod.dynamic_framework?;
+          true
+        end
+        def pod.build_type;
+          Pod::BuildType.dynamic_framework
+        end
+      end
+    end
+  end
+```
+On command line run:
 
 ```sh
-npx pod-install
+cd ios
+```
+```sh
+pod install
 ```
 
 ## Setup
 
 ### Enable deep linking
 Rownd supports automatically signing-in users when they initially install your
-app or when they click a sign-in link when the app is already installed.
-
-In order to enable the latter case, the Rownd SDK needs to know which URL
-triggered the app to launch, in case it was one of the special sign-in links.
-
-To enable this functionality, follow [the instructions for configuring a
-React Native app to receive deep links.](https://reactnative.dev/docs/linking)
-### Add Gesture Handler
+app or when they click a sign-in link when the app is already installed. 
 
-Unless you already use `react-native-gesture-handler', include it within your app's root, wrapping your component tree like this:
-
-```tsx
-import { GestureHandlerRootView } from 'react-native-gesture-handler';
-
-// ...
-
-export default function Root() {
-  return (
-    <GestureHandlerRootView>
-      <App />
-    </GestureHandlerRootView>
-  );
-}
-```
 
 ## Usage
 The Rownd SDK includes a context provider that will enable any component of your app to access authentication state and user data.
@@ -79,11 +69,9 @@ import { RowndProvider } from "@rownd/react-native";
 
 export default function Root() {
   return (
-    <GestureHandlerRootView>
-      <RowndProvider appKey="<your app key>">
+      <RowndProvider config={{appKey:"<your app key>"}}>
         <App />
       </RowndProvider>
-    </GestureHandlerRootView>
   );
 }
 ```
@@ -92,7 +80,7 @@ Later on within your app's components, you can use the Rownd hook to access the
 
 ```tsx
 import { View, Text } from 'react-native';
-import { useRownd } from '@rownd/react';
+import { useRownd } from '@rownd/react-native';
 
 export default function MyProtectedComponent(props) {
   const { is_authenticated, user, requestSignIn, getAccessToken } = useRownd();
@@ -136,15 +124,9 @@ Trigger the Rownd sign in dialog
 ```javascript
 const { requestSignIn } = useRownd();
 
-requestSignIn({
-    auto_sign_in: false,                           // optional
-    identifier: 'me@company.com' || '+19105551212' // optional
-});
+requestSignIn();
 ```
 
-* `auto_sign_in: boolean` - when `true`, automatically trigger a sign-in attempt _if_ `identifier` is included or an email address or phone number has already been set in the user data.
-* `identifier: string` - an email address or phone number (in E164 format) to which a verification message may be sent. If the Rownd app is configured to allow unverified users, then sign-in will complete without verification if the user has not signed in previously.
-
 #### signOut()
 
 Sign out the user and clear their profile, returning them to a completely unauthenticated state.

package/android/build.gradle

@@ -1,59 +1,149 @@
 buildscript {
-    if (project == rootProject) {
-        repositories {
-            google()
-            mavenCentral()
-            jcenter()
-        }
+  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
+  def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['RowndPlugin_kotlinVersion']
 
-        dependencies {
-            classpath 'com.android.tools.build:gradle:3.5.3'
-        }
-    }
+  repositories {
+      google()
+      mavenCentral()
+  }
+
+  dependencies {
+    classpath 'com.android.tools.build:gradle:3.5.3'
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+  }
+}
+
+def isNewArchitectureEnabled() {
+  return rootProject.hasProperty("newArchEnabled") &&  rootProject.getProperty("newArchEnabled") == "true"
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlinx-serialization'
+
+if (isNewArchitectureEnabled()) {
+  apply plugin: 'com.facebook.react'
+}
 
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['RowndPlugin_' + name]
+}
+
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['RowndPlugin_' + name]).toInteger()
 }
 
 android {
-    compileSdkVersion safeExtGet('ReactNative_compileSdkVersion', 29)
-    defaultConfig {
-        minSdkVersion safeExtGet('ReactNative_minSdkVersion', 16)
-        targetSdkVersion safeExtGet('ReactNative_targetSdkVersion', 29)
-        versionCode 1
-        versionName "1.0"
+  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
 
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault('minSdkVersion')
+    targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+  }
+  buildTypes {
+    release {
+      minifyEnabled false
     }
+  }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
-    lintOptions {
-        disable 'GradleCompatible'
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+  lintOptions {
+    disable 'GradleCompatible'
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
 }
 
 repositories {
-    mavenLocal()
+  mavenCentral()
+  google()
+
+  def found = false
+  def defaultDir = null
+  def androidSourcesName = 'React Native sources'
+
+  if (rootProject.ext.has('reactNativeAndroidRoot')) {
+    defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
+  } else {
+    defaultDir = new File(
+      projectDir,
+      '/../../../node_modules/react-native/android'
+    )
+  }
+
+  if (defaultDir.exists()) {
     maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url("$rootDir/../node_modules/react-native/android")
+      url defaultDir.toString()
+      name androidSourcesName
     }
-    google()
-    mavenCentral()
-    jcenter()
+
+    logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
+    found = true
+  } else {
+    def parentDir = rootProject.projectDir
+
+    1.upto(5, {
+      if (found) return true
+      parentDir = parentDir.parentFile
+
+      def androidSourcesDir = new File(
+        parentDir,
+        'node_modules/react-native'
+      )
+
+      def androidPrebuiltBinaryDir = new File(
+        parentDir,
+        'node_modules/react-native/android'
+      )
+
+      if (androidPrebuiltBinaryDir.exists()) {
+        maven {
+          url androidPrebuiltBinaryDir.toString()
+          name androidSourcesName
+        }
+
+        logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
+        found = true
+      } else if (androidSourcesDir.exists()) {
+        maven {
+          url androidSourcesDir.toString()
+          name androidSourcesName
+        }
+
+        logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
+        found = true
+      }
+    })
+  }
+
+  if (!found) {
+    throw new GradleException(
+      "${project.name}: unable to locate React Native android sources. " +
+      "Ensure you have you installed React Native as a dependency in your project and try again."
+    )
+  }
 }
 
+def kotlin_version = getExtOrDefault('kotlinVersion')
+
 dependencies {
     //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"  // From node_modules
+  implementation "com.facebook.react:react-native:+"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+  implementation 'io.rownd:android:1.3.2'
+  implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
+// From node_modules
+}
+
+if (isNewArchitectureEnabled()) {
+  react {
+    jsRootDir = file("../src/")
+    libraryName = "RowndPlugin"
+    codegenJavaPackageName = "com.reactnativerowndplugin"
+  }
 }

package/android/gradle.properties

@@ -0,0 +1,5 @@
+RowndPlugin_kotlinVersion=1.7.0
+RowndPlugin_minSdkVersion=21
+RowndPlugin_targetSdkVersion=31
+RowndPlugin_compileSdkVersion=31
+RowndPlugin_ndkversion=21.4.7075529

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.reactnative">
+          package="com.reactnativerowndplugin">
 
 </manifest>

package/android/src/main/java/com/reactnativerowndplugin/RowndPluginModule.kt

@@ -0,0 +1,98 @@
+package com.reactnativerowndplugin
+
+import android.os.Handler
+import android.os.Looper
+import androidx.fragment.app.FragmentActivity
+import com.facebook.react.bridge.*
+import com.facebook.react.modules.core.DeviceEventManagerModule
+import io.rownd.android.Rownd
+import io.rownd.android.models.repos.GlobalState
+import io.rownd.android.models.repos.UserRepo
+import kotlinx.coroutines.*
+import kotlinx.serialization.json.Json
+
+
+class RowndPluginModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+    private var uiThreadHandler = Handler(Looper.getMainLooper())
+    private var coroutineScope: Job? = null
+    private var isRowndJSInitialized = false
+
+    override fun getName(): String {
+      return "RowndPlugin"
+    }
+
+    private fun sendEvent(reactContext: ReactContext, eventName: String, params: WritableMap?) {
+      reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+      .emit(eventName, params)
+    }
+
+    init {
+      coroutineScope = CoroutineScope(Dispatchers.IO).launch {
+        Rownd.state.collect {
+          uiThreadHandler.post{
+            val params = Arguments.createMap().apply {
+              putString("state", Json.encodeToString(GlobalState.serializer(), it))
+            }
+            if (isRowndJSInitialized) {
+              sendEvent(reactApplicationContext, "update_state", params)
+            } else {
+              println("ROWND JS: NOT INITIALIZED YET")
+            }
+          }
+        }
+      }
+    }
+
+    // Example method
+    // See https://reactnative.dev/docs/native-modules-android
+    @ReactMethod
+    fun multiply(a: Int, b: Int, promise: Promise) {
+         promise.resolve(a * b * 10)
+    }
+
+    @ReactMethod
+    fun configure(appKey: String) {
+      Rownd.configure(reactApplicationContext.currentActivity as FragmentActivity, appKey)
+      isRowndJSInitialized = true
+    }
+
+    @ReactMethod
+    fun requestSignIn() {
+      Rownd.requestSignIn()
+    }
+
+    @ReactMethod
+    fun signOut() {
+      Rownd.signOut()
+    }
+
+    @ReactMethod
+    fun manageAccount() {
+      Rownd.manageAccount()
+    }
+
+    @ReactMethod
+    fun setUserData(data: ReadableMap) {
+      UserRepo.set(data.toHashMap())
+    }
+
+    @ReactMethod
+    fun setUserDataValue(key: String, array: ReadableMap) {
+      val value = array.toHashMap().entries.find { it.key == "value" }?.value
+      if (value != null) {
+        UserRepo.set(key, value)
+      } else {
+        println("ROWND ANDROID PLUGIN: Missing content for value")
+      }
+    }
+
+//    @ReactMethod
+//    suspend fun getAccessToken(promise: Promise) {
+//      try {
+//        val accessToken = Rownd.getAccessToken()
+//        promise.resolve(accessToken ?: "")
+//      } catch (e: Throwable) {
+//        promise.reject("GET_ACCESS_TOKEN_ERROR: ", e)
+//      }
+//    }
+}

package/android/src/main/java/com/reactnativerowndplugin/RowndPluginPackage.kt

@@ -0,0 +1,16 @@
+package com.reactnativerowndplugin
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ViewManager
+
+
+class RowndPluginPackage : ReactPackage {
+    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+        return listOf(RowndPluginModule(reactContext))
+    }
+
+    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+        return emptyList()
+    }
+}

package/ios/{ReactNative.xcodeproj → Rownd.xcodeproj}/project.pbxproj

@@ -7,9 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-
 		5E555C0D2413F4C50049A1A2 /* ReactNative.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* ReactNative.m */; };
-
+		F4FF95D7245B92E800C19C63 /*  ReactNative.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FF95D6245B92E800C19C63 /*  ReactNative.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -26,10 +25,9 @@
 
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libReactNative.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libReactNative.a; sourceTree = BUILT_PRODUCTS_DIR; };
-
-		B3E7B5881CC2AC0600A0062D /* ReactNative.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReactNative.h; sourceTree = "<group>"; };
 		B3E7B5891CC2AC0600A0062D /* ReactNative.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReactNative.m; sourceTree = "<group>"; };
-
+		F4FF95D5245B92E700C19C63 /* ReactNative-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ReactNative-Bridging-Header.h"; sourceTree = "<group>"; };
+		F4FF95D6245B92E800C19C63 /* ReactNative.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReactNative.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -54,10 +52,9 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
-
-				B3E7B5881CC2AC0600A0062D /* ReactNative.h */,
+				F4FF95D6245B92E800C19C63 /* ReactNative.swift */,
 				B3E7B5891CC2AC0600A0062D /* ReactNative.m */,
-
+				F4FF95D5245B92E700C19C63 /* ReactNative-Bridging-Header.h */,
 				134814211AA4EA7D00B7C361 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -119,9 +116,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-
+				F4FF95D7245B92E800C19C63 /* ReactNative.swift in Sources */,
 				B3E7B58A1CC2AC0600A0062D /* ReactNative.m in Sources */,
-
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -156,6 +152,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				"EXCLUDED_ARCHS[sdk=*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -206,6 +203,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				"EXCLUDED_ARCHS[sdk=*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -234,7 +232,9 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = ReactNative;
 				SKIP_INSTALL = YES;
-
+				SWIFT_OBJC_BRIDGING_HEADER = "ReactNative-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -251,7 +251,8 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = ReactNative;
 				SKIP_INSTALL = YES;
-
+				SWIFT_OBJC_BRIDGING_HEADER = "ReactNative-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

package/ios/RowndPlugin-Bridging-Header.h

@@ -0,0 +1,3 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+

package/ios/RowndPlugin.m

@@ -0,0 +1,26 @@
+#import <React/RCTBridgeModule.h>
+
+@interface RCT_EXTERN_MODULE(RowndPlugin, NSObject)
+
+
+RCT_EXTERN_METHOD(setUserDataValue:(NSString *)key withValue:(id)value)
+RCT_EXTERN_METHOD(setUserData:(NSDictionary<NSString *, id>)data)
+
+RCT_EXTERN_METHOD(configure:(NSString *)appKey
+                 withResolver:(RCTPromiseResolveBlock)resolve
+                 withRejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(requestSignIn)
+RCT_EXTERN_METHOD(signOut)
+
+RCT_EXTERN_METHOD(manageAccount)
+
+RCT_EXTERN_METHOD(getAccessToken:
+                  withResolver:(RCTPromiseResolveBlock)resolve)
+
++ (BOOL)requiresMainQueueSetup
+{
+  return NO;
+}
+
+@end

package/ios/RowndPlugin.swift

@@ -0,0 +1,83 @@
+import Rownd
+import SwiftUI
+import Combine
+import AnyCodable
+
+@objc(RowndPlugin)
+class RowndPlugin: NSObject {
+    
+    @ObservedObject private var state = Rownd.getInstance().state().subscribe { $0 }
+    
+    private var stateCancellable: AnyCancellable?
+    
+    override init() {
+        super.init()
+        
+        stateCancellable = state.$current.sink { newState in
+            do {
+                RowndPluginEventEmitter.emitter.sendEvent(withName: "update_state", body: try newState.toDictionary())
+            } catch {
+                print("Failed to encode Rownd state: \(String(describing: error))")
+            }
+        }
+    }
+    
+    @objc(configure:withResolver:withRejecter:)
+    func configure(appKey: String, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) -> Void {
+        Task.init {
+            await Rownd.configure(launchOptions: nil, appKey: appKey)
+        }
+        resolve(appKey)
+    }
+    
+    @objc
+    func requestSignIn() -> Void {
+        DispatchQueue.main.async {
+            Rownd.requestSignIn()
+        }
+    }
+    
+    @objc
+    func signOut() -> Void {
+        DispatchQueue.main.async {
+            Rownd.signOut()
+        }
+    }
+    
+    @objc
+    func manageAccount() -> Void {
+        DispatchQueue.main.async {
+            Rownd.manageUser()
+        }
+    }
+    
+    @objc(getAccessToken:withResolver:)
+    func getAccessToken(resolve: @escaping RCTPromiseResolveBlock) async -> Void {
+        let accessToken = await Rownd.getAccessToken()
+        resolve(accessToken)
+    }
+    
+    @objc(setUserData:)
+    func setUserData(data: Dictionary<String, Any>) -> Void {
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: data, options: .prettyPrinted)
+            let decoder = JSONDecoder()
+            let dictionary = try! decoder.decode([String: AnyCodable].self, from: jsonData)
+            
+            Rownd.user.set(data: dictionary)
+        } catch {
+            print("FAILED TO SET USER DATA: ",error)
+        }
+    }
+    
+    @objc(setUserDataValue:withValue:)
+    func setUserDataValue(key: String, value: Any) -> Void {
+        let json = """
+        "\(value)"
+        """.data(using: .utf8)!
+
+        let decoder = JSONDecoder()
+        let dictionary = try! decoder.decode(AnyCodable.self, from: json)
+        Rownd.user.set(field: key, value: dictionary)
+    }
+}

package/ios/RowndPluginEventEmitter.m

@@ -0,0 +1,12 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+
+@interface RCT_EXTERN_MODULE(RowndPluginEventEmitter, RCTEventEmitter)
+  RCT_EXTERN_METHOD(supportedEvents)
+
++ (BOOL)requiresMainQueueSetup
+{
+  return YES;
+}
+
+@end

package/ios/RowndPluginEventEmitter.swift

@@ -0,0 +1,19 @@
+import Rownd
+import SwiftUI
+import React
+
+@objc(RowndPluginEventEmitter)
+class RowndPluginEventEmitter: RCTEventEmitter {
+    
+    public static var emitter: RCTEventEmitter!
+
+    override init() {
+        super.init()
+        RowndPluginEventEmitter.emitter = self
+    }
+
+    open override func supportedEvents() -> [String] {
+      ["update_state","onReady", "onPending", "onFailure"]      // etc.
+    }
+  }
+