Skip to content

OLH-2783: Use a session scoped session cookie #2273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
alex9smith wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

OLH-2783: Use a session scoped session cookie #2273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ OIDC_CLIENT_ID=
OIDC_CLIENT_SCOPES=openid phone email am offline_access govuk-account
AM_API_BASE_URL=https://am-stub.home.dev.account.gov.uk
AM_YOUR_ACCOUNT_URL=http://localhost:6001
SESSION_EXPIRY=1800000
SESSION_SECRET=secret
GOV_ACCOUNTS_PUBLISHING_API_URL=http://localhost:4444
GOV_ACCOUNTS_PUBLISHING_API_TOKEN=token
Expand Down
12 changes: 0 additions & 12 deletions deploy/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ Mappings:
APIBASEURL: "https://oidc.staging.account.gov.uk"
AMAPIBASEURL: "https://manage.staging.account.gov.uk"
BASEURL: "home.dev.account.gov.uk"
SESSIONEXPIRY: "7200000"
AMYOURACCOUNTURL: "https://www.staging.publishing.service.gov.uk/account/home"
GOVACCOUNTSPUBLISHINGAPIURL: "https://account-api.staging.publishing.service.gov.uk"
SUPPORTACTIVITYLOG: "1"
Expand Down Expand Up @@ -208,7 +207,6 @@ Mappings:
APIBASEURL: "https://oidc.build.account.gov.uk"
AMAPIBASEURL: "https://manage.build.account.gov.uk"
BASEURL: "home.build.account.gov.uk"
SESSIONEXPIRY: "7200000"
AMYOURACCOUNTURL: "https://www.staging.publishing.service.gov.uk/account/home"
GOVACCOUNTSPUBLISHINGAPIURL: "https://account-api.staging.publishing.service.gov.uk"
SUPPORTACTIVITYLOG: "1"
Expand Down Expand Up @@ -247,7 +245,6 @@ Mappings:
APIBASEURL: "https://oidc.staging.account.gov.uk"
AMAPIBASEURL: "https://manage.staging.account.gov.uk"
BASEURL: "home.staging.account.gov.uk"
SESSIONEXPIRY: "7200000"
AMYOURACCOUNTURL: "https://www.staging.publishing.service.gov.uk/account/home"
GOVACCOUNTSPUBLISHINGAPIURL: "https://account-api.staging.publishing.service.gov.uk"
SUPPORTACTIVITYLOG: "1"
Expand Down Expand Up @@ -286,7 +283,6 @@ Mappings:
APIBASEURL: "https://oidc.integration.account.gov.uk"
AMAPIBASEURL: "https://manage.integration.account.gov.uk"
BASEURL: "home.integration.account.gov.uk"
SESSIONEXPIRY: "7200000"
AMYOURACCOUNTURL: "https://www.integration.publishing.service.gov.uk/account/home"
GOVACCOUNTSPUBLISHINGAPIURL: "https://account-api.integration.publishing.service.gov.uk"
SUPPORTACTIVITYLOG: "1"
Expand Down Expand Up @@ -325,7 +321,6 @@ Mappings:
APIBASEURL: "https://oidc.account.gov.uk"
AMAPIBASEURL: "https://manage.account.gov.uk"
BASEURL: "home.account.gov.uk"
SESSIONEXPIRY: "7200000"
AMYOURACCOUNTURL: "https://www.gov.uk/account/home"
GOVACCOUNTSPUBLISHINGAPIURL: "https://account-api.publishing.service.gov.uk"
SUPPORTACTIVITYLOG: "1"
Expand Down Expand Up @@ -712,13 +707,6 @@ Resources:
Value: !Sub "{{resolve:ssm:/${AWS::StackName}/Config/OIDC/Client/Id}}"
- Name: "OIDC_CLIENT_SCOPES"
Value: "openid phone email am offline_access govuk-account"
- Name: "SESSION_EXPIRY"
Value:
!FindInMap [
EnvironmentVariables,
!Ref Environment,
SESSIONEXPIRY,
]
- Name: "SESSION_SECRET"
Value: !Sub "{{resolve:secretsmanager:${SessionSecret}}}"
- Name: "AM_YOUR_ACCOUNT_URL"
Expand Down
7 changes: 1 addition & 6 deletions src/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import Backend from "i18next-fs-backend";
import {
getAppEnv,
getNodeEnv,
getSessionExpiry,
getSessionSecret,
supportActivityLog,
supportBrandRefresh,
Expand Down Expand Up @@ -144,11 +143,7 @@ async function createApp(): Promise<express.Application> {
secret: getSessionSecret(),
resave: false,
unset: "destroy",
cookie: getSessionCookieOptions(
isProduction,
getSessionExpiry(),
getSessionSecret()
),
cookie: getSessionCookieOptions(isProduction, getSessionSecret()),
})
);

Expand Down
4 changes: 0 additions & 4 deletions src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ export function getGtmId(): string {
return process.env.GTM_ID;
}

export function getSessionExpiry(): number {
return Number(process.env.SESSION_EXPIRY);
}

export function getSessionSecret(): string {
return process.env.SESSION_SECRET;
}
Expand Down
3 changes: 1 addition & 2 deletions src/config/cookie.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
export function getSessionCookieOptions(
isProdEnv: boolean,
expiry: number,
secret: string
): any {
return {
name: "ams",
Copy link
Contributor

@liegeandlief liegeandlief Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the name here is redundant as the cookies seem to get called am from the session(...) call in app.ts

secret: secret,
maxAge: expiry,
secure: isProdEnv,
maxAge: null,
};
}
Loading