From 289f821dcfde01c10a5d84a7b0a7ae99a1eb2e13 Mon Sep 17 00:00:00 2001
From: Andreas Weber <weber.andreas@gmail.com>
Date: Fri, 14 Jul 2023 22:20:44 +0200
Subject: [PATCH] feat: add method `$getOAuth2Response` to javascript context
 (#499)

---
 CHANGELOG.md                    |  6 ++++++
 package-lock.json               |  8 ++++----
 package.json                    |  2 +-
 src/plugins/oauth2/index.ts     |  5 ++++-
 src/test/variables/pick.spec.ts | 16 +++++-----------
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee15db59..cf953531 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [unreleased]
+
+### Features
+
+- add method `$getOAuth2Response` to javascript context (#499)
+
 ## [6.5.1]  (2023-06-13)
 
 ### Fixes
diff --git a/package-lock.json b/package-lock.json
index 2b496f73..24bf0371 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "filesize": "^10.0.7",
         "globby": "^13.2.2",
         "got": "^11.8.6",
-        "hookpoint": "^3.2.0",
+        "hookpoint": "3.2.1",
         "http-proxy-agent": "^7.0.0",
         "https-proxy-agent": "^7.0.1",
         "inquirer": "^9.2.8",
@@ -5370,9 +5370,9 @@
       }
     },
     "node_modules/hookpoint": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/hookpoint/-/hookpoint-3.2.0.tgz",
-      "integrity": "sha512-XsI0+AQIVDLvS8/Y4k1pA2E+Zkb+wToSHotR5NuzRHSR257aTwcadoLqrQKLQ70xDEeT0vyMz/7mmons7pDguw==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/hookpoint/-/hookpoint-3.2.1.tgz",
+      "integrity": "sha512-aj/kGFoZ27fxTHJg2PqEVo8VtZPgDXRPqhG99bdFA8vmo++LcN8VBObVYapWQvzjIkA7DbUBQeyfSQa8dLfzDg==",
       "engines": {
         "node": ">=14.16"
       }
diff --git a/package.json b/package.json
index eee52783..668f61a7 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "filesize": "^10.0.7",
     "globby": "^13.2.2",
     "got": "^11.8.6",
-    "hookpoint": "^3.2.0",
+    "hookpoint": "3.2.1",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.1",
     "inquirer": "^9.2.8",
diff --git a/src/plugins/oauth2/index.ts b/src/plugins/oauth2/index.ts
index 04f1be1c..20885534 100644
--- a/src/plugins/oauth2/index.ts
+++ b/src/plugins/oauth2/index.ts
@@ -1,6 +1,9 @@
 import * as models from '../../models';
-import { oauth2VariableReplacer } from './oauth2VariableReplacer';
+import { oauth2VariableReplacer, getOAuth2Response } from './oauth2VariableReplacer';
 
 export function registerOAuth2Plugin(api: models.HttpyacHooksApi) {
   api.hooks.replaceVariable.addHook('oauth2', oauth2VariableReplacer);
+  api.hooks.provideVariables.addHook('oauth2', () => ({
+    $getOAuth2Response: getOAuth2Response,
+  }));
 }
diff --git a/src/test/variables/pick.spec.ts b/src/test/variables/pick.spec.ts
index 926f7033..37bb2425 100644
--- a/src/test/variables/pick.spec.ts
+++ b/src/test/variables/pick.spec.ts
@@ -7,7 +7,7 @@ describe('variables.pick', () => {
   it('pick', async () => {
     initFileProvider();
     const spy = jest.spyOn(userInteractionProvider, 'showListPrompt');
-    const variables = {};
+    const variables: Record<string, unknown> = {};
 
     await sendHttp(
       `
@@ -17,15 +17,12 @@ describe('variables.pick', () => {
     );
 
     expect(spy).toHaveBeenCalledWith('pick me?', ['foo', 'bar']);
-    expect(variables).toEqual({
-      $global: {},
-      var1: 'foo',
-    });
+    expect(variables.var1).toBe('foo');
   });
   it('pick-askonce', async () => {
     initFileProvider();
     const spy = jest.spyOn(userInteractionProvider, 'showListPrompt');
-    const variables = {};
+    const variables: Record<string, unknown> = {};
 
     await sendHttp(
       `
@@ -36,10 +33,7 @@ describe('variables.pick', () => {
     );
 
     expect(spy).toHaveBeenCalledWith('ask-once?', ['foo', 'bar']);
-    expect(variables).toEqual({
-      $global: {},
-      var1: 'foo',
-      var2: 'foo',
-    });
+    expect(variables.var1).toEqual('foo');
+    expect(variables.var2).toEqual('foo');
   });
 });