Contrib.social

Move Ephemeral Token Data Out of Config and Into State

Open on Drupal.org →
Created on 10 April 2024, 9 months ago

Problem/Motivation

The token data stored in eloqua_api_redux.tokens changes often and will be different on servers other than the production one. When the data changes, config status will show changes, seemingly a problem. Deployments that automatically import configuration will override the data.

Steps to reproduce

  1. Import configuration from code
  2. Refresh the tokens or wait 8 hours for some to expire.
  3. Config status will show changes, which will get overwritten if the config is imported.

Proposed resolution

Move the data storage to Drupal state.

Remaining tasks

Update the API client code.

User interface changes

None.

API changes

Change where the data is stored.

Data model changes

None.

📌 Task
Status

Active

Version

2.0

Component

Code

Created by

🇺🇸United States papagrande US West Coast

Live updates comments and jobs are added and updated live.
Sign in to follow issues

Merge Requests

Comments & Activities

  • Issue created by @papagrande
  • Merge request !5Resolve #3440052 "Move ephemeral token" → (Merged) created by papagrande
  • Issue was unassigned.
  • Status changed to Needs review 9 months ago
  • Comment 9 months ago →
    🇺🇸United States papagrande US West Coast

    Ready for review.

  • Pipeline finished with Failed
    9 months ago
    #143412
  • Comment 8 months ago →
    🇺🇸United States erindarri

    I am having trouble applying this patch against a clean install of v2.0.0.

    Here is the whole patch message:

      - Applying patches for drupal/eloqua_api_redux
    https://git.drupalcode.org/project/eloqua_api_redux/-/merge_requests/5.patch (3440052: Move Ephemeral Token Data Out of Config and Into State (https://www.drupal.org/project/eloqua_api_redux/issues/3440052))
patch '-p1' --no-backup-if-mismatch -d '/var/www/html/web/modules/contrib/eloqua_api_redux' < '/tmp/662a79c8ba0ee.patch'
patching file eloqua_api_redux.post_update.php

patching file eloqua_api_redux.services.yml
patching file src/Form/Settings.php

patching file src/Service/EloquaApiClient.php
Hunk #4 succeeded at 64 with fuzz 2.

Hunk #9 succeeded at 261 (offset -1 lines).
Hunk #10 succeeded at 317 (offset -3 lines).
Hunk #11 succeeded at 348 (offset -4 lines).
Hunk #12 succeeded at 367 (offset -4 lines).

patching file src/Service/EloquaApiClient.php
Hunk #1 succeeded at 311 (offset -3 lines).
Hunk #2 succeeded at 429 (offset -4 lines).

patching file src/Service/EloquaApiClient.php
Hunk #3 succeeded at 267 with fuzz 1 (offset -1 lines).
Hunk #4 succeeded at 372 (offset -4 lines).
patching file config/install/eloqua_api_redux.tokens.yml
patching file src/Service/EloquaApiClient.php
Hunk #4 FAILED at 148.
Hunk #5 FAILED at 236.
Hunk #6 succeeded at 383 (offset -4 lines).
2 out of 6 hunks FAILED -- saving rejects to file src/Service/EloquaApiClient.php.rej
patching file src/Service/EloquaApiClientInterface.php
patching file tests/src/Unit/EloquaApiClientTest.php
Hunk #1 succeeded at 72 (offset -5 lines).
Hunk #2 succeeded at 107 (offset -5 lines).
Hunk #3 FAILED at 142.
Hunk #4 FAILED at 177.
Hunk #5 FAILED at 229.
Hunk #6 FAILED at 278.
4 out of 6 hunks FAILED -- saving rejects to file tests/src/Unit/EloquaApiClientTest.php.rej

patching file src/Service/EloquaApiClient.php
Hunk #1 succeeded at 318 (offset 9 lines).
Hunk #2 succeeded at 342 (offset 9 lines).

patch '-p0' --no-backup-if-mismatch -d '/var/www/html/web/modules/contrib/eloqua_api_redux' < '/tmp/662a79c8ba0ee.patch'
patching file b/eloqua_api_redux.post_update.php
can't find file to patch at input line 56
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/eloqua_api_redux.services.yml b/eloqua_api_redux.services.yml
|index ffd09b4..3d75791 100644
|--- a/eloqua_api_redux.services.yml
|+++ b/eloqua_api_redux.services.yml
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored

can't find file to patch at input line 69
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/Form/Settings.php b/src/Form/Settings.php
|index 4c71511..7c1da72 100644
|--- a/src/Form/Settings.php
|+++ b/src/Form/Settings.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
6 out of 6 hunks ignored

