Skip to content

Commit 2af8891

Browse files
n7studiosn7studios
authored
Merge pull request #73 from ConvertKit/v4-api
v4 API
2 parents a470d4d + cc8dbfd commit 2af8891

12 files changed

+9586
-2984
lines changed

‎.env.dist.testing

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ TEST_TABLE_PREFIX=wp_
1616
TEST_SITE_WP_URL=http://127.0.0.1
1717
TEST_SITE_WP_DOMAIN=127.0.0.1
1818
[email protected]
19+
CONVERTKIT_API_BROADCAST_ID="8697158"
20+
CONVERTKIT_API_CUSTOM_FIELD_ID="258240"
1921
CONVERTKIT_API_FORM_ID="2765139"
2022
CONVERTKIT_API_LEGACY_FORM_ID="470099"
2123
CONVERTKIT_API_LANDING_PAGE_ID="2765196"
@@ -29,6 +31,8 @@ CONVERTKIT_API_PRODUCT_ID="36377"
2931
CONVERTKIT_API_SEQUENCE_ID="1030824"
3032
CONVERTKIT_API_TAG_NAME="wordpress"
3133
CONVERTKIT_API_TAG_ID="2744672"
34+
CONVERTKIT_API_TAG_NAME_2="gravityforms-tag-1"
35+
CONVERTKIT_API_TAG_ID_2="2907192"
3236
CONVERTKIT_API_SUBSCRIBER_EMAIL="[email protected]"
3337
CONVERTKIT_API_SUBSCRIBER_ID="1579118532"
3438
CONVERTKIT_API_RECOMMENDATIONS_JS="https://cheerful-architect-3237.ck.page/WnaDZ370gtgOq750dwOl-recommendations.js"

‎.env.example

+10-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,16 @@ TEST_TABLE_PREFIX=wp_
1616
TEST_SITE_WP_URL=http://convertkit.local
1717
TEST_SITE_WP_DOMAIN=convertkit.local
1818
TEST_SITE_ADMIN_EMAIL=[email protected]
19-
CONVERTKIT_API_KEY_NO_DATA=
20-
CONVERTKIT_API_SECRET_NO_DATA=
2119
CONVERTKIT_API_KEY=
2220
CONVERTKIT_API_SECRET=
21+
CONVERTKIT_OAUTH_ACCESS_TOKEN=
22+
CONVERTKIT_OAUTH_REFRESH_TOKEN=
23+
CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA=
24+
CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA=
25+
CONVERTKIT_OAUTH_CLIENT_ID=
26+
CONVERTKIT_OAUTH_REDIRECT_URI=
27+
CONVERTKIT_API_BROADCAST_ID="8697158"
28+
CONVERTKIT_API_CUSTOM_FIELD_ID="258240"
2329
CONVERTKIT_API_FORM_ID="2765139"
2430
CONVERTKIT_API_LEGACY_FORM_ID="470099"
2531
CONVERTKIT_API_LANDING_PAGE_ID="2765196"
@@ -33,6 +39,8 @@ CONVERTKIT_API_PRODUCT_ID="36377"
3339
CONVERTKIT_API_SEQUENCE_ID="1030824"
3440
CONVERTKIT_API_TAG_NAME="wordpress"
3541
CONVERTKIT_API_TAG_ID="2744672"
42+
CONVERTKIT_API_TAG_NAME_2="gravityforms-tag-1"
43+
CONVERTKIT_API_TAG_ID_2="2907192"
3644
CONVERTKIT_API_SUBSCRIBER_EMAIL="[email protected]"
3745
CONVERTKIT_API_SUBSCRIBER_ID="1579118532"
3846
CONVERTKIT_API_SIGNED_SUBSCRIBER_ID=

‎.github/workflows/tests.yml

+16-8
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,16 @@ jobs:
3131
DB_PASS: root
3232
DB_HOST: localhost
3333
INSTALL_PLUGINS: "woocommerce" # Don't include this repository's Plugin here.
34-
CONVERTKIT_API_KEY: ${{ secrets.CONVERTKIT_API_KEY }} # ConvertKit API Key, stored in the repository's Settings > Secrets
35-
CONVERTKIT_API_SECRET: ${{ secrets.CONVERTKIT_API_SECRET }} # ConvertKit API Secret, stored in the repository's Settings > Secrets
36-
CONVERTKIT_API_KEY_NO_DATA: ${{ secrets.CONVERTKIT_API_KEY_NO_DATA }} # ConvertKit API Key for ConvertKit account with no data, stored in the repository's Settings > Secrets
37-
CONVERTKIT_API_SECRET_NO_DATA: ${{ secrets.CONVERTKIT_API_SECRET_NO_DATA }} # ConvertKit API Secret for ConvertKit account with no data, stored in the repository's Settings > Secrets
38-
CONVERTKIT_API_SIGNED_SUBSCRIBER_ID: ${{ secrets.CONVERTKIT_API_SIGNED_SUBSCRIBER_ID }} # ConvertKit API Signed Subscriber ID, stored in the repository's Settings > Secrets
39-
CONVERTKIT_API_SUBSCRIBER_TOKEN: ${{ secrets.CONVERTKIT_API_SUBSCRIBER_TOKEN }} # ConvertKit API Subscriber Token, stored in the repository's Settings > Secrets
34+
CONVERTKIT_API_KEY: ${{ secrets.CONVERTKIT_API_KEY }}
35+
CONVERTKIT_API_SECRET: ${{ secrets.CONVERTKIT_API_SECRET }}
36+
CONVERTKIT_OAUTH_ACCESS_TOKEN: ${{ secrets.CONVERTKIT_OAUTH_ACCESS_TOKEN }}
37+
CONVERTKIT_OAUTH_REFRESH_TOKEN: ${{ secrets.CONVERTKIT_OAUTH_REFRESH_TOKEN }}
38+
CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA: ${{ secrets.CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA }}
39+
CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA: ${{ secrets.CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA }}
40+
CONVERTKIT_OAUTH_CLIENT_ID: ${{ secrets.CONVERTKIT_OAUTH_CLIENT_ID }}
41+
CONVERTKIT_OAUTH_REDIRECT_URI: ${{ secrets.CONVERTKIT_OAUTH_REDIRECT_URI }}
42+
CONVERTKIT_API_SIGNED_SUBSCRIBER_ID: ${{ secrets.CONVERTKIT_API_SIGNED_SUBSCRIBER_ID }}
43+
CONVERTKIT_API_SUBSCRIBER_TOKEN: ${{ secrets.CONVERTKIT_API_SUBSCRIBER_TOKEN }}
4044

4145
# Defines the WordPress and PHP Versions matrix to run tests on.
4246
strategy:
@@ -111,8 +115,12 @@ jobs:
111115
112116
CONVERTKIT_API_KEY=${{ env.CONVERTKIT_API_KEY }}
113117
CONVERTKIT_API_SECRET=${{ env.CONVERTKIT_API_SECRET }}
114-
CONVERTKIT_API_KEY_NO_DATA=${{ env.CONVERTKIT_API_KEY_NO_DATA }}
115-
CONVERTKIT_API_SECRET_NO_DATA=${{ env.CONVERTKIT_API_SECRET_NO_DATA }}
118+
CONVERTKIT_OAUTH_ACCESS_TOKEN=${{ env.CONVERTKIT_OAUTH_ACCESS_TOKEN }}
119+
CONVERTKIT_OAUTH_REFRESH_TOKEN=${{ env.CONVERTKIT_OAUTH_REFRESH_TOKEN }}
120+
CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA=${{ env.CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA }}
121+
CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA=${{ env.CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA }}
122+
CONVERTKIT_OAUTH_CLIENT_ID=${{ env.CONVERTKIT_OAUTH_CLIENT_ID }}
123+
CONVERTKIT_OAUTH_REDIRECT_URI=${{ env.CONVERTKIT_OAUTH_REDIRECT_URI }}
116124
CONVERTKIT_API_SIGNED_SUBSCRIBER_ID=${{ env.CONVERTKIT_API_SIGNED_SUBSCRIBER_ID }}
117125
CONVERTKIT_API_SUBSCRIBER_TOKEN=${{ env.CONVERTKIT_API_SUBSCRIBER_TOKEN }}
118126
write-mode: append

‎SETUP.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,12 @@ TEST_TABLE_PREFIX=wp_
6565
TEST_SITE_WP_URL=http://convertkit.local
6666
TEST_SITE_WP_DOMAIN=convertkit.local
6767
[email protected]
68-
CONVERTKIT_API_KEY_NO_DATA=
69-
CONVERTKIT_API_SECRET_NO_DATA=
70-
CONVERTKIT_API_KEY=
71-
CONVERTKIT_API_SECRET=
68+
CONVERTKIT_OAUTH_ACCESS_TOKEN=
69+
CONVERTKIT_OAUTH_REFRESH_TOKEN=
70+
CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA=
71+
CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA=
72+
CONVERTKIT_OAUTH_CLIENT_ID=
73+
CONVERTKIT_OAUTH_REDIRECT_URI=
7274
CONVERTKIT_API_FORM_ID="2765139"
7375
CONVERTKIT_API_SEQUENCE_ID="1030824"
7476
CONVERTKIT_API_TAG_ID="2744672"

‎phpcs.xml

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<!-- Exclude minified Javascript files. -->
1212
<exclude-pattern>*.min.js</exclude-pattern>
1313

14+
<!-- Exclude traits from the PHP SDK. -->
15+
<exclude-pattern>class-convertkit-api-traits.php</exclude-pattern>
16+
1417
<!-- Check that code meets WordPress-Extra standards. -->
1518
<rule ref="WordPress-Extra">
1619
<!--

0 commit comments

Comments
 (0)