Merge branch 'release/v1.9.1'

.env.example

@@ -1,7 +1,12 @@
+VUE_APP_NAME=
 VUE_APP_ENV=local
 VUE_APP_URI=
 VUE_APP_API_URI=
+VUE_APP_FRONTEND_URI=
 VUE_APP_API_CLIENT_ID=
 VUE_APP_GOOGLE_API_KEY=
 VUE_APP_SESSION_TIMEOUT=20
 VUE_APP_BUGSNAG_API_KEY=
+VUE_APP_CONTACT_EMAIL=
+VUE_APP_CQC_LOCATION_ACTIVE=
+VUE_APP_SERVICE_TAGS=

.eslintrc.js

@@ -1,14 +1,14 @@
 module.exports = {
  root: true,
  env: {
- node: true
+ node: true,
  },
  extends: ["plugin:vue/essential", "@vue/prettier"],
  rules: {
  "no-console": process.env.NODE_ENV === "production" ? "error" : "off",
- "no-debugger": process.env.NODE_ENV === "production" ? "error" : "off"
+ "no-debugger": process.env.NODE_ENV === "production" ? "error" : "off",
  },
  parserOptions: {
- parser: "babel-eslint"
- }
+ parser: "babel-eslint",
+ },
 };

aws/cloudformation.py

@@ -1,8 +1,8 @@
 # ==================================================
 # This stack creates the API infrastructure.
 # ==================================================
-from troposphere import Template, Parameter, Ref, GetAtt, Join, Output
-from troposphere.s3 import Bucket, PublicRead, WebsiteConfiguration, RedirectAllRequestsTo
+from troposphere import Template, Parameter, Ref, GetAtt, Join, Sub, Output
+from troposphere.s3 import Bucket, BucketPolicy, OwnershipControls, OwnershipControlsRule, PublicAccessBlockConfiguration
 import troposphere.iam as iam
 import troposphere.cloudfront as cloudfront
 import uuid
@@ -11,8 +11,8 @@
 # Template details.
 # ==================================================
 template = Template(
- 'Create the infrastructure needed to run the One Hounslow Connect Backend')
-template.add_version('2010-09-09')
+ 'Create the infrastructure needed to run the Connected Places Backend')
+template.set_version('2010-09-09')
 
 # ==================================================
 # Parameters.
@@ -48,17 +48,6 @@
  )
 )
 
-cname_301_parameter = template.add_parameter(
- Parameter(
- 'Cname301',
- Type='String',
- Description='The CNAME that should be 301 redirected to the site CNAME.',
- MinLength='1',
- AllowedPattern='^(?!:\/\/)([a-zA-Z0-9-_]+\.)*[a-zA-Z0-9][a-zA-Z0-9-_]+\.[a-zA-Z]{2,11}?$',
- ConstraintDescription='Must be a valid domain'
- )
-)
-
 certificate_arn_parameter = template.add_parameter(
  Parameter(
  'CertificateArn',
@@ -67,14 +56,6 @@
  )
 )
 
-certificate_301_arn_parameter = template.add_parameter(
- Parameter(
- 'Certificate301Arn',
- Type='String',
- Description='The ARN for the CloudFront distribution SSL certificate covering the domain to be 301 redirected (must be in us-east-1).'
- )
-)
-
 # ==================================================
 # Variables.
 # ==================================================
@@ -89,23 +70,60 @@
  Bucket(
  'Bucket',
  BucketName=bucket_name_variable,
- AccessControl=PublicRead
+ PublicAccessBlockConfiguration=PublicAccessBlockConfiguration(
+ BlockPublicAcls=True,
+ BlockPublicPolicy=True,
+ IgnorePublicAcls=True,
+ RestrictPublicBuckets=True
+ ),
+ OwnershipControls=OwnershipControls(
+ Rules=[
+ OwnershipControlsRule(
+ ObjectOwnership="BucketOwnerPreferred"
+ )
+ ]
+ ),
  )
 )
 