can't find file to patch at input line 143
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/Service/EloquaApiClient.php b/src/Service/EloquaApiClient.php
|index 0658d9f..461ff95 100644
|--- a/src/Service/EloquaApiClient.php
|+++ b/src/Service/EloquaApiClient.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

12 out of 12 hunks ignored
can't find file to patch at input line 364
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From 56e5bfc322fd3130a99ae7b8b170c02905a463a3 Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 10 Apr 2024 16:26:16 -0700
|Subject: [PATCH 2/7] Fix phpstan comparisons
|
|---
| src/Service/EloquaApiClient.php | 8 ++++----
| 1 file changed, 4 insertions(+), 4 deletions(-)
|
|diff --git a/src/Service/EloquaApiClient.php b/src/Service/EloquaApiClient.php
|index 461ff95..816a3ec 100644
|--- a/src/Service/EloquaApiClient.php
|+++ b/src/Service/EloquaApiClient.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

2 out of 2 hunks ignored
can't find file to patch at input line 406
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From 3996aafeaf623991b46694843f3e4f767dad0243 Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 10 Apr 2024 16:37:34 -0700
|Subject: [PATCH 3/7] Fix phpstan empty() errors
|
|---
| src/Service/EloquaApiClient.php | 9 +++++----
| 1 file changed, 5 insertions(+), 4 deletions(-)
|
|diff --git a/src/Service/EloquaApiClient.php b/src/Service/EloquaApiClient.php
|index 816a3ec..3deaec6 100644
|--- a/src/Service/EloquaApiClient.php
|+++ b/src/Service/EloquaApiClient.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
4 out of 4 hunks ignored
The next patch would delete the file a/config/install/eloqua_api_redux.tokens.yml,
which does not exist!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 485
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From 648841879314e6bec1983819d9dae955d3f4b5df Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 10 Apr 2024 17:04:30 -0700
|Subject: [PATCH 5/7] Add EloquaApiClientInterface
|
|---
| src/Service/EloquaApiClient.php          | 57 ++--------------
| src/Service/EloquaApiClientInterface.php | 82 ++++++++++++++++++++++++
| 2 files changed, 88 insertions(+), 51 deletions(-)
| create mode 100644 src/Service/EloquaApiClientInterface.php
|
|diff --git a/src/Service/EloquaApiClient.php b/src/Service/EloquaApiClient.php
|index 3deaec6..0ddf270 100644
|--- a/src/Service/EloquaApiClient.php
|+++ b/src/Service/EloquaApiClient.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

6 out of 6 hunks ignored

patching file b/src/Service/EloquaApiClientInterface.php
can't find file to patch at input line 689
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From f2c26b6795e7dfeef59bed31e62b0b36c84fe567 Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 10 Apr 2024 17:13:41 -0700
|Subject: [PATCH 6/7] Fix tests after renaming functions
|
|---
| tests/src/Unit/EloquaApiClientTest.php | 29 +++++++++++++++++++-------
| 1 file changed, 21 insertions(+), 8 deletions(-)
|
|diff --git a/tests/src/Unit/EloquaApiClientTest.php b/tests/src/Unit/EloquaApiClientTest.php
|index 789249a..4a0e9f2 100644
|--- a/tests/src/Unit/EloquaApiClientTest.php
|+++ b/tests/src/Unit/EloquaApiClientTest.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

6 out of 6 hunks ignored
can't find file to patch at input line 796
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From 9aa3a88bd8845f5cb0d7b8748d4d90dfa49762dc Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 17 Apr 2024 17:21:12 -0700
|Subject: [PATCH 7/7] Update method annotations
|
|---
| src/Service/EloquaApiClient.php | 4 ++--
| 1 file changed, 2 insertions(+), 2 deletions(-)
|
|diff --git a/src/Service/EloquaApiClient.php b/src/Service/EloquaApiClient.php
|index 0ddf270..ab318a6 100644
|--- a/src/Service/EloquaApiClient.php
|+++ b/src/Service/EloquaApiClient.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

2 out of 2 hunks ignored

