From 3f5659549d31fff9c13d71f16a905cd66120de5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Fri, 5 Oct 2018 14:17:25 +0200 Subject: [PATCH] user config link --- scm-ui/src/config/modules/config.js | 6 +++--- scm-ui/src/modules/auth.js | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scm-ui/src/config/modules/config.js b/scm-ui/src/config/modules/config.js index 02f55b346f..76ab2dee5e 100644 --- a/scm-ui/src/config/modules/config.js +++ b/scm-ui/src/config/modules/config.js @@ -6,6 +6,7 @@ import { isPending } from "../../modules/pending"; import { getFailure } from "../../modules/failure"; import { Dispatch } from "redux"; import type { Config } from "@scm-manager/ui-types"; +import { getConfigLink } from "../../modules/indexResource"; export const FETCH_CONFIG = "scm/config/FETCH_CONFIG"; export const FETCH_CONFIG_PENDING = `${FETCH_CONFIG}_${types.PENDING_SUFFIX}`; @@ -18,15 +19,14 @@ export const MODIFY_CONFIG_SUCCESS = `${MODIFY_CONFIG}_${types.SUCCESS_SUFFIX}`; export const MODIFY_CONFIG_FAILURE = `${MODIFY_CONFIG}_${types.FAILURE_SUFFIX}`; export const MODIFY_CONFIG_RESET = `${MODIFY_CONFIG}_${types.RESET_SUFFIX}`; -const CONFIG_URL = "config"; const CONTENT_TYPE_CONFIG = "application/vnd.scmm-config+json;v=2"; //fetch config export function fetchConfig() { - return function(dispatch: any) { + return function(dispatch: any, getState: any) { dispatch(fetchConfigPending()); return apiClient - .get(CONFIG_URL) + .get(getConfigLink(getState())) .then(response => { return response.json(); }) diff --git a/scm-ui/src/modules/auth.js b/scm-ui/src/modules/auth.js index 35dde975cc..f150c59d3c 100644 --- a/scm-ui/src/modules/auth.js +++ b/scm-ui/src/modules/auth.js @@ -5,6 +5,7 @@ import * as types from "./types"; import { apiClient, UNAUTHORIZED_ERROR } from "@scm-manager/ui-components"; import { isPending } from "./pending"; import { getFailure } from "./failure"; +import { getMeLink } from "./indexResource"; // Action