Skip to content

Commit 22625df

Browse files
authored
Merge branch 'main' into doml/static-feature-two-audio
2 parents 6014201 + e3dd7dd commit 22625df

File tree

5 files changed

+42
-27
lines changed

5 files changed

+42
-27
lines changed

dotcom-rendering/docs/contributing/detailed-setup-guide.md

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,27 @@ For ease of development you may want to install:
6060

6161
- [React Developer Tools](https://github.com/facebook/react-devtools)
6262

63-
### Running alongside identity
63+
### Running alongside identity/sign in
6464

65-
You may want local identity cookies to be available in `dotcom-rendering`. To enable this:
65+
You may want to develop against signed in behaviour in `dotcom-rendering`.
66+
In order for this to work you have to run `dotcom-rendering` on a local domain with `https`.
6667

67-
1. run `./scripts/nginx/setup.sh`
68-
1. access `dotcom-rendering` through https://r.thegulocal.com
68+
To set this up this:
69+
70+
1. Run `./scripts/nginx/setup.sh`
71+
72+
- This will create a local domain `r.thegulocal.com` and set up a reverse proxy to `localhost:3030` with a valid SSL certificate.
73+
74+
2. `dotcom-rendering` can now be accessed through https://r.thegulocal.com when running the development server
75+
3. Sign in to https://profile.code.dev-theguardian.com/ on a separate tab/window
76+
77+
- Third party cookies must be enabled in your browser for this to work
78+
79+
4. Back on `dotcom-rendering` under https://r.thegulocal.com set a cookie with the name `GU_U` with any value on the `r.thegulocal.com` domain and refresh the page
80+
5. You should now be signed in!
81+
82+
- You should see the header change to show `My Account` instead of `Sign in`
83+
- In local storage you should see a key `gu.access_token` and `gu.id_token` with the values of the tokens you are signed in with
6984

7085
## Production
7186

dotcom-rendering/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
"@guardian/core-web-vitals": "7.0.0",
4646
"@guardian/eslint-config": "7.0.1",
4747
"@guardian/eslint-config-typescript": "9.0.1",
48-
"@guardian/identity-auth": "2.1.0",
49-
"@guardian/identity-auth-frontend": "4.0.0",
48+
"@guardian/identity-auth": "6.0.1",
49+
"@guardian/identity-auth-frontend": "8.1.0",
5050
"@guardian/libs": "20.0.0",
5151
"@guardian/ophan-tracker-js": "2.2.5",
5252
"@guardian/react-crossword": "2.0.2",

dotcom-rendering/src/experiments/tests/auxia-sign-in-gate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const auxiaSignInGate: ABTest = {
77
author: 'Pascal (Growth Team)',
88
description:
99
'R&D Experiment: using Auxia API to drive the behavior of the SignIn gate',
10-
audience: 0.1,
10+
audience: 0.2,
1111
audienceOffset: 0,
1212
successMeasure: '',
1313
audienceCriteria: '',

dotcom-rendering/src/experiments/tests/sign-in-gate-main-variant.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export const signInGateMainVariant: ABTest = {
77
author: 'Mahesh Makani',
88
description:
99
'Show sign in gate to 100% of users on 3rd article view of simple article templates, and show a further 5 times after the first dismissal, with higher priority over banners and epic. Main/Variant Audience.',
10-
audience: 0.8,
11-
audienceOffset: 0.1,
10+
audience: 0.7,
11+
audienceOffset: 0.2,
1212
successMeasure: 'Users sign in or create a Guardian account',
1313
audienceCriteria:
1414
'3rd article of the day, lower priority than consent banner, simple articles (not gallery, live etc.), not signed in, not shown after dismiss, not on help, info sections etc. Exclude iOS 9 and guardian-live-australia. Suppresses other banners, and appears over epics',

pnpm-lock.yaml

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)