@bravemobile/react-native-code-push 8.2.3 → 8.2.5

package/.azurepipelines/build-rn-code-push-1es.yml

@@ -63,4 +63,42 @@ extends:
             archiveFile: '$(Build.ArtifactStagingDirectory)/npm/$(Build.BuildId).tgz'
             replaceExistingArchive: true
             verbose: true
-          displayName: 'Prepare npm artifact'
+          displayName: 'Prepare npm artifact'
+
+    - stage: APIScan
+      dependsOn: Stage
+      pool:
+        name: 1ES-PT-Windows-2022
+        os: windows
+      variables:
+        "agent.source.skip": true
+      jobs:
+      - job: APIScan
+        steps:
+        - task: DownloadPipelineArtifact@2
+          displayName: Download Build Artifacts for APIScan
+          inputs:
+            artifactName: npm
+            targetPath: '$(Agent.BuildDirectory)/npm'
+        - task: ExtractFiles@1
+          inputs:
+            archiveFilePatterns: '$(Agent.BuildDirectory)/npm/*.tgz'
+            destinationFolder: '$(Agent.BuildDirectory)/npm_extracted'
+        - task: AzureKeyVault@2
+          inputs:
+            azureSubscription: 'AC - Dev Infra & Build Pool'
+            KeyVaultName: 'mobile-center-sdk'
+            SecretsFilter: 'appcenter-sdk-managed-identity-clientid'
+            RunAsPreJob: false
+        - task: APIScan@2
+          displayName: 'Run APIScan'
+          inputs:
+            softwareFolder: '$(Agent.BuildDirectory)\npm_extracted'
+            softwareName: 'react-native-code-push'
+            softwareVersionNum: '$(Build.BuildId)'
+            isLargeApp: false
+            toolVersion: 'Latest'
+            verbosityLevel: verbose
+          condition: and(succeeded(), ne(variables['DisableAPIScan'], 'true'))
+          env:
+            AzureServicesAuthConnectionString: 'runAs=App;AppId=$(appcenter-sdk-managed-identity-clientid)'

package/CodePush.js

@@ -90,14 +90,19 @@ async function checkForUpdate(deploymentKey = null, handleBinaryVersionMismatchC
           log(`An error has occurred at update checker : ${error.stack}`);
           if (sharedCodePushOptions.fallbackToAppCenter) {
             return await sdk.queryUpdateWithCurrentPackage(queryPackage);
+          } else {
+            // update will not happen
+            return undefined;
           }
         }
       })()
       : await sdk.queryUpdateWithCurrentPackage(queryPackage);
 