patch '-p2' --no-backup-if-mismatch -d '/var/www/html/web/modules/contrib/eloqua_api_redux' < '/tmp/662a79c8ba0ee.patch'
can't find file to patch at input line 19
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 8c963fca6a746538b58f2a7b79242cc8d01924f1 Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 10 Apr 2024 16:25:59 -0700
|Subject: [PATCH 1/7] Move tokens from config to state
|
|---
| eloqua_api_redux.post_update.php | 32 ++++++++++++
| eloqua_api_redux.services.yml    |  2 +-
| src/Form/Settings.php            | 25 +++++++--
| src/Service/EloquaApiClient.php  | 90 +++++++++++++++++++-------------
| 4 files changed, 108 insertions(+), 41 deletions(-)
| create mode 100644 eloqua_api_redux.post_update.php
|
|diff --git a/eloqua_api_redux.post_update.php b/eloqua_api_redux.post_update.php
|new file mode 100644
|index 0000000..68d24bc
|--- /dev/null
|+++ b/eloqua_api_redux.post_update.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 56
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/eloqua_api_redux.services.yml b/eloqua_api_redux.services.yml
|index ffd09b4..3d75791 100644
|--- a/eloqua_api_redux.services.yml
|+++ b/eloqua_api_redux.services.yml
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

1 out of 1 hunk ignored
can't find file to patch at input line 69
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/Form/Settings.php b/src/Form/Settings.php
|index 4c71511..7c1da72 100644
|--- a/src/Form/Settings.php
|+++ b/src/Form/Settings.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

6 out of 6 hunks ignored
can't find file to patch at input line 143
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/Service/EloquaApiClient.php b/src/Service/EloquaApiClient.php
|index 0658d9f..461ff95 100644
|--- a/src/Service/EloquaApiClient.php
|+++ b/src/Service/EloquaApiClient.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

12 out of 12 hunks ignored
can't find file to patch at input line 364
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From 56e5bfc322fd3130a99ae7b8b170c02905a463a3 Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 10 Apr 2024 16:26:16 -0700
|Subject: [PATCH 2/7] Fix phpstan comparisons
|
|---
| src/Service/EloquaApiClient.php | 8 ++++----
| 1 file changed, 4 insertions(+), 4 deletions(-)
|
|diff --git a/src/Service/EloquaApiClient.php b/src/Service/EloquaApiClient.php
|index 461ff95..816a3ec 100644
|--- a/src/Service/EloquaApiClient.php
|+++ b/src/Service/EloquaApiClient.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

2 out of 2 hunks ignored
can't find file to patch at input line 406
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From 3996aafeaf623991b46694843f3e4f767dad0243 Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 10 Apr 2024 16:37:34 -0700
|Subject: [PATCH 3/7] Fix phpstan empty() errors
|
|---
| src/Service/EloquaApiClient.php | 9 +++++----
| 1 file changed, 5 insertions(+), 4 deletions(-)
|
|diff --git a/src/Service/EloquaApiClient.php b/src/Service/EloquaApiClient.php
|index 816a3ec..3deaec6 100644
|--- a/src/Service/EloquaApiClient.php
|+++ b/src/Service/EloquaApiClient.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

4 out of 4 hunks ignored

The next patch would delete the file install/eloqua_api_redux.tokens.yml,
which does not exist!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.

1 out of 1 hunk ignored
can't find file to patch at input line 485
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From 648841879314e6bec1983819d9dae955d3f4b5df Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 10 Apr 2024 17:04:30 -0700
|Subject: [PATCH 5/7] Add EloquaApiClientInterface
|
|---
| src/Service/EloquaApiClient.php          | 57 ++--------------
| src/Service/EloquaApiClientInterface.php | 82 ++++++++++++++++++++++++
| 2 files changed, 88 insertions(+), 51 deletions(-)
| create mode 100644 src/Service/EloquaApiClientInterface.php
|
|diff --git a/src/Service/EloquaApiClient.php b/src/Service/EloquaApiClient.php
|index 3deaec6..0ddf270 100644
|--- a/src/Service/EloquaApiClient.php
|+++ b/src/Service/EloquaApiClient.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

6 out of 6 hunks ignored

patching file Service/EloquaApiClientInterface.php

can't find file to patch at input line 689
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From f2c26b6795e7dfeef59bed31e62b0b36c84fe567 Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 10 Apr 2024 17:13:41 -0700
|Subject: [PATCH 6/7] Fix tests after renaming functions
|
|---
| tests/src/Unit/EloquaApiClientTest.php | 29 +++++++++++++++++++-------
| 1 file changed, 21 insertions(+), 8 deletions(-)
|
|diff --git a/tests/src/Unit/EloquaApiClientTest.php b/tests/src/Unit/EloquaApiClientTest.php
|index 789249a..4a0e9f2 100644
|--- a/tests/src/Unit/EloquaApiClientTest.php
|+++ b/tests/src/Unit/EloquaApiClientTest.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

