Merge pull request #134 from DEFRA/accessibility-fixes

remove login

jest.config.js

@@ -30,8 +30,6 @@ module.exports = {
  '<rootDir>/src/server/router.js',
  '<rootDir>/src/server/index.js',
  '<rootDir>/src/server/localisation.js',
- '<rootDir>/src/server/login/index.js',
- '<rootDir>/src/server/login/controller.js',
  '<rootDir>/src/config/nunjucks/context/index.js',
  '<rootDir>/src/config/nunjucks/index.js',
  '<rootDir>/webpack/universalModuleDefinition',

src/server/common/helpers/errors.js

@@ -24,6 +24,7 @@ function catchAll(request, h) {
  return h.continue
  }
 
+ request.logger.error(response)
  request.logger.error(response?.stack)
  // return response.output
  return h.redirect(

src/server/home/index.js

@@ -7,7 +7,7 @@ const home = {
  server.route([
  {
  method: 'GET',
- path: '/home',
+ path: '/',
  ...homeController
  }
  ])

src/server/home/index.test.js

@@ -13,7 +13,7 @@ describe('home plugin', () => {
  test('should register the /home route', () => {
  const routes = server.table()
  const homeRoute = routes.find(
- (route) => route.path === '/home' && route.method === 'get'
+ (route) => route.path === '/' && route.method === 'get'
  )
 
  expect(homeRoute).toBeDefined()

src/server/index.js

@@ -7,10 +7,8 @@ import { router } from './router'
 import { requestLogger } from '~/src/server/common/helpers/logging/request-logger'
 import { catchAll } from '~/src/server/common/helpers/errors'
 import { secureContext } from '~/src/server/common/helpers/secure-context'
-import hapiCookie from '@hapi/cookie'
 
 const isProduction = config.get('isProduction')
-const cookiePassword = config.get('cookiePassword')
 
 async function createServer() {
  const server = hapi.server({
@@ -50,28 +48,6 @@ async function createServer() {
  if (isProduction) {
  await server.register(secureContext)
  }
- await server.register([hapiCookie])
- // cookie based strategy setup
- server.auth.strategy('login', 'cookie', {
- cookie: {
- name: 'phi-cookie',
- path: '/',
- password: cookiePassword,
- isSecure: isProduction
- },
- redirectTo: '/',
- keepAlive: true
- // to validate cookie content on each request and returns boolean(isauthenticated/not)
- // validate: async (request, session) => {
- // if (session.password === config.get('phiPassword')) {
- // return { isValid: true }
- // } else {
- // return { isValid: true }
- // }
- // }
- })
- // register with every route to use correct credentials
- server.auth.default({ strategy: 'login', mode: 'required' })
 
  await server.register(router)
  await server.register(nunjucksConfig)

src/server/router.js

@@ -11,11 +11,9 @@ import { formatPage } from '~/src/server/plant-health/format'
 import { serveStaticFiles } from '~/src/server/common/helpers/serve-static-files'
 import { pestSearchPage } from '~/src/server/plant-health/pest-search'
 import { problemWithService } from '~/src/server/check-plant-health-information-and-import-rules/problem-with-service'
-
 import { pestDetailsPage } from '~/src/server/plant-health/pest-details'
 import { search } from '~/src/api/search'
 import { config } from '~/src/config'
-import { login } from '~/src/server/login'
 import { accessibilityStatement } from '~/src/server/accessibility'
 import { CookiesPage } from '~/src/server/cookies'
 
@@ -47,7 +45,6 @@ const router = {
  pestSearchPage,
  pestDetailsPage,
  CookiesPage,
- login,
  problemWithService,
  accessibilityStatement,
  serveStaticFiles