Merge pull request #115 from StevenMMortimer/dev

[Release v1.0.1] Merge dev into main
StevenMMortimer · Mar 1, 2022 · 6d646df · 6d646df
2 parents aef7aee + 411b3e8
commit 6d646df
Show file tree

Hide file tree

Showing 409 changed files with 32,978 additions and 53,069 deletions.
diff --git a/.github/scripts/decrypt_secret.sh b/.github/scripts/decrypt_secret.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Decrypt the file
+# --batch to prevent interactive command
+# --yes to assume "yes" for questions
+gpg --quiet --batch --yes --decrypt --passphrase="$SALESFORCER_TOKEN_PASSPHRASE" \
+--output "$SALESFORCER_TOKEN_PATH"salesforcer_token.rds "$SALESFORCER_TOKEN_PATH"salesforcer_token.rds.gpg
diff --git a/.github/workflows/dev-01-R-CMD-check.yml b/.github/workflows/dev-01-R-CMD-check.yml
@@ -17,11 +17,15 @@ jobs:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       SALESFORCER_USERNAME: ${{ secrets.SALESFORCER_USERNAME }}
-      SALESFORCER_PASSWORD: ${{ secrets.SALESFORCER_PASSWORD }}
-      SALESFORCER_SECURITY_TOKEN: ${{ secrets.SALESFORCER_SECURITY_TOKEN }} 
+      SALESFORCER_TOKEN_PATH: ${{ github.workspace }}/tests/testthat/
 
     steps:
       - uses: actions/checkout@v2
+      - name: Decrypt OAuth Token
+        run: |
+          ./.github/scripts/decrypt_secret.sh
+        env:
+          SALESFORCER_TOKEN_PASSPHRASE: ${{ secrets.SALESFORCER_TOKEN_PASSPHRASE }}
 
       - name: Reveal env vars
         run: |

diff --git a/.github/workflows/main-01-pkgdown.yml b/.github/workflows/main-01-pkgdown.yml
@@ -18,11 +18,15 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       SALESFORCER_USERNAME: ${{ secrets.SALESFORCER_USERNAME }}
-      SALESFORCER_PASSWORD: ${{ secrets.SALESFORCER_PASSWORD }}
-      SALESFORCER_SECURITY_TOKEN: ${{ secrets.SALESFORCER_SECURITY_TOKEN }}     
-
+      SALESFORCER_TOKEN_PATH: ${{ github.workspace }}/tests/testthat/
+
     steps:
       - uses: actions/checkout@v2
+      - name: Decrypt OAuth Token
+        run: |
+          ./.github/scripts/decrypt_secret.sh
+        env:
+          SALESFORCER_TOKEN_PASSPHRASE: ${{ secrets.SALESFORCER_TOKEN_PASSPHRASE }}
 
       - name: Reveal env vars
         run: |

diff --git a/.github/workflows/main-02-test-coverage.yml b/.github/workflows/main-02-test-coverage.yml
@@ -21,13 +21,17 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       SALESFORCER_USERNAME: ${{ secrets.SALESFORCER_USERNAME }}
-      SALESFORCER_PASSWORD: ${{ secrets.SALESFORCER_PASSWORD }}
-      SALESFORCER_SECURITY_TOKEN: ${{ secrets.SALESFORCER_SECURITY_TOKEN }}
+      SALESFORCER_TOKEN_PATH: ${{ github.workspace }}/tests/testthat/
 
     steps:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.client_payload.sha }}
+      - name: Decrypt OAuth Token
+        run: |
+          ./.github/scripts/decrypt_secret.sh
+        env:
+          SALESFORCER_TOKEN_PASSPHRASE: ${{ secrets.SALESFORCER_TOKEN_PASSPHRASE }}
 
       - name: Reveal env vars
         run: |

