DT-840: Switch auth order round as not needed for static content #969
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
petergphillips
force-pushed
the
pgp-DT-840-static-content-no-auth
branch
from
d3f16c2
to
482fcde
Compare
petergphillips
commented
May 21, 2020
| @@ -20,6 +20,9 @@ RUN mkdir -p /app | |||
| WORKDIR /app | |||
| ADD . . | |||
|
|
|||
| # Remove cypress as it takes ~1 minute to download and install | |||
| RUN sed -ie 's/"cypress[^ ].*//g' /app/package.json | |||
There was a problem hiding this comment.
copied from use of force
petergphillips
commented
May 21, 2020
backend/index.js
Outdated
| app.use(routes(apis)) | ||
|
|
||
| app.use(setupStaticContent({ app })) |
There was a problem hiding this comment.
move stuff that doesn't need a auth session above
petergphillips
commented
May 21, 2020
| @@ -2,7 +2,7 @@ version: '3.1' | |||
| services: | |||
| prisonstaffhub-wiremock: | |||
| image: rodolpheche/wiremock | |||
| container_name: prisonstaffhub | |||
| container_name: prisonstaffhub-wiremock | |||
There was a problem hiding this comment.
rename so doesn't conflict with prisonstaffhub
petergphillips
commented
May 21, 2020
| @@ -6,42 +6,23 @@ | |||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | |||
|
|
|||
| <!--[if !(IE)]><!--> | |||
| <link rel='stylesheet' href='<%= htmlWebpackPlugin.options.publicUrl %>/styles/grid.css' type='text/css'> | |||
There was a problem hiding this comment.
never set so removed
petergphillips
commented
May 21, 2020
| @@ -50,12 +50,10 @@ | |||
| "contentful": "^7.3.0", | |||
| "cookie-session": "^2.0.0-beta.3", | |||
| "csv-parse": "^4.4.6", | |||
| "cypress-multi-reporters": "^1.4.0", | |||
There was a problem hiding this comment.
moved into dev dependencies
petergphillips
force-pushed
the
pgp-DT-840-static-content-no-auth
branch
from
a526821
to
c9ded9e
Compare
backend/index.js
Outdated
| @@ -31,18 +31,18 @@ app.set('view engine', 'njk') | |||
| app.use(setupBodyParsers()) | |||
| app.use(setupHealthChecks()) | |||
| app.use(setupWebSecurity()) | |||
| app.use(setupRedirects()) | |||
| app.use(setupSass()) | |||
| app.use(setupStaticContent({ app })) | |||
There was a problem hiding this comment.
This no longer takes app as a parameter now that the nunjuck setup has been pulled out.
JamieDraperUK
added a commit
that referenced
this pull request
Jun 1, 2020
* Revert "Revert "DT-840: Switch auth order round as not needed for static content (#969)" (#971)" This reverts commit 66c9741. * DT-840: Fix missing bundle.js when running in production mode * DT-840: Remove duplicate redirect * DT-840: Fix paths for static js content Co-authored-by: Jamie Draper <draper65@googlemail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.