Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions cdk/lib/__snapshots__/gudocs.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1375,11 +1375,6 @@ exports[`The GuDocs stack matches the snapshot 1`] = `
"Effect": "Allow",
"Resource": "arn:aws:s3:::permissions-cache/TEST/*",
},
{
"Action": "s3:GetObject",
"Effect": "Allow",
"Resource": "arn:aws:s3:::pan-domain-auth-settings/*",
},
{
"Action": [
"dynamodb:BatchGetItem",
Expand Down
6 changes: 0 additions & 6 deletions cdk/lib/gudocs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@ export class GuDocs extends GuStack {
`arn:aws:s3:::permissions-cache/${this.stage}/*`,
],
})

const pandaS3BucketPolcy = new PolicyStatement({
actions: ['s3:GetObject'],
resources: [`arn:aws:s3:::pan-domain-auth-settings/*`],
})

const sharedParametersPolicy = new PolicyStatement({
actions: [
Expand All @@ -111,7 +106,6 @@ export class GuDocs extends GuStack {
serverlessExpressLambda.addToRolePolicy(s3BucketPolicy)
serverlessExpressLambda.addToRolePolicy(sharedParametersPolicy)
serverlessExpressLambda.addToRolePolicy(permissionsBucketPolicy)
serverlessExpressLambda.addToRolePolicy(pandaS3BucketPolcy)

const gateway = new GuApiGatewayWithLambdaByPath(this, {
app: "testing",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@aws-sdk/credential-providers": "^3.621.0",
"@aws-sdk/lib-dynamodb": "^3.621.0",
"@codegenie/serverless-express": "^4.14.1",
"@guardian/pan-domain-node": "^1.2.0",
"@guardian/pan-domain-node": "^0.4.2",
"archieml": "^0.5.0",
"express": "^4.20.0",
"googleapis": "^131.0.0",
Expand Down
13 changes: 6 additions & 7 deletions src/panDomainAuth.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
import {
AuthenticationStatus,
guardianValidation,
PanDomainAuthentication,
} from "@guardian/pan-domain-node";
import { standardAwsConfig } from "./awsIntegration";
import { AWS_REGION, pandaPublicConfigFilename, pandaSettingsBucketName } from "./constants";
import { AWS_REGION, pandaPublicConfigFilename, pandaSettingsBucketName } from "./constants";

const panda = new PanDomainAuthentication(
"gutoolsAuth-assym", // cookie name
AWS_REGION, // AWS region
pandaSettingsBucketName, // Settings bucket
pandaPublicConfigFilename, // Settings files
guardianValidation,
standardAwsConfig.credentials,
guardianValidation
);

export const getVerifiedUserEmail = async (
cookieHeader: string | undefined
): Promise<void | string> => {
if (typeof cookieHeader === "string") {
const result = await panda.verify(cookieHeader);
const { status, user } = await panda.verify(cookieHeader);

if (result.success) {
return result.user.email;
if (status === AuthenticationStatus.AUTHORISED && user !== undefined) {
return user.email;
}
}
};
Loading