Merge branch 'main' into dependabot/npm_and_yarn/plugin/shelljs-and-standard--removed

Author: jamesnrokt

.github/workflows/issue-autorespond-and-close.yml

@@ -0,0 +1,14 @@
+name: Auto respond and close issue
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  auto-respond-and-close-issue:
+    uses: mparticle/mparticle-workflows/.github/workflows/auto-respond-close-issue.yml@main
+    with:
+      issue_number: ${{ github.event.issue.number }}
+      repository: ${{ github.repository }}
+      user_login: ${{ github.event.issue.user.login }}

.github/workflows/pull-request.yml

@@ -1,9 +1,19 @@
+name: Build and Test
+on: [workflow_dispatch, pull_request]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  pull-requests: read
+  checks: write
+  id-token: write
 
-name: "Build and Test"
-on: [push, pull_request]
 jobs:
   js-test:
-    name: "JS Tests"
+    name: JS Tests
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -12,7 +22,7 @@ jobs:
       matrix:
         node-version: [10.x, 12.x, 14.x, 15.x]
     steps:
-      - name: "Checkout Branch"
+      - name: Checkout Branch
         uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
@@ -23,24 +33,36 @@ jobs:
       - name: "NPM Test"
         run: npm test
   android-test:
-    name: "Android Unit Tests"
+    name: Android Unit Tests
     runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: ./plugin
     steps:
-      - name: "Checkout Branch"
+      - name: Checkout Branch
         uses: actions/checkout@v2
       - name: "Install JDK 11"
         uses: actions/setup-java@v2
         with:
-          distribution: "zulu"
-          java-version: "11"
-      - name: "Install NPM"
+          distribution: zulu
+          java-version: 11
+      - name: Install NPM
         uses: actions/setup-node@v1
-      - name: "NPM Build"
+      - name: NPM Build
         run: |
           npm ci
           npm run build --if-present
-      - name: "Run Unit Tests"
-        run: ./gradlew test
+      - name: Run Unit Tests
+        run: ./gradlew test
+
+  pr-notify:
+    if: >
+      github.event_name == 'pull_request' &&
+      github.event.pull_request.draft == false
+    needs:
+      - js-test
+      - android-test
+    name: Notify GChat
+    uses: ROKT/rokt-workflows/.github/workflows/oss_pr_opened_notification.yml@main
+    secrets:
+      gchat_webhook: ${{ secrets.GCHAT_PRS_WEBHOOK }}

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.2.4](https://github.com/mParticle/cordova-plugin-mparticle/compare/2.2.3...2.2.4) (2023-03-14)
+
+
+### Bug Fixes
+
+* Setting DDPR Consents on iOS ([#23](https://github.com/mParticle/cordova-plugin-mparticle/issues/23)) ([c13eaa7](https://github.com/mParticle/cordova-plugin-mparticle/commit/c13eaa7f3e68fb3a510de75c25831c44ce716dc9))
+
+## [2.2.3](https://github.com/mParticle/cordova-plugin-mparticle/compare/2.2.2...2.2.3) (2023-01-09)
+
+
+### Bug Fixes
+
+* Android Consent now retains previously Set Consent States ([#22](https://github.com/mParticle/cordova-plugin-mparticle/issues/22)) ([c5ce970](https://github.com/mParticle/cordova-plugin-mparticle/commit/c5ce97014b9cefc86c878f899472848c1d3fa6f7))
+
 ## [2.2.2](https://github.com/mParticle/cordova-plugin-mparticle/compare/2.2.1...2.2.2) (2022-09-29)
 
 

plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mparticle",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "Cordova plugin for mParticle",
   "homepage": "https://www.mparticle.com",
   "repository": "mParticle/cordova-plugin-mparticle",

plugin/src/android/src/main/java/com/mparticle/cordova/MParticleCordovaPlugin.java

@@ -359,7 +359,7 @@ public void addGDPRConsentState(final JSONArray args) throws JSONException, Pars
         String purpose = args.getString(1);
         if (user != null && map != null && purpose != null) {
             GDPRConsent newConsent = ConvertGDPRConsent(map);
-            ConsentState state = ConsentState.builder()
+            ConsentState state = ConsentState.withConsentState(user.getConsentState())
             .addGDPRConsentState(purpose, newConsent)
             .build();
 
@@ -384,7 +384,7 @@ public void addCCPAConsentState(final JSONArray args) throws JSONException, Pars
         final JSONObject map = args.getJSONObject(0);
         if (user != null && map != null) {
             CCPAConsent newConsent = ConvertCCPAConsent(map);
-            ConsentState state = ConsentState.builder()
+            ConsentState state = ConsentState.withConsentState(user.getConsentState())
             .setCCPAConsentState(newConsent)
             .build();
 

plugin/src/ios/CDVMParticle.m

@@ -72,7 +72,7 @@ - (void)setATTStatus:(CDVInvokedUrlCommand*)command {
 - (void)addGDPRConsentState:(CDVInvokedUrlCommand*)command {
     [self.commandDelegate runInBackground:^{
         NSMutableDictionary *serializedConsent = [command.arguments objectAtIndex:0];
-        NSString *purpose = [command.arguments objectAtIndex:0];
+        NSString *purpose = [command.arguments objectAtIndex:1];
 
         MPGDPRConsent *consent = [CDVMParticle MPGDPRConsent:serializedConsent];
         MPConsentState *consentState = [[MParticle sharedInstance].identity.currentUser.consentState copy];