From 29d9d49f5a76b8ee85458276db86806ff2c02afa Mon Sep 17 00:00:00 2001 From: Philip Molares Date: Thu, 15 Apr 2021 22:10:15 +0200 Subject: [PATCH] Change api route to /api/private (#1189) --- cypress/integration/fileUpload.spec.ts | 4 ++-- cypress/integration/history.spec.ts | 4 ++-- cypress/integration/profile.spec.ts | 6 +++--- cypress/integration/signInButton.spec.ts | 2 +- cypress/support/config.ts | 2 +- cypress/support/visit-test-editor.ts | 2 +- public/api/{v2 => private}/config | 0 public/api/{v2 => private}/history | 0 public/api/{v2 => private}/me | 0 public/api/{v2 => private}/notes/banner | 0 public/api/{v2 => private}/notes/features-get | 0 public/api/{v2 => private}/notes/features/revisions-list | 0 .../api/{v2 => private}/notes/features/revisions/1598389571 | 0 .../api/{v2 => private}/notes/features/revisions/1598390307 | 0 public/api/{v2 => private}/notes/old | 0 public/api/{v2 => private}/tokens | 0 public/api/{v2 => private}/users/dermolly | 0 public/api/{v2 => private}/users/emcrx | 0 public/api/{v2 => private}/users/mrdrogdrog | 0 .../application-loader/initializers/configLoader.ts | 2 +- 20 files changed, 11 insertions(+), 11 deletions(-) rename public/api/{v2 => private}/config (100%) rename public/api/{v2 => private}/history (100%) rename public/api/{v2 => private}/me (100%) rename public/api/{v2 => private}/notes/banner (100%) rename public/api/{v2 => private}/notes/features-get (100%) rename public/api/{v2 => private}/notes/features/revisions-list (100%) rename public/api/{v2 => private}/notes/features/revisions/1598389571 (100%) rename public/api/{v2 => private}/notes/features/revisions/1598390307 (100%) rename public/api/{v2 => private}/notes/old (100%) rename public/api/{v2 => private}/tokens (100%) rename public/api/{v2 => private}/users/dermolly (100%) rename public/api/{v2 => private}/users/emcrx (100%) rename public/api/{v2 => private}/users/mrdrogdrog (100%) diff --git a/cypress/integration/fileUpload.spec.ts b/cypress/integration/fileUpload.spec.ts index f10ae0a7b..6d2cab99a 100644 --- a/cypress/integration/fileUpload.spec.ts +++ b/cypress/integration/fileUpload.spec.ts @@ -31,7 +31,7 @@ describe('File upload', () => { beforeEach(() => { cy.intercept({ method: 'POST', - url: '/api/v2/media/upload' + url: '/api/private/media/upload' }, { statusCode: 201, body: { @@ -86,7 +86,7 @@ describe('File upload', () => { it('upload fails', () => { cy.intercept({ method: 'POST', - url: '/api/v2/media/upload' + url: '/api/private/media/upload' }, { statusCode: 400 }) diff --git a/cypress/integration/history.spec.ts b/cypress/integration/history.spec.ts index 5ae951eb8..fcb883454 100644 --- a/cypress/integration/history.spec.ts +++ b/cypress/integration/history.spec.ts @@ -26,7 +26,7 @@ describe('History', () => { describe('Pinning', () => { describe('working', () => { beforeEach(() => { - cy.intercept('PUT', '/api/v2/history/features', (req) => { + cy.intercept('PUT', '/api/private/history/features', (req) => { req.reply(200, req.body) }) }) @@ -60,7 +60,7 @@ describe('History', () => { describe('failing', () => { beforeEach(() => { - cy.intercept('PUT', '/api/v2/history/features', { + cy.intercept('PUT', '/api/private/history/features', { statusCode: 401 }) }) diff --git a/cypress/integration/profile.spec.ts b/cypress/integration/profile.spec.ts index e5183db5f..dd4de202c 100644 --- a/cypress/integration/profile.spec.ts +++ b/cypress/integration/profile.spec.ts @@ -7,7 +7,7 @@ describe('profile page', () => { beforeEach(() => { cy.intercept({ - url: '/api/v2/tokens', + url: '/api/private/tokens', method: 'GET' }, { body: [ @@ -18,7 +18,7 @@ describe('profile page', () => { ] }) cy.intercept({ - url: '/api/v2/tokens', + url: '/api/private/tokens', method: 'POST' }, { body: { @@ -28,7 +28,7 @@ describe('profile page', () => { } }) cy.intercept({ - url: '/api/v2/tokens/1601991518', + url: '/api/private/tokens/1601991518', method: 'DELETE' }, { body: [] diff --git a/cypress/integration/signInButton.spec.ts b/cypress/integration/signInButton.spec.ts index 24cdcfec1..0c27c4f87 100644 --- a/cypress/integration/signInButton.spec.ts +++ b/cypress/integration/signInButton.spec.ts @@ -83,7 +83,7 @@ describe('When logged-out ', () => { cy.get('[data-cy=sign-in-button]') .should('be.visible') // The absolute URL is used because it is defined as API base URL absolute. - .should('have.attr', 'href', 'http://127.0.0.1:3001/api/v2/auth/saml') + .should('have.attr', 'href', 'http://127.0.0.1:3001/api/private/auth/saml') }) }) diff --git a/cypress/support/config.ts b/cypress/support/config.ts index 6f7e78536..4f6071dd8 100644 --- a/cypress/support/config.ts +++ b/cypress/support/config.ts @@ -63,7 +63,7 @@ export const config = { } Cypress.Commands.add('loadConfig', (additionalConfig?: Partial) => { - return cy.intercept('/api/v2/config', { + return cy.intercept('/api/private/config', { statusCode: 200, body: { ...config, diff --git a/cypress/support/visit-test-editor.ts b/cypress/support/visit-test-editor.ts index b7f845053..3d721c993 100644 --- a/cypress/support/visit-test-editor.ts +++ b/cypress/support/visit-test-editor.ts @@ -17,7 +17,7 @@ Cypress.Commands.add('visitTestEditor', (query?: string) => { }) beforeEach(() => { - cy.intercept(`/api/v2/notes/${ testNoteId }-get`, { + cy.intercept(`/api/private/notes/${ testNoteId }-get`, { 'id': 'ABC123', 'alias': 'banner', 'lastChange': { diff --git a/public/api/v2/config b/public/api/private/config similarity index 100% rename from public/api/v2/config rename to public/api/private/config diff --git a/public/api/v2/history b/public/api/private/history similarity index 100% rename from public/api/v2/history rename to public/api/private/history diff --git a/public/api/v2/me b/public/api/private/me similarity index 100% rename from public/api/v2/me rename to public/api/private/me diff --git a/public/api/v2/notes/banner b/public/api/private/notes/banner similarity index 100% rename from public/api/v2/notes/banner rename to public/api/private/notes/banner diff --git a/public/api/v2/notes/features-get b/public/api/private/notes/features-get similarity index 100% rename from public/api/v2/notes/features-get rename to public/api/private/notes/features-get diff --git a/public/api/v2/notes/features/revisions-list b/public/api/private/notes/features/revisions-list similarity index 100% rename from public/api/v2/notes/features/revisions-list rename to public/api/private/notes/features/revisions-list diff --git a/public/api/v2/notes/features/revisions/1598389571 b/public/api/private/notes/features/revisions/1598389571 similarity index 100% rename from public/api/v2/notes/features/revisions/1598389571 rename to public/api/private/notes/features/revisions/1598389571 diff --git a/public/api/v2/notes/features/revisions/1598390307 b/public/api/private/notes/features/revisions/1598390307 similarity index 100% rename from public/api/v2/notes/features/revisions/1598390307 rename to public/api/private/notes/features/revisions/1598390307 diff --git a/public/api/v2/notes/old b/public/api/private/notes/old similarity index 100% rename from public/api/v2/notes/old rename to public/api/private/notes/old diff --git a/public/api/v2/tokens b/public/api/private/tokens similarity index 100% rename from public/api/v2/tokens rename to public/api/private/tokens diff --git a/public/api/v2/users/dermolly b/public/api/private/users/dermolly similarity index 100% rename from public/api/v2/users/dermolly rename to public/api/private/users/dermolly diff --git a/public/api/v2/users/emcrx b/public/api/private/users/emcrx similarity index 100% rename from public/api/v2/users/emcrx rename to public/api/private/users/emcrx diff --git a/public/api/v2/users/mrdrogdrog b/public/api/private/users/mrdrogdrog similarity index 100% rename from public/api/v2/users/mrdrogdrog rename to public/api/private/users/mrdrogdrog diff --git a/src/components/application-loader/initializers/configLoader.ts b/src/components/application-loader/initializers/configLoader.ts index ca86bba37..794feccd2 100644 --- a/src/components/application-loader/initializers/configLoader.ts +++ b/src/components/application-loader/initializers/configLoader.ts @@ -12,7 +12,7 @@ import { getAndSetUser } from '../../login-page/auth/utils' export const loadAllConfig: (baseUrl: string) => Promise = async (baseUrl) => { setApiUrl({ - apiUrl: (process.env.REACT_APP_BACKEND || baseUrl) + '/api/v2' + apiUrl: (process.env.REACT_APP_BACKEND || baseUrl) + '/api/private' }) const config = await getConfig()