fix: gate getLastARC and strictly enforce config initialization

Author: ivol

android/src/main/java/io/approov/reactnative/ApproovService.java

@@ -673,19 +673,22 @@ public void initialize(String config, String comment, Promise promise) {
         boolean allowEnableAfterEmptyInitialization = isInitialized && (initialConfig != null)
                 && initialConfig.isEmpty() && !config.isEmpty();
 
-        if (isInitialized && !allowReinitialize && !allowEnableAfterEmptyInitialization) {
+        if (isInitialized && !allowEnableAfterEmptyInitialization) {
             // if the SDK is previously initialized then the config should be the same
             if (!config.equals(initialConfig)) {
                 log(LOG_ERROR, TAG, "attempt to reinitialize with a different config");
                 promise.reject("initialize", "attempt to reinitialize with a different config",
                         getErrorUserInfo(false));
-            } else {
+                return;
+            }
+            if (!allowReinitialize) {
                 promise.resolve(null);
+                return;
             }
-        } else {
-            // initialize the Approov SDK and notify any pin change listeners since pins may
-            // now
-            // be available
+        }
+
+        // initialize the Approov SDK and notify any pin change listeners since pins may
+        // now be available
             try {
                 if (!config.isEmpty()) {
                     Approov.initialize(applicationContext, config, "auto", effectiveComment);
@@ -712,7 +715,6 @@ public void initialize(String config, String comment, Promise promise) {
                 log(LOG_ERROR, TAG, "initialization failed with IllegalState: " + e.getMessage());
                 promise.reject("initialize", "initialize IllegalState: " + e.getMessage(), getErrorUserInfo(false));
             }
-        }
     }
 
     /**
@@ -768,6 +770,11 @@ public void isApproovEnabled(Promise promise) {
     @ReactMethod
     public void getLastARC(Promise promise) {
         log(LOG_INFO, TAG, "ApproovService: getLastARC");
+        if (!isInitialized || !isApproovEnabled()) {
+            promise.resolve("");
+            return;
+        }
+
         // Get the dynamic pins from Approov
         Map<String, List<String>> approovPins = Approov.getPins("public-key-sha256");
         if (approovPins == null || approovPins.isEmpty()) {

ios/ApproovService.m

@@ -345,9 +345,8 @@ - (instancetype)init {
     BOOL allowEnableAfterEmptyInitialization =
         isInitialized && initialConfigString != nil &&
         [initialConfigString length] == 0 && [config length] != 0;
-    if (isInitialized && !allowReinitialize && !allowEnableAfterEmptyInitialization) {
-      // if the SDK is previously initialized then check the config string is
-      // the same
+    if (isInitialized && !allowEnableAfterEmptyInitialization) {
+      // if the SDK is previously initialized then check the config string is the same
       if (![initialConfigString isEqualToString:config]) {
         NSError *error =
             [[NSError alloc] initWithDomain:@"io.approov.reactnative"
@@ -356,14 +355,19 @@ - (instancetype)init {
         reject(@"initialize",
                @"attempt to reinitialize Approov SDK with a different config",
                error);
-      } else {
+        return;
+      }
+      
+      if (!allowReinitialize) {
         resolve(nil);
+        return;
       }
-    } else {
-      // initialize the Approov SDK
-      NSError *initializationError = nil;
-      BOOL initializationResult = YES;
-      if ([config length] != 0) {
+    }
+
+    // initialize the Approov SDK
+    NSError *initializationError = nil;
+    BOOL initializationResult = YES;
+    if ([config length] != 0) {
         initializationResult = [Approov initialize:config
                                       updateConfig:@"auto"
                                            comment:comment
@@ -417,7 +421,6 @@ - (instancetype)init {
         }
         resolve(nil);
       }
-    }
   }
 }
 
@@ -444,6 +447,11 @@ + (id)networkRequestLock {
  */
 RCT_EXPORT_METHOD(getLastARC : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  if (!isInitialized || !ApproovIsEnabled()) {
+    resolve(@"");
+    return;
+  }
+
   // Get the dynamic pins from Approov
   NSDictionary<NSString *, NSArray<NSString *> *> *approovPins =
       [Approov getPins:@"public-key-sha256"];