@pinwheel/react-native-pinwheel 3.6.1 → 3.7.1

package/README.md

@@ -122,19 +122,25 @@ Enables Link to run with a dark mode theme.
 
 ## Running The Example App Locally
 
-You may want to run the example app locally to get started.
+You may want to run the example app locally to get started. The application is located inside of the example_expo directory inside of the repository.
 
 #### Dependencies
 
-- Node 16.7.0 (check with `node -v` and upgrade versions using `nvm` if needed)
-- iPhone 14 simulator (open your Simulator app and check the available versions)
-- iOS 16 running on the simulator (open your Simulator app and check the available versions)
-- `pod` version 1.11.3 (check with `pod --version`)
-- Add your pinwheel secret to `example/env.js` (create this file) with `export default "<YOUR PINWHEEL SECRET>"`.
+- Node 22.18.0 (check with `node -v` and upgrade versions using `nvm` if needed)
+- Xcode for iOS
+- Android Studio for Android
 
 #### Directions
-
-- `npm run dev`
+**Enter the `example_expo` directory and run the following commands:**
+- Create a `.env` file with your Pinwheel API secret. An example env file is located at example_repo/.env.example.
+- Directions to run the [iOS simulator](https://docs.expo.dev/workflow/ios-simulator/)
+- Directions to run the [Android simulator](https://docs.expo.dev/workflow/android-studio-emulator/)
+```
+EXPO_PUBLIC_PINWHEEL_API_KEY=YOUR_API_SECRET
+```
+- `npm i`
+- `npm run ios` (for iOS)
+- `npm run android` (for Android)
 
 #### Troubleshooting
 

package/RNPinwheelSDK.podspec

@@ -15,7 +15,9 @@ Pod::Spec.new do |s|
 
   s.source_files    = "ios/**/*.{h,m,mm,swift}"
 
+  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
+
   install_modules_dependencies(s)
 
-  s.dependency 'PinwheelSDK', '3.4.2'
+  s.dependency 'PinwheelSDK', '3.5.0'
 end

package/android/build.gradle

@@ -32,7 +32,7 @@ repositories {
   google()
 }
 
-def PW_ANDROID_SDK_VERSION = '3.5.2'
+def PW_ANDROID_SDK_VERSION = '3.6.0'
 
 dependencies {
     def pwVersion = rootProject.hasProperty('pwVersion') ? rootProject.pwVersion : PW_ANDROID_SDK_VERSION

package/android/src/main/java/com/rtnpinwheel/Pinwheel.kt

@@ -21,6 +21,7 @@ class Pinwheel : FrameLayout {
   private var pinwheelEventListener: PinwheelEventListener? = null
   private var handleInsets: Boolean = true
   private var useDarkMode: Boolean = false
+  private var useSecureOrigin: Boolean = false
   private var fragmentContainer: FrameLayout? = null
 
   constructor(context: Context) : super(context) {
@@ -80,6 +81,10 @@ class Pinwheel : FrameLayout {
     this.useDarkMode = useDarkMode
   }
 
+  fun setUseSecureOrigin(useSecureOrigin: Boolean) {
+    this.useSecureOrigin = useSecureOrigin
+  }
+
   fun getReactNativeVersion(): String {
     val version = ReactNativeVersion.VERSION
     return "${version["major"]}.${version["minor"]}.${version["patch"]}"
@@ -89,7 +94,15 @@ class Pinwheel : FrameLayout {
     Handler(Looper.getMainLooper()).post {
       if (this.pinwheelFragment == null) {
         this.token?.let {
-          val pinwheelFragment = PinwheelFragment.newInstanceWithAdvancedOptions(it, "react native", "3.6.1", getReactNativeVersion(), this.handleInsets, this.useDarkMode)
+          val pinwheelFragment = PinwheelFragment.newInstanceWithAdvancedOptions(
+            it,
+            "react native",
+            "3.7.1",
+            getReactNativeVersion(),
+            this.handleInsets,
+            this.useDarkMode,
+            this.useSecureOrigin
+          )
           pinwheelEventListener?.let { listener ->
             pinwheelFragment.pinwheelEventListener = listener
           }

package/android/src/main/java/com/rtnpinwheel/PinwheelManager.kt

@@ -48,6 +48,11 @@ class PinwheelManager(private val reactContext: ReactApplicationContext) :
         view.setUseDarkMode(useDarkMode)
     }
 
+    @ReactProp(name = "useSecureOrigin")
+    override fun setUseSecureOrigin(view: Pinwheel, useSecureOrigin: Boolean) {
+        view.setUseSecureOrigin(useSecureOrigin)
+    }
+
     @ReactPropGroup(names = ["width", "height"], customType = "Style")
     fun setStyle(view: Pinwheel, index: Int, value: Int) {
         if (index == 0) propWidth = value

package/ios/PWPinwheelWrapperVC.swift

@@ -0,0 +1,97 @@
+import Foundation
+import PinwheelSDK
+import UIKit
+
+@objc public protocol PWPinwheelWrapperDelegate {
+  func onEvent(name: String, event: [String: AnyObject])
+}
+
+@objcMembers
+public final class PWPinwheelWrapperVC: UIViewController {
+  private let token: String
+  private let delegateBridge: PWPinwheelWrapperDelegate
+
+  private let useSecureOrigin: Bool
+  private let useDarkMode: Bool
+  private let sdk: String
+  private let version: String
+
+  private var pinwheelVC: PinwheelViewController?
+
+  public init(
+    token: String,
+    delegate: PWPinwheelWrapperDelegate,
+    sdk: String,
+    version: String,
+    useSecureOrigin: Bool,
+    useDarkMode: Bool = false,
+    useAppBoundDomains: Bool = false,
+    useAppBoundDomainsForNativeLink: Bool = false
+  ) {
+    self.token = token
+    self.delegateBridge = delegate
+    self.sdk = sdk
+    self.version = version
+    self.useSecureOrigin = useSecureOrigin
+    self.useDarkMode = useDarkMode
+    super.init(nibName: nil, bundle: nil)
+
+    var config = PinwheelConfig(mode: .sandbox, environment: .production, sdk: sdk, version: version)
+    config.useSecureOrigin = useSecureOrigin
+
+    let vc = PinwheelViewController(
+      token: token,
+      delegate: self,
+      config: config,
+      useDarkMode: useDarkMode,
+      useAppBoundDomains: useAppBoundDomains,
+      useAppBoundDomainsForNativeLink: useAppBoundDomainsForNativeLink
+    )
+    self.pinwheelVC = vc
+  }
+
+  public required init?(coder: NSCoder) {
+    nil
+  }
+
+  public override func viewDidLoad() {
+    super.viewDidLoad()
+    guard let pinwheelVC else { return }
+
+    addChild(pinwheelVC)
+    view.addSubview(pinwheelVC.view)
+    pinwheelVC.didMove(toParent: self)
+
+    pinwheelVC.view.translatesAutoresizingMaskIntoConstraints = false
+    NSLayoutConstraint.activate([
+      pinwheelVC.view.topAnchor.constraint(equalTo: view.topAnchor),
+      pinwheelVC.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+      pinwheelVC.view.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+      pinwheelVC.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+    ])
+  }
+}
+
+// MARK: - PinwheelDelegate
+
+extension PWPinwheelWrapperVC: PinwheelDelegate {
+  public func onEvent(name: PinwheelEventType, event: PinwheelEventPayload?) {
+    var payload: [String: AnyObject] = [:]
+
+    if let event {
+      do {
+        let json = try event.jsonString()
+        if let jsonData = json.data(using: .utf8) {
+          let jsonObject = try JSONSerialization.jsonObject(with: jsonData)
+          if let jsonDictionary = jsonObject as? [String: AnyObject] {
+            payload = jsonDictionary
+          }
+        }
+      } catch {
+        // Best-effort payload serialization; still forward event name.
+      }
+    }
+
+    delegateBridge.onEvent(name: name.rawValue, event: payload)
+  }
+}

package/ios/RTNPinwheelManager.mm

@@ -17,6 +17,7 @@ RCT_EXPORT_MODULE(RTNPinwheel)
 
 RCT_EXPORT_VIEW_PROPERTY(token, NSString);
 RCT_EXPORT_VIEW_PROPERTY(useDarkMode, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(useSecureOrigin, BOOL);
 
 @end
 
@@ -34,5 +35,6 @@ RCT_EXPORT_MODULE(RTNPinwheelView)
 
 RCT_EXPORT_VIEW_PROPERTY(token, NSString);
 RCT_EXPORT_VIEW_PROPERTY(useDarkMode, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(useSecureOrigin, BOOL);
 
 @end

package/ios/RTNPinwheelView.h

@@ -5,25 +5,35 @@
 # endif
 
 #import <WebKit/WebKit.h>
-#import <PinwheelSDK/PinwheelSDK-Swift.h>
 #import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+@protocol PWPinwheelWrapperDelegate;
+#ifdef __cplusplus
+}
+#endif
+
+@class PWPinwheelWrapperVC;
+
 #ifdef RCT_NEW_ARCH_ENABLED
 
-@interface RTNPinwheelView : RCTViewComponentView <PinwheelWrapperDelegate>
+@interface RTNPinwheelView : RCTViewComponentView <PWPinwheelWrapperDelegate>
 
 #else
 
-@interface RTNPinwheelView : UIView <PinwheelWrapperDelegate>
+@interface RTNPinwheelView : UIView <PWPinwheelWrapperDelegate>
 
 #endif
 
 
-@property (nonatomic, strong, nullable) PinwheelWrapperVC *pinwheelWrapperVC;
+@property (nonatomic, strong, nullable) PWPinwheelWrapperVC *pinwheelWrapperVC;
 @property (nonatomic, strong) NSString *token;
 @property (nonatomic, assign) BOOL useDarkMode;
+@property (nonatomic, assign) BOOL useSecureOrigin;
 
 - (instancetype)initWithFrame:(CGRect)frame token:(NSString *)token;
 

package/ios/RTNPinwheelView.mm

@@ -9,6 +9,7 @@
 
 #import "RCTFabricComponentsPlugins.h"
 #import "RTNPinwheelEvents.h"
+#import "RNPinwheelSDK-Swift.h"
 
 using namespace facebook::react;
 
@@ -71,13 +72,14 @@ using namespace facebook::react;
   }
 
   self.pinwheelWrapperVC =
-      [[PinwheelWrapperVC alloc] initWithToken:self.token
-                                      delegate:self
-                                           sdk:@"react native"
-                                       version:@"3.6.1"
-                                   useDarkMode:self.useDarkMode
-                            useAppBoundDomains:NO
-               useAppBoundDomainsForNativeLink:NO];
+      [[PWPinwheelWrapperVC alloc] initWithToken:self.token
+                                        delegate:self
+                                             sdk:@"react native"
+                                         version:@"3.7.1"
+                                  useSecureOrigin:self.useSecureOrigin
+                                      useDarkMode:self.useDarkMode
+                               useAppBoundDomains:NO
+                  useAppBoundDomainsForNativeLink:NO];
 
   // Guard against double-attachment (shouldn’t happen after cleanup, but safe).
   if (self.pinwheelWrapperVC.parentViewController == parentVC) {
@@ -127,6 +129,10 @@ using namespace facebook::react;
     self.useDarkMode = newViewProps.useDarkMode;
   }
 
+  if (oldViewProps.useSecureOrigin != newViewProps.useSecureOrigin) {
+    self.useSecureOrigin = newViewProps.useSecureOrigin;
+  }
+
   // Ensures that the view is always re-initialized whenever the props change,
   // or the React Native component is re-mounted. On the new architecture, there
   // are optimizations which causes the view to be re-used in these scenarios,
@@ -181,6 +187,7 @@ Class<RCTComponentViewProtocol> RTNPinwheelCls(void) {
 
 #import "RTNPinwheelEvents.h"
 #import "RTNPinwheelView.h"
+#import "RNPinwheelSDK-Swift.h"
 
 @implementation RTNPinwheelView
 
@@ -234,13 +241,14 @@ Class<RCTComponentViewProtocol> RTNPinwheelCls(void) {
   }
 
   self.pinwheelWrapperVC =
-      [[PinwheelWrapperVC alloc] initWithToken:self.token
-                                      delegate:self
-                                           sdk:@"react native"
-                                       version:@"3.6.1"
-                                   useDarkMode:self.useDarkMode
-                            useAppBoundDomains:NO
-               useAppBoundDomainsForNativeLink:NO];
+      [[PWPinwheelWrapperVC alloc] initWithToken:self.token
+                                        delegate:self
+                                             sdk:@"react native"
+                                         version:@"3.7.1"
+                                  useSecureOrigin:self.useSecureOrigin
+                                      useDarkMode:self.useDarkMode
+                               useAppBoundDomains:NO
+                  useAppBoundDomainsForNativeLink:NO];
 
   // Guard against double-attachment (shouldn’t happen after cleanup, but safe).
   if (self.pinwheelWrapperVC.parentViewController == parentVC) {
@@ -281,6 +289,13 @@ Class<RCTComponentViewProtocol> RTNPinwheelCls(void) {
   }
 }
 
+- (void)setUseSecureOrigin:(BOOL)newUseSecureOrigin {
+  if (_useSecureOrigin != newUseSecureOrigin) {
+    _useSecureOrigin = newUseSecureOrigin;
+    [self initPinwheelWrapperVC];
+  }
+}
+
 - (void)layoutSubviews {
   [super layoutSubviews];
   self.pinwheelWrapperVC.view.frame = self.bounds;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinwheel/react-native-pinwheel",
-  "version": "3.6.1",
+  "version": "3.7.1",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -22,7 +22,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "dev": "./scripts/dev_expo.sh"
+    "dev": "./scripts/dev_expo.sh",
+    "dev:bare": "./scripts/dev_bare.sh"
   },
   "author": "Pinwheel",
   "license": "MIT",

package/src/Pinwheel.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { LinkOptions } from './client-events/client';
-declare const Pinwheel: ({ linkToken, onLogin, onLoginAttempt, onSuccess, onError, onExit, onEvent, handleInsets, useDarkMode, }: LinkOptions & {
+declare const Pinwheel: ({ linkToken, onLogin, onLoginAttempt, onSuccess, onError, onExit, onEvent, handleInsets, useDarkMode, useSecureOrigin, }: LinkOptions & {
     handleInsets?: boolean;
     useDarkMode?: boolean;
 }) => React.JSX.Element;

package/src/Pinwheel.tsx

@@ -19,6 +19,7 @@ const Pinwheel = ({
   onEvent,
   handleInsets,
   useDarkMode,
+  useSecureOrigin,
 }: LinkOptions & {
   handleInsets?: boolean;
   useDarkMode?: boolean;
@@ -83,6 +84,7 @@ const Pinwheel = ({
           token={linkToken}
           handleInsets={handleInsets ?? true}
           useDarkMode={useDarkMode ?? false}
+          useSecureOrigin={useSecureOrigin ?? false}
         />
       )}
     </SafeAreaView>

package/src/RTNPinwheelNativeComponent.d.ts

@@ -4,6 +4,7 @@ export interface NativeProps extends ViewProps {
     token: string;
     handleInsets: boolean;
     useDarkMode: boolean;
+    useSecureOrigin: boolean;
 }
 declare const _default: HostComponent<NativeProps>;
 export default _default;

package/src/RTNPinwheelNativeComponent.ts

@@ -10,6 +10,7 @@ export interface NativeProps extends ViewProps {
   token: string;
   handleInsets: boolean;
   useDarkMode: boolean;
+  useSecureOrigin: boolean;
 }
 
 export default codegenNativeComponent<NativeProps>(

package/src/client-events/client.d.ts

@@ -1,6 +1,7 @@
 import type { LoginEventPayload, SuccessEventPayload, EventHandler, ErrorEventPayload, LoginAttemptEventPayload } from './registry/v3';
 export type LinkOptions = {
     linkToken: string;
+    useSecureOrigin?: boolean;
     onLogin?: (payload: LoginEventPayload) => void;
     onLoginAttempt?: (payload: LoginAttemptEventPayload) => void;
     onSuccess?: (payload: SuccessEventPayload) => void;

package/src/client-events/client.ts

@@ -3,15 +3,16 @@ import type {
   SuccessEventPayload,
   EventHandler,
   ErrorEventPayload,
-  LoginAttemptEventPayload
-} from './registry/v3'
+  LoginAttemptEventPayload,
+} from './registry/v3';
 
 export type LinkOptions = {
-  linkToken: string
-  onLogin?: (payload: LoginEventPayload) => void
-  onLoginAttempt?: (payload: LoginAttemptEventPayload) => void
-  onSuccess?: (payload: SuccessEventPayload) => void
-  onError?: (error: ErrorEventPayload) => void
-  onExit?: (error?: ErrorEventPayload) => void
-  onEvent?: EventHandler
-}
+  linkToken: string;
+  useSecureOrigin?: boolean;
+  onLogin?: (payload: LoginEventPayload) => void;
+  onLoginAttempt?: (payload: LoginAttemptEventPayload) => void;
+  onSuccess?: (payload: SuccessEventPayload) => void;
+  onError?: (error: ErrorEventPayload) => void;
+  onExit?: (error?: ErrorEventPayload) => void;
+  onEvent?: EventHandler;
+};