diff --git a/.github/workflows/main-03-R-CMD-check-mac.yml b/.github/workflows/main-03-R-CMD-check-mac.yml
@@ -29,13 +29,17 @@ jobs:
       RSPM: ${{ matrix.config.rspm }}
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       SALESFORCER_USERNAME: ${{ secrets.SALESFORCER_USERNAME }}
-      SALESFORCER_PASSWORD: ${{ secrets.SALESFORCER_PASSWORD }}
-      SALESFORCER_SECURITY_TOKEN: ${{ secrets.SALESFORCER_SECURITY_TOKEN }} 
+      SALESFORCER_TOKEN_PATH: ${{ github.workspace }}/tests/testthat/
 
     steps:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.client_payload.sha }}
+      - name: Decrypt OAuth Token
+        run: |
+          ./.github/scripts/decrypt_secret.sh
+        env:
+          SALESFORCER_TOKEN_PASSPHRASE: ${{ secrets.SALESFORCER_TOKEN_PASSPHRASE }}
 
       - uses: r-lib/actions/setup-r@v1
         with:

diff --git a/.github/workflows/main-04-R-CMD-check-windows.yml b/.github/workflows/main-04-R-CMD-check-windows.yml
@@ -29,13 +29,17 @@ jobs:
       RSPM: ${{ matrix.config.rspm }}
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       SALESFORCER_USERNAME: ${{ secrets.SALESFORCER_USERNAME }}
-      SALESFORCER_PASSWORD: ${{ secrets.SALESFORCER_PASSWORD }}
-      SALESFORCER_SECURITY_TOKEN: ${{ secrets.SALESFORCER_SECURITY_TOKEN }} 
+      SALESFORCER_TOKEN_PATH: ${{ github.workspace }}/tests/testthat/
 
     steps:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.client_payload.sha }}
+      - name: Decrypt OAuth Token
+        run: |
+          ./.github/scripts/decrypt_secret.sh
+        env:
+          SALESFORCER_TOKEN_PASSPHRASE: ${{ secrets.SALESFORCER_TOKEN_PASSPHRASE }}
 
       - uses: r-lib/actions/setup-r@master
         with:

diff --git a/.github/workflows/main-05-R-CMD-check-linux.yml b/.github/workflows/main-05-R-CMD-check-linux.yml
@@ -29,13 +29,17 @@ jobs:
       RSPM: ${{ matrix.config.rspm }}
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       SALESFORCER_USERNAME: ${{ secrets.SALESFORCER_USERNAME }}
-      SALESFORCER_PASSWORD: ${{ secrets.SALESFORCER_PASSWORD }}
-      SALESFORCER_SECURITY_TOKEN: ${{ secrets.SALESFORCER_SECURITY_TOKEN }} 
+      SALESFORCER_TOKEN_PATH: ${{ github.workspace }}/tests/testthat/ 
 
     steps:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.client_payload.sha }}
+      - name: Decrypt OAuth Token
+        run: |
+          ./.github/scripts/decrypt_secret.sh
+        env:
+          SALESFORCER_TOKEN_PASSPHRASE: ${{ secrets.SALESFORCER_TOKEN_PASSPHRASE }}
 
       - uses: r-lib/actions/setup-r@v1
         with:

diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,7 @@ vignettes/*.R
 salesforcer_test_settings.rds
 salesforcer_token.rds
 salesforcer.tar
+salesforcer_token.base64
 
 # knitr and R markdown default cache directories
 /*_cache/

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: salesforcer
 Title: An Implementation of 'Salesforce' APIs Using Tidy Principles
-Version: 1.0.0
-Date: 2021-07-04
+Version: 1.0.1
+Date: 2022-02-28
 Description: Functions connecting to the 'Salesforce' Platform APIs (REST, SOAP, 
     Bulk 1.0, Bulk 2.0, Metadata, Reports and Dashboards) 
     <https://trailhead.salesforce.com/en/content/learn/modules/api_basics/api_basics_overview>. 
@@ -70,4 +70,4 @@ ByteCompile: true
 Encoding: UTF-8
 Language: en-US
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.1.1
+RoxygenNote: 7.1.2
diff --git a/NAMESPACE b/NAMESPACE
@@ -148,6 +148,7 @@ export(sf_bulk_operation)
 export(sf_close_job_bulk)
 export(sf_control)
 export(sf_convert_lead)
+export(sf_copy_dashboard)
 export(sf_copy_report)
 export(sf_create)
 export(sf_create_attachment)
@@ -157,24 +158,15 @@ export(sf_create_job_bulk_v1)
 export(sf_create_job_bulk_v2)
 export(sf_create_metadata)
 export(sf_create_report)
-export(sf_dashboard_components_describe)
-export(sf_dashboard_copy)
-export(sf_dashboard_delete)
-export(sf_dashboard_describe)
-export(sf_dashboard_filter_operators_list)
-export(sf_dashboard_filter_options_analysis)
-export(sf_dashboard_refresh)
-export(sf_dashboard_results)
-export(sf_dashboard_set_sticky_filter)
-export(sf_dashboard_status)
-export(sf_dashboard_update)
-export(sf_dashboards_list)
 export(sf_delete)
 export(sf_delete_attachment)
+export(sf_delete_dashboard)
 export(sf_delete_job_bulk)
 export(sf_delete_metadata)
 export(sf_delete_report)
 export(sf_delete_report_instance)
+export(sf_describe_dashboard)
+export(sf_describe_dashboard_components)
 export(sf_describe_metadata)
 export(sf_describe_object_fields)
 export(sf_describe_objects)
@@ -184,6 +176,8 @@ export(sf_download_attachment)
 export(sf_empty_recycle_bin)
 export(sf_end_job_bulk)
 export(sf_execute_report)
+export(sf_filter_dashboard_operators_list)
+export(sf_filter_dashboard_options_analysis)
 export(sf_find_duplicates)
 export(sf_find_duplicates_by_id)
 export(sf_format_date)
@@ -192,6 +186,8 @@ export(sf_format_time)
 export(sf_get_all_jobs_bulk)
 export(sf_get_all_query_jobs_bulk)
 export(sf_get_dashboard_data)
+export(sf_get_dashboard_results)
+export(sf_get_dashboard_status)
 export(sf_get_deleted)
 export(sf_get_job_bulk)
 export(sf_get_job_records_bulk)
@@ -201,6 +197,7 @@ export(sf_guess_cols)
 export(sf_input_data_validation)
 export(sf_job_batches_bulk)
 export(sf_list_api_limits)
+export(sf_list_dashboards)
 export(sf_list_metadata)
 export(sf_list_objects)
 export(sf_list_report_fields)
@@ -220,6 +217,7 @@ export(sf_query_result_bulk)
 export(sf_query_result_bulk_v1)
 export(sf_query_result_bulk_v2)
 export(sf_read_metadata)
+export(sf_refresh_dashboard)
 export(sf_rename_metadata)
 export(sf_reorder_cols)
 export(sf_report_folder_children)
@@ -246,11 +244,13 @@ export(sf_run_report)
 export(sf_search)
 export(sf_server_timestamp)
 export(sf_session_id)
+export(sf_set_dashboard_sticky_filter)
 export(sf_set_password)
 export(sf_submit_query_bulk)
 export(sf_undelete)
 export(sf_update)
 export(sf_update_attachment)
+export(sf_update_dashboard)
 export(sf_update_metadata)
 export(sf_update_report)
 export(sf_upload_complete_bulk)
@@ -304,6 +304,7 @@ importFrom(dplyr,contains)
 importFrom(dplyr,everything)
 importFrom(dplyr,expr)
 importFrom(dplyr,filter)
+importFrom(dplyr,if_all)
 importFrom(dplyr,is.tbl)
 importFrom(dplyr,matches)
 importFrom(dplyr,mutate)