Wrap the App Check Obj C pointers to fix memory issues (#1287)

* Wrap the Obj C objects to fix memory errors

* Formatting

Author: a-maurice

app_check/src/ios/debug_provider_ios.h

@@ -17,6 +17,8 @@
 
 #include <map>
 
+#include "app/memory/unique_ptr.h"
+#include "app/src/util_ios.h"
 #include "firebase/app_check.h"
 
 #ifdef __OBJC__
@@ -27,6 +29,11 @@ namespace firebase {
 namespace app_check {
 namespace internal {
 
+// This defines the class FIRAppCheckDebugProviderFactoryPointer, which is a
+// C++-compatible wrapper around the FIRAppCheckDebugProviderFactory Obj-C
+// class.
+OBJ_C_PTR_WRAPPER(FIRAppCheckDebugProviderFactory);
+
 class DebugAppCheckProviderFactoryInternal : public AppCheckProviderFactory {
  public:
   DebugAppCheckProviderFactoryInternal();
@@ -37,9 +44,14 @@ class DebugAppCheckProviderFactoryInternal : public AppCheckProviderFactory {
 
  private:
 #ifdef __OBJC__
-  FIRAppCheckDebugProviderFactory* ios_provider_factory_;
+  FIRAppCheckDebugProviderFactory* ios_provider_factory() const {
+    return ios_provider_factory_->get();
+  }
 #endif  // __OBJC__
 
+  // Object lifetime managed by Objective C ARC.
+  UniquePtr<FIRAppCheckDebugProviderFactoryPointer> ios_provider_factory_;
+
   std::map<App*, AppCheckProvider*> created_providers_;
 };
 

app_check/src/ios/debug_provider_ios.mm

@@ -59,7 +59,8 @@ virtual void GetToken(
 
 DebugAppCheckProviderFactoryInternal::DebugAppCheckProviderFactoryInternal()
     : created_providers_() {
-  ios_provider_factory_ = [[FIRAppCheckDebugProviderFactory alloc] init];
+  ios_provider_factory_ = MakeUnique<FIRAppCheckDebugProviderFactoryPointer>(
+      [[FIRAppCheckDebugProviderFactory alloc] init]);
 }
 
 DebugAppCheckProviderFactoryInternal::~DebugAppCheckProviderFactoryInternal() {
@@ -78,7 +79,7 @@ virtual void GetToken(
   }
   // Otherwise, create a new provider
   FIRAppCheckDebugProvider* ios_provider =
-      [ios_provider_factory_ createProviderWithApp:app->GetPlatformApp()];
+      [ios_provider_factory() createProviderWithApp:app->GetPlatformApp()];
   AppCheckProvider* cpp_provider = new internal::DebugAppCheckProvider(ios_provider);
   created_providers_[app] = cpp_provider;
   return cpp_provider;

app_check/src/ios/device_check_provider_ios.h

@@ -17,6 +17,8 @@
 
 #include <map>
 
+#include "app/memory/unique_ptr.h"
+#include "app/src/util_ios.h"
 #include "firebase/app_check.h"
 
 #ifdef __OBJC__
@@ -27,6 +29,10 @@ namespace firebase {
 namespace app_check {
 namespace internal {
 
+// This defines the class FIRDeviceCheckProviderFactoryPointer, which is a
+// C++-compatible wrapper around the FIRDeviceCheckProviderFactory Obj-C class.
+OBJ_C_PTR_WRAPPER(FIRDeviceCheckProviderFactory);
+
 class DeviceCheckProviderFactoryInternal : public AppCheckProviderFactory {
  public:
   DeviceCheckProviderFactoryInternal();
@@ -37,9 +43,14 @@ class DeviceCheckProviderFactoryInternal : public AppCheckProviderFactory {
 
  private:
 #ifdef __OBJC__
-  FIRDeviceCheckProviderFactory* ios_provider_factory_;
+  FIRDeviceCheckProviderFactory* ios_provider_factory() const {
+    return ios_provider_factory_->get();
+  }
 #endif  // __OBJC__
 
+  // Object lifetime managed by Objective C ARC.
+  UniquePtr<FIRDeviceCheckProviderFactoryPointer> ios_provider_factory_;
+
   std::map<App*, AppCheckProvider*> created_providers_;
 };
 

app_check/src/ios/device_check_provider_ios.mm

@@ -58,7 +58,8 @@ virtual void GetToken(
 }
 
 DeviceCheckProviderFactoryInternal::DeviceCheckProviderFactoryInternal() : created_providers_() {
-  ios_provider_factory_ = [[FIRDeviceCheckProviderFactory alloc] init];
+  ios_provider_factory_ = MakeUnique<FIRDeviceCheckProviderFactoryPointer>(
+      [[FIRDeviceCheckProviderFactory alloc] init]);
 }
 
 DeviceCheckProviderFactoryInternal::~DeviceCheckProviderFactoryInternal() {
@@ -77,7 +78,7 @@ virtual void GetToken(
   }
   // Otherwise, create a new provider
   FIRDeviceCheckProvider* ios_provider =
-      [ios_provider_factory_ createProviderWithApp:app->GetPlatformApp()];
+      [ios_provider_factory() createProviderWithApp:app->GetPlatformApp()];
   AppCheckProvider* cpp_provider = new internal::DeviceCheckProvider(ios_provider);
   created_providers_[app] = cpp_provider;
   return cpp_provider;