6 out of 6 hunks ignored
can't find file to patch at input line 796
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From 9aa3a88bd8845f5cb0d7b8748d4d90dfa49762dc Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 17 Apr 2024 17:21:12 -0700
|Subject: [PATCH 7/7] Update method annotations
|
|---
| src/Service/EloquaApiClient.php | 4 ++--
| 1 file changed, 2 insertions(+), 2 deletions(-)
|
|diff --git a/src/Service/EloquaApiClient.php b/src/Service/EloquaApiClient.php
|index 0ddf270..ab318a6 100644
|--- a/src/Service/EloquaApiClient.php
|+++ b/src/Service/EloquaApiClient.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

2 out of 2 hunks ignored

patch '-p4' --no-backup-if-mismatch -d '/var/www/html/web/modules/contrib/eloqua_api_redux' < '/tmp/662a79c8ba0ee.patch'
can't find file to patch at input line 19
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 8c963fca6a746538b58f2a7b79242cc8d01924f1 Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 10 Apr 2024 16:25:59 -0700
|Subject: [PATCH 1/7] Move tokens from config to state
|
|---
| eloqua_api_redux.post_update.php | 32 ++++++++++++
| eloqua_api_redux.services.yml    |  2 +-
| src/Form/Settings.php            | 25 +++++++--
| src/Service/EloquaApiClient.php  | 90 +++++++++++++++++++-------------
| 4 files changed, 108 insertions(+), 41 deletions(-)
| create mode 100644 eloqua_api_redux.post_update.php
|
|diff --git a/eloqua_api_redux.post_update.php b/eloqua_api_redux.post_update.php
|new file mode 100644
|index 0000000..68d24bc
|--- /dev/null
|+++ b/eloqua_api_redux.post_update.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

1 out of 1 hunk ignored
can't find file to patch at input line 56
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/eloqua_api_redux.services.yml b/eloqua_api_redux.services.yml
|index ffd09b4..3d75791 100644
|--- a/eloqua_api_redux.services.yml
|+++ b/eloqua_api_redux.services.yml
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

1 out of 1 hunk ignored
can't find file to patch at input line 69
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/Form/Settings.php b/src/Form/Settings.php
|index 4c71511..7c1da72 100644
|--- a/src/Form/Settings.php
|+++ b/src/Form/Settings.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

6 out of 6 hunks ignored
can't find file to patch at input line 143
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/Service/EloquaApiClient.php b/src/Service/EloquaApiClient.php
|index 0658d9f..461ff95 100644
|--- a/src/Service/EloquaApiClient.php
|+++ b/src/Service/EloquaApiClient.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

12 out of 12 hunks ignored
can't find file to patch at input line 364
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From 56e5bfc322fd3130a99ae7b8b170c02905a463a3 Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 10 Apr 2024 16:26:16 -0700
|Subject: [PATCH 2/7] Fix phpstan comparisons
|
|---
| src/Service/EloquaApiClient.php | 8 ++++----
| 1 file changed, 4 insertions(+), 4 deletions(-)
|
|diff --git a/src/Service/EloquaApiClient.php b/src/Service/EloquaApiClient.php
|index 461ff95..816a3ec 100644
|--- a/src/Service/EloquaApiClient.php
|+++ b/src/Service/EloquaApiClient.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

2 out of 2 hunks ignored
can't find file to patch at input line 406
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From 3996aafeaf623991b46694843f3e4f767dad0243 Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 10 Apr 2024 16:37:34 -0700
|Subject: [PATCH 3/7] Fix phpstan empty() errors
|
|---
| src/Service/EloquaApiClient.php | 9 +++++----
| 1 file changed, 5 insertions(+), 4 deletions(-)
|
|diff --git a/src/Service/EloquaApiClient.php b/src/Service/EloquaApiClient.php
|index 816a3ec..3deaec6 100644
|--- a/src/Service/EloquaApiClient.php
|+++ b/src/Service/EloquaApiClient.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

4 out of 4 hunks ignored
can't find file to patch at input line 462
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From 2aab2b832ea576c8d293e97816d7a481ff81acbc Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 10 Apr 2024 16:44:32 -0700
|Subject: [PATCH 4/7] Remove deprecated config install file
|
|---
| config/install/eloqua_api_redux.tokens.yml | 3 ---
| 1 file changed, 3 deletions(-)
| delete mode 100644 config/install/eloqua_api_redux.tokens.yml
|
|diff --git a/config/install/eloqua_api_redux.tokens.yml b/config/install/eloqua_api_redux.tokens.yml
|deleted file mode 100644
|index 7ebecb4..0000000
|--- a/config/install/eloqua_api_redux.tokens.yml
|+++ /dev/null
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