-  const fileName = update && typeof update.downloadUrl === 'string' ? update.downloadUrl.split('/').pop() : null;
-  if (sharedCodePushOptions.bundleHost && fileName) {
-    update.downloadUrl = sharedCodePushOptions.bundleHost + fileName;
+  if (sharedCodePushOptions.bundleHost && update) {
+    const fileName = typeof update.downloadUrl === 'string' ? update.downloadUrl.split('/').pop() : null;
+    if (fileName) {
+      update.downloadUrl = sharedCodePushOptions.bundleHost + fileName;
+    }
   }
 
   /*

package/README.md

@@ -1,3 +1,57 @@
+## @bravemobile/react-native-code-push
+
+Fork of `code-push-react-native`
+
+```bash
+npm install @bravemobile/react-native-code-push
+```
+
+You'll have more flexibility and freedom in your deployment strategy.
+You can still use CodePush, but become independent of AppCenter's cloud infrastructure.
+
+### Self-host the update bundle file
+
+Specify the host and path using the `bundleHost` option.
+
+Upload the code-push bundle file to your server. The file name should be exactly same as the file on AppCenter.
+
+```javascript
+const codePushOptions = {
+  bundlehost: 'https://cdn.yours.com/codepush/bundle/',
+};
+
+export default codePush(codePushOptions)(MyApp);
+```
+
+### Customize the update check behavior
+
+Specify a function to perform the update check using the `updateChecker` option.
+
+(The `bundleHost` option can be used in combination.)
+
+`fallbackToAppCenter` : If an error occurs during the execution of the updateChecker function, the original update check behavior is performed as a fallback. (default: true)
+
+```javascript
+const codePushOptions = {
+  updateChecker: async (updateCheckRequest) => {
+    // It's up to you to decide what to do.
+    // However, you need to have a good understanding of Code Push's interface to configure your response.
+    const { data: response } = await axios.get('https://your.api.com/update_check', {
+      params: { app_version: updateCheckRequest.app_version }
+    });
+    return response;
+  },
+  fallbackToAppCenter: true,
+};
+
+export default codePush(codePushOptions)(MyApp);
+```
+
+
+## Original README.md is below. 
+
+---
+
 [![appcenterbanner](https://user-images.githubusercontent.com/31293287/32969262-3cc5d48a-cb99-11e7-91bf-fa57c67a371c.png)](http://microsoft.github.io/code-push/)
 
 #### [Sign up With App Center](https://appcenter.ms/signup?utm_source=CodePush&utm_medium=Azure) to use CodePush
@@ -246,44 +300,6 @@ If you would like to display an update confirmation dialog (an "active install")
 
 *NOTE: If you are using [Redux](http://redux.js.org) and [Redux Saga](https://redux-saga.js.org/), you can alternatively use the [react-native-code-push-saga](http://github.com/lostintangent/react-native-code-push-saga) module, which allows you to customize when `sync` is called in a perhaps simpler/more idiomatic way.*
 
-You can self-host the update's file. Upload the file to your server exactly as you uploaded it to AppCenter. And specify the host and path using the `bundleHost` option. 
-
-```javascript
-let codePushOptions = {
-  checkFrequency: codePush.CheckFrequency.MANUAL,
-  bundlehost: 'https://cdn.yours.com/codepush/bundle/',
-};
-
-let MyApp: () => React$Node = () => {
-}
-
-MyApp = codePush(codePushOptions)(MyApp);
-```
-
-You can customize the behavior by specifying a function to perform the update check instead. (The 'bundleHost' option can be used with it.)
-
-```javascript
-let codePushOptions = {
-  checkFrequency: codePush.CheckFrequency.MANUAL,
-  bundlehost: 'https://cdn.yours.com/codepush/bundle/',
-  updateChecker: async (updateCheckRequest) => {
-    // It's up to you to decide what to do.
-    const { data: response } = await axios.get('https://your.api.com/update_check', {
-      params: { app_version: updateCheckRequest.app_version }
-    });
-    return response;
-  },
-  // If an error occurs during the execution of the updateChecker function, the original update check behavior is performed as a fallback. (default: true)
-  fallbackToAppCenter: true,
-};
-
-let MyApp: () => React$Node = () => {
-}
-
-MyApp = codePush(codePushOptions)(MyApp);
-```
-
-
 ### Store Guideline Compliance
 
 Android Google Play and iOS App Store have corresponding guidelines that have rules you should be aware of before integrating the CodePush solution within your application.
@@ -315,7 +331,7 @@ Once your app is configured and distributed to your users, and you have made som
 
 *NOTE: Before you can start releasing updates, please log into App Center by running the `appcenter login` command.*
 
-In it's the most basic form, this command only requires one parameter: your owner name + "/" + app name.
+In its most basic form, this command only requires one parameter: your owner name + "/" + app name.
 
 ```shell
 appcenter codepush release-react -a <ownerName>/<appName>

package/android/app/build.gradle

@@ -27,5 +27,5 @@ android {
 
 dependencies {
     implementation "com.facebook.react:react-native:+"
-    implementation 'com.nimbusds:nimbus-jose-jwt:5.1'
+    implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3'
 }

package/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java

@@ -295,7 +295,16 @@ public class CodePush implements ReactPackage {
 
         JSONObject pendingUpdate = mSettingsManager.getPendingUpdate();
         if (pendingUpdate != null) {
-            JSONObject packageMetadata = this.mUpdateManager.getCurrentPackage();
+            JSONObject packageMetadata = null;
+
+            try {
+                packageMetadata = this.mUpdateManager.getCurrentPackage();
+            } catch (CodePushMalformedDataException e) {
+                // We need to recover the app in case 'codepush.json' is corrupted
+                CodePushUtils.log(e);
+                clearUpdates();
+                return;
+            }
             if (packageMetadata == null || !isPackageBundleLatest(packageMetadata) && hasBinaryVersionChanged(packageMetadata)) {
                 CodePushUtils.log("Skipping initializeUpdateAfterRestart(), binary version is newer");
                 return;

package/android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java

@@ -3,11 +3,12 @@ package com.microsoft.codepush.react;
 import android.content.Context;
 import android.util.Base64;
 
+import com.nimbusds.jose.JWSVerifier;
+import com.nimbusds.jose.crypto.RSASSAVerifier;
+import com.nimbusds.jwt.SignedJWT;
+
 import java.security.interfaces.*;
 
-import com.nimbusds.jose.*;
-import com.nimbusds.jose.crypto.*;
-import com.nimbusds.jwt.*;
 
 import org.json.JSONArray;
 import org.json.JSONException;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bravemobile/react-native-code-push",
-  "version": "8.2.3",
+  "version": "8.2.5",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",
@@ -36,7 +36,7 @@
     "url": "https://github.com/Soomgo-Mobile/react-native-code-push"
   },
   "dependencies": {
-    "code-push": "^4.2.0",
+    "code-push": "^4.2.1",
     "glob": "^7.1.7",
     "hoist-non-react-statics": "^3.3.2",
     "inquirer": "^8.1.5",

package/typings/react-native-code-push.d.ts

@@ -176,7 +176,7 @@ export interface SyncOptions {
      * value will enable the dialog with the default strings, and passing an object to this parameter allows enabling the dialog as well as
      * overriding one or more of the default strings.
      */
-    updateDialog?: UpdateDialog;
+    updateDialog?: UpdateDialog | true;
 
     /**
      * The rollback retry mechanism allows the application to attempt to reinstall an update that was previously rolled back (with the restrictions