Add latest changes from gitlab-org/gitlab@master

2 files changed, 38 insertions, 7 deletions

diff --git a/app/assets/javascripts/jira_connect/subscriptions/api.js b/app/assets/javascripts/jira_connect/subscriptions/api.js
index de67703356f..ffe5642fc62 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/api.js
+++ b/app/assets/javascripts/jira_connect/subscriptions/api.js
@@ -1,10 +1,17 @@
 import axios from 'axios';
+import { buildApiUrl } from '~/api/api_utils';
+
 import { getJwt } from './utils';
 
+const CURRENT_USER_PATH = '/api/:version/user';
+const JIRA_CONNECT_SUBSCRIPTIONS_PATH = '/api/:version/integrations/jira_connect/subscriptions';
+
+export const axiosInstance = axios.create();
+
 export const addSubscription = async (addPath, namespace) => {
   const jwt = await getJwt();
 
-  return axios.post(addPath, {
+  return axiosInstance.post(addPath, {
     jwt,
     namespace_path: namespace,
   });
@@ -13,7 +20,7 @@ export const addSubscription = async (addPath, namespace) => {
 export const removeSubscription = async (removePath) => {
   const jwt = await getJwt();
 
-  return axios.delete(removePath, {
+  return axiosInstance.delete(removePath, {
     params: {
       jwt,
     },
@@ -21,7 +28,7 @@ export const removeSubscription = async (removePath) => {
 };
 
 export const fetchGroups = async (groupsPath, { page, perPage, search }) => {
-  return axios.get(groupsPath, {
+  return axiosInstance.get(groupsPath, {
     params: {
       page,
       per_page: perPage,
@@ -33,9 +40,31 @@ export const fetchGroups = async (groupsPath, { page, perPage, search }) => {
 export const fetchSubscriptions = async (subscriptionsPath) => {
   const jwt = await getJwt();
 
-  return axios.get(subscriptionsPath, {
+  return axiosInstance.get(subscriptionsPath, {
     params: {
       jwt,
     },
   });
 };
+
+export const getCurrentUser = (options) => {
+  const url = buildApiUrl(CURRENT_USER_PATH);
+  return axiosInstance.get(url, { ...options });
+};
+
+export const addJiraConnectSubscription = (namespacePath, { jwt, accessToken }) => {
+  const url = buildApiUrl(JIRA_CONNECT_SUBSCRIPTIONS_PATH);
+
+  return axiosInstance.post(
+    url,
+    {
+      jwt,
+      namespace_path: namespacePath,
+    },
+    {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+      },
+    },
+  );
+};
diff --git a/app/assets/javascripts/jira_connect/subscriptions/store/actions.js b/app/assets/javascripts/jira_connect/subscriptions/store/actions.js
index 4a83ee8671d..fff34e1d75d 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/store/actions.js
+++ b/app/assets/javascripts/jira_connect/subscriptions/store/actions.js
@@ -1,6 +1,8 @@
-import { fetchSubscriptions as fetchSubscriptionsREST } from '~/jira_connect/subscriptions/api';
-import { getCurrentUser } from '~/rest_api';
-import { addJiraConnectSubscription } from '~/api/integrations_api';
+import {
+  fetchSubscriptions as fetchSubscriptionsREST,
+  getCurrentUser,
+  addJiraConnectSubscription,
+} from '~/jira_connect/subscriptions/api';
 import {
   I18N_ADD_SUBSCRIPTION_SUCCESS_ALERT_TITLE,
   I18N_ADD_SUBSCRIPTION_SUCCESS_ALERT_MESSAGE,