1 out of 1 hunk ignored
can't find file to patch at input line 485
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From 648841879314e6bec1983819d9dae955d3f4b5df Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 10 Apr 2024 17:04:30 -0700
|Subject: [PATCH 5/7] Add EloquaApiClientInterface
|
|---
| src/Service/EloquaApiClient.php          | 57 ++--------------
| src/Service/EloquaApiClientInterface.php | 82 ++++++++++++++++++++++++
| 2 files changed, 88 insertions(+), 51 deletions(-)
| create mode 100644 src/Service/EloquaApiClientInterface.php
|
|diff --git a/src/Service/EloquaApiClient.php b/src/Service/EloquaApiClient.php
|index 3deaec6..0ddf270 100644
|--- a/src/Service/EloquaApiClient.php
|+++ b/src/Service/EloquaApiClient.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

6 out of 6 hunks ignored
can't find file to patch at input line 589
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/Service/EloquaApiClientInterface.php b/src/Service/EloquaApiClientInterface.php
|new file mode 100644
|index 0000000..e9641d2
|--- /dev/null
|+++ b/src/Service/EloquaApiClientInterface.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

1 out of 1 hunk ignored
can't find file to patch at input line 689
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From f2c26b6795e7dfeef59bed31e62b0b36c84fe567 Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 10 Apr 2024 17:13:41 -0700
|Subject: [PATCH 6/7] Fix tests after renaming functions
|
|---
| tests/src/Unit/EloquaApiClientTest.php | 29 +++++++++++++++++++-------
| 1 file changed, 21 insertions(+), 8 deletions(-)
|
|diff --git a/tests/src/Unit/EloquaApiClientTest.php b/tests/src/Unit/EloquaApiClientTest.php
|index 789249a..4a0e9f2 100644
|--- a/tests/src/Unit/EloquaApiClientTest.php
|+++ b/tests/src/Unit/EloquaApiClientTest.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

6 out of 6 hunks ignored
can't find file to patch at input line 796
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|-- 
|GitLab
|
|
|From 9aa3a88bd8845f5cb0d7b8748d4d90dfa49762dc Mon Sep 17 00:00:00 2001
|From: Will Hartmann <will.hartmann@vtpventures.com>
|Date: Wed, 17 Apr 2024 17:21:12 -0700
|Subject: [PATCH 7/7] Update method annotations
|
|---
| src/Service/EloquaApiClient.php | 4 ++--
| 1 file changed, 2 insertions(+), 2 deletions(-)
|
|diff --git a/src/Service/EloquaApiClient.php b/src/Service/EloquaApiClient.php
|index 0ddf270..ab318a6 100644
|--- a/src/Service/EloquaApiClient.php
|+++ b/src/Service/EloquaApiClient.php
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.

2 out of 2 hunks ignored

   Could not apply patch! Skipping. The error was: Cannot apply patch https://git.drupalcode.org/project/eloqua_api_redux/-/merge_requests/5.patch

In Patches.php line 331:
                                                                               
  [Exception]                                                                  
  Cannot apply patch 3440052: Move Ephemeral Token Data Out of Config and Int  
  o State (https://www.drupal.org/project/eloqua_api_redux/issues/3440052) (h  
  ttps://git.drupalcode.org/project/eloqua_api_redux/-/merge_requests/5.patch  
  )!
  • Status changed to Postponed 8 months ago
  • Comment 8 months ago →
    🇺🇸United States papagrande US West Coast

    MR #5 conflicts with #4 in #3358253 📌 Provide a message to the end user when the authentication token fails Needs review , which is higher priority so I'm postponing until that MR is merged in.

  • Status changed to Needs review 26 days ago
  • Comment 26 days ago →
    🇺🇸United States papagrande US West Coast

    #3358253 was merged in so we can move forward on this issue.

  • Comment 13 days ago →
    🇺🇸United States erindarri

    I tested this in a local environment. The tokens are getting moved to state as expected. I'm still able to update the tokens as I had been before.

  • Pipeline finished with Skipped
    12 days ago
    #364856
  • Comment 12 days ago →
    System Message
    • papagrande → committed 92df37fb on 2.0.x 
      Issue #3440052 by papagrande, erindarri: Move Ephemeral Token Data Out...
  • Comment 12 days ago →
    🇺🇸United States papagrande US West Coast

    Thanks, @erindarri

contrib.social Blog FAQ Discussions
Production build 0.71.5 2024