-bucket_301_resource = template.add_resource(
- Bucket(
- 'Bucket301',
- BucketName=Ref(cname_301_parameter),
- AccessControl=PublicRead,
- WebsiteConfiguration=WebsiteConfiguration(
- RedirectAllRequestsTo=RedirectAllRequestsTo(
- HostName=Ref(cname_parameter),
- )
+cloudfront_oai = template.add_resource(
+ cloudfront.CloudFrontOriginAccessIdentity(
+ 'CloudFrontOAI',
+ CloudFrontOriginAccessIdentityConfig=cloudfront.CloudFrontOriginAccessIdentityConfig(
+ Comment=Sub("Cloudfront OAI for ${Cname}")
  )
  )
 )
 
+bucket_policy = template.add_resource(
+ BucketPolicy(
+ 'PublicBucketPolicy',
+ Bucket=Ref(bucket_resource),
+ PolicyDocument={
+ "Version": "2012-10-17",
+ "Statement": [
+ {
+ "Action": [
+ "s3:GetObject"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ Join("", [
+ "arn:aws:s3:::",
+ Ref(bucket_resource),
+ "/*"
+ ]
+ )
+ ],
+ "Principal": {
+ 'CanonicalUser': GetAtt(cloudfront_oai, 'S3CanonicalUserId')
+ }
+ }
+ ]
+ }
+ )
+)
+
 distribution_resource = template.add_resource(
  cloudfront.Distribution(
  'Distribution',
@@ -130,6 +148,11 @@
  ErrorCode=404,
  ResponseCode=200,
  ResponsePagePath='/index.html'
+ ),
+ cloudfront.CustomErrorResponse(
+ ErrorCode=403,
+ ResponseCode=200,
+ ResponsePagePath='/index.html'
  )
  ],
  DefaultCacheBehavior=cloudfront.DefaultCacheBehavior(
@@ -146,7 +169,9 @@
  cloudfront.Origin(
  DomainName=GetAtt(bucket_resource, 'DomainName'),
  Id=Join('-', ['S3', Ref(bucket_resource)]),
- S3OriginConfig=cloudfront.S3Origin()
+ S3OriginConfig=cloudfront.S3OriginConfig(
+ OriginAccessIdentity=Join('', ['origin-access-identity/cloudfront/', Ref(cloudfront_oai)])
+ )
  )
  ],
  ViewerCertificate=cloudfront.ViewerCertificate(
@@ -157,40 +182,6 @@
  )
 )
 
-distribution_301_resource = template.add_resource(
- cloudfront.Distribution(
- 'Distribution301',
- DistributionConfig=cloudfront.DistributionConfig(
- Aliases=[
- Ref(cname_301_parameter)
- ],
- DefaultCacheBehavior=cloudfront.DefaultCacheBehavior(
- ForwardedValues=cloudfront.ForwardedValues(
- QueryString=False
- ),
- TargetOriginId=Join('-', ['S3', Ref(bucket_301_resource)]),
- ViewerProtocolPolicy='redirect-to-https'
- ),
- Enabled=True,
- IPV6Enabled=True,
- Origins=[
- cloudfront.Origin(
- DomainName=Join('.', [Ref(cname_301_parameter), 's3-website', Ref('AWS::Region'),'amazonaws.com']),
- Id=Join('-', ['S3', Ref(bucket_301_resource)]),
- CustomOriginConfig=cloudfront.CustomOrigin(
- OriginProtocolPolicy='http-only'
- )
- )
- ],
- ViewerCertificate=cloudfront.ViewerCertificate(
- AcmCertificateArn=Ref(certificate_301_arn_parameter),
- SslSupportMethod='sni-only',
- MinimumProtocolVersion='TLSv1.2_2019'
- )
- )
- )
-)
-
 ci_user_resource = template.add_resource(
  iam.User(
  'CiUser',

babel.config.js

@@ -3,8 +3,8 @@ module.exports = {
  [
  "@vue/app",
  {
- useBuiltIns: "entry"
- }
- ]
- ]
+ useBuiltIns: "entry",
+ },
+ ],
+ ],
 };

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3"
 
 services:
  troposphere:
- image: royal-borough-kingston/ck-backend/troposphere
+ image: connected-places/backend/troposphere
  build:
  context: ./docker/troposphere
  dockerfile: Dockerfile

docker/troposphere/requirements.txt

@@ -1,2 +1,2 @@
-troposphere==2.3.3
+troposphere==2.7.1
 awacs==0.8.1

jest.config.js

@@ -4,14 +4,14 @@ module.exports = {
  "^.+\\.vue$": "vue-jest",
  ".+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$":
  "jest-transform-stub",
- "^.+\\.jsx?$": "babel-jest"
+ "^.+\\.jsx?$": "babel-jest",
  },
  moduleNameMapper: {
- "^@/(.*)$": "<rootDir>/src/$1"
+ "^@/(.*)$": "<rootDir>/src/$1",
  },
  snapshotSerializers: ["jest-serializer-vue"],
  testMatch: [
- "**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)"
+ "**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)",
  ],
- testURL: "http://localhost/"
+ testURL: "http://localhost/",
 };

postcss.config.js

@@ -1,5 +1,5 @@
 module.exports = {
  plugins: {
- autoprefixer: {}
- }
+ autoprefixer: {},
+ },
 };

public/assets/images/browserconfig.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

src/App.vue

@@ -1,14 +1,14 @@
 <template>
  <div id="app">
  <vue-headful
- title="Hounslow Connect"
+ :title="appName"
  :head="headAttributes"
  :html="htmlAttributes"
  />
 
  <gov-skip-link href="#main-content">Skip to main content</gov-skip-link>
 
- <gov-header service-name="Hounslow Connect" :navigation="headerNav" />
+ <gov-header :service-name="appName" :navigation="headerNav" />
 
  <div class="govuk-width-container">
  <main
@@ -37,23 +37,23 @@ export default {
  bodyClasses: ["js-enabled"],
  mainClasses: [],
  headerNav: [],
- logoutInterval: null
+ logoutInterval: null,
  };
  },
  computed: {
  headAttributes() {
  return {
  "meta[name=theme-color]": {
- content: this.themeColor
+ content: this.themeColor,
  },
- "meta[name=robots]": { content: "noindex" }
+ "meta[name=robots]": { content: "noindex" },
  };
  },
  htmlAttributes() {
  return {
  body: {
- class: [document.body.className, ...this.bodyClasses].join(" ")
- }
+ class: [document.body.className, ...this.bodyClasses].join(" "),
+ },
  };
  },
  loggedInItems() {
@@ -62,38 +62,38 @@ export default {
  { text: "Locations", to: { name: "locations-index" } },
  { text: "Referrals", to: { name: "referrals-index" } },
  { text: "Organisations", to: { name: "organisations-index" } },
- { text: "Events", to: { name: "events-index" } },
+ { text: "Pages", to: { name: "pages-index" } },
  {
  text: "Users",
- to: { name: "users-index" }
+ to: { name: "users-index" },
  },
  {
  text: "Reports",
  to: { name: "reports-index" },
- hide: !Auth.isGlobalAdmin
+ hide: !Auth.isGlobalAdmin,
  },
  {
  text: "Admin",
  to: { name: "admin-index" },
- hide: !Auth.isGlobalAdmin
+ hide: !Auth.isGlobalAdmin,
  },
  {
  text: "Update requests",
  to: { name: "update-requests-index" },
- hide: !Auth.isGlobalAdmin
+ hide: !Auth.isGlobalAdmin,
  },
  {
  text: "Help",
- to: { name: "help-index" }
- }
+ to: { name: "help-index" },
+ },
  ];
  },
  loggedOutItems() {
  return [
  { text: "Register", to: { name: "register-index" } },
- { text: "Login", href: Auth.authorizeUrl }
+ { text: "Login", href: Auth.authorizeUrl },
  ];
- }
+ },
  },
  methods: {
  setHeaderItems() {
@@ -122,7 +122,7 @@ export default {
  endAutoLogoutInterval() {
  clearInterval(this.logoutInterval);
  this.logoutInterval = null;
- }
+ },
  },
 
  created() {
@@ -138,6 +138,6 @@ export default {
 
  destroyed() {
  this.endAutoLogoutInterval();
- }
+ },
 };
 </script>