Merge pull request #265 from navikt/revert-smproxy

Revert "Bruker syfosmregisterproxy i stedet for syfoapi"

js/sykmeldinger/data/sm-sykmeldinger/smSykmeldingerSagas.js

@@ -15,34 +15,19 @@ import {
     bekreftSmSykmeldingKvitteringVistLengeNok,
 } from './smSykmeldingerActions';
 import { skalBekrefteSmSykmeldingSelector, skalHenteSmSykmeldingerSelector } from './smSykmeldingerSelectors';
-import { get, post } from '../../../data/gateway-api';
+import {
+    API_NAVN, get, hentSyfoApiUrl, post,
+} from '../../../data/gateway-api';
 import { toggleNyttSykmeldingsmottak, unleashtogglesHentetSelector } from '../../../data/unleash-toggles/unleashTogglesSelectors';
 import { HENTET_UNLEASH_TOGGLES } from '../../../data/unleash-toggles/unleashToggles_actions';
 
-export const hentSykmeldingsregisterUrl = () => {
-    const url = window
-    && window.location
-    && window.location.href
-        ? window.location.href
-        : '';
-    if (url.indexOf('tjenester.nav') > -1) {
-        // Prod
-        return 'https://syfosmregisterproxy.nav.no';
-    } if (url.indexOf('localhost') > -1 || url.indexOf('herokuapp') > -1) {
-        // Lokalt
-        return '/syfosmregister';
-    }
-    // Preprod
-    return 'https://syfosmregisterproxy-q.nav.no';
-};
-
 export function* oppdaterSmSykmeldinger() {
     const toggle = yield select(toggleNyttSykmeldingsmottak);
     const toggleHentet = yield select(unleashtogglesHentetSelector);
     if (toggle && toggleHentet) {
         yield put(henterSmSykmeldinger());
         try {
-            const data = yield call(get, `${hentSykmeldingsregisterUrl()}/v1/sykmeldinger`);
+            const data = yield call(get, `${hentSyfoApiUrl(API_NAVN.SYFOSMREGISTER)}/v1/sykmeldinger`);
             yield put(smSykmeldingerHentet(data));
         } catch (e) {
             log(e);
@@ -66,7 +51,7 @@ export function* bekreftSmSykmeldingLestSaga(action) {
     if (toggle && skalBekrefte) {
         yield put(bekrefterLestSmSykmelding());
         try {
-            yield call(post, `${hentSykmeldingsregisterUrl()}/v1/sykmeldinger/${action.smSykmelding.id}/bekreft`);
+            yield call(post, `${hentSyfoApiUrl(API_NAVN.SYFOSMREGISTER)}/v1/sykmeldinger/${action.smSykmelding.id}/bekreft`);
             yield put(smSykmeldingBekreftetLest(action.smSykmelding));
             browserHistory.push('/sykefravaer');
             yield delay(10000);

mock/mockSmSykmeldinger.js

@@ -2,7 +2,7 @@ const mockData = require('./mockData');
 const enums = require('./mockDataEnums');
 
 function mockHentSykmeldinger(server) {
-    server.get('/syfosmregister/v1/sykmeldinger', (req, res) => {
+    server.get('/syfosmregister/api/v1/sykmeldinger', (req, res) => {
         res.setHeader('Content-Type', 'application/json');
         res.send(JSON.stringify(mockData[enums.SM_SYKMELDINGER]));
     });
@@ -11,7 +11,7 @@ function mockHentSykmeldinger(server) {
 function mockSmSykmeldingerLokalt(server) {
     mockHentSykmeldinger(server);
 
-    server.post('/syfosmregister/v1/sykmeldinger/:id/bekreft', (req, res) => {
+    server.post('/syfosmregister/api/v1/sykmeldinger/:id/bekreft', (req, res) => {
         res.status(200);
         setTimeout(() => {
             res.send('');