-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use JWT as SitePreview authorization (#1455)
Allows moving authorization code into `@comet/cms-site`.
- Loading branch information
Showing
16 changed files
with
351 additions
and
208 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,5 @@ | ||
| import createGraphQLClient, { GraphQLClientOptions } from "@src/util/createGraphQLClient"; | ||
| import { gql } from "graphql-request"; | ||
|
|
||
| import { GQLValidateSitePreviewHashQuery, GQLValidateSitePreviewHashQueryVariables } from "./preview.generated"; | ||
| import { handlePreviewApiRequest } from "@comet/cms-site"; | ||
|
|
||
| export default async function handler(req, res) { | ||
| const data = await createGraphQLClient().request<GQLValidateSitePreviewHashQuery, GQLValidateSitePreviewHashQueryVariables>( | ||
| gql` | ||
| query ValidateSitePreviewHash($timestamp: Float!, $hash: String!) { | ||
| validateSitePreviewHash(timestamp: $timestamp, hash: $hash) | ||
| } | ||
| `, | ||
| { | ||
| timestamp: parseInt(req.query.timestamp), | ||
| hash: req.query.hash, | ||
| }, | ||
| ); | ||
| if (!data.validateSitePreviewHash) { | ||
| return res.status(401).json({ message: "Validation failed" }); | ||
| } | ||
|
|
||
| const previewData: PreviewData = { | ||
| includeInvisiblePages: true, | ||
| includeInvisibleBlocks: req.query.includeInvisibleBlocks === "true", | ||
| previewDamUrls: true, | ||
| }; | ||
| res.setPreviewData(previewData); | ||
| res.redirect(req.query.path ?? "/"); | ||
| handlePreviewApiRequest(req, res); | ||
| } | ||
|
|
||
| export type PreviewData = GraphQLClientOptions; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 22 additions & 38 deletions
60
packages/api/cms-api/src/page-tree/site-preview.resolver.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,40 @@ | ||
| import { Inject } from "@nestjs/common"; | ||
| import { Args, ArgsType, Field, ObjectType, Query, Resolver } from "@nestjs/graphql"; | ||
| import { IsNumber, IsString } from "class-validator"; | ||
| import { createHmac } from "crypto"; | ||
| import { differenceInMinutes, getTime } from "date-fns"; | ||
| import { Args, ArgsType, Field, InputType, Query, Resolver } from "@nestjs/graphql"; | ||
| import { Type } from "class-transformer"; | ||
| import { IsBoolean, IsString, ValidateNested } from "class-validator"; | ||
| import jsonwebtoken from "jsonwebtoken"; | ||
|
|
||
| import { SITE_PREVIEW_CONFIG } from "./page-tree.constants"; | ||
|
|
||
| @ObjectType() | ||
| @ArgsType() | ||
| class SitePreviewHash { | ||
| @Field(() => Number) | ||
| @IsNumber() | ||
| timestamp: number; | ||
| @InputType() | ||
| export class PreviewData { | ||
| @Field(() => Boolean) | ||
| @IsBoolean() | ||
| includeInvisible: boolean; | ||
| } | ||
|
|
||
| @ArgsType() | ||
| class SitePreviewArgs { | ||
| @Field(() => String) | ||
| @IsString() | ||
| hash: string; | ||
| path: string; | ||
|
|
||
| @Field(() => PreviewData) | ||
| @ValidateNested() | ||
| @Type(() => PreviewData) | ||
| previewData: PreviewData; | ||
| } | ||
|
|
||
| export type SitePreviewConfig = { | ||
| secret: string; | ||
| }; | ||
|
|
||
| @Resolver(() => SitePreviewHash) | ||
| @Resolver() | ||
| export class SitePreviewResolver { | ||
| constructor(@Inject(SITE_PREVIEW_CONFIG) private readonly config: SitePreviewConfig) {} | ||
|
|
||
| @Query(() => SitePreviewHash) | ||
| getSitePreviewHash(): SitePreviewHash { | ||
| const timestamp = this.getTimestamp(); | ||
| return { | ||
| timestamp: timestamp, | ||
| hash: this.createHash(timestamp), | ||
| }; | ||
| } | ||
|
|
||
| @Query(() => Boolean) | ||
| validateSitePreviewHash(@Args() args: SitePreviewHash): boolean { | ||
| if (differenceInMinutes(this.getTimestamp(), args.timestamp) > 5) { | ||
| return false; | ||
| } | ||
| return this.createHash(args.timestamp) === args.hash; | ||
| } | ||
|
|
||
| private getTimestamp() { | ||
| return getTime(Date.now()); | ||
| } | ||
|
|
||
| private createHash(timestamp: number): string { | ||
| if (!timestamp) throw new Error("Timestamp is required"); | ||
| return createHmac("sha256", this.config.secret) | ||
| .update(timestamp + this.config.secret) | ||
| .digest("hex"); | ||
| @Query(() => String) | ||
| getSitePreviewJwt(@Args() args: SitePreviewArgs): string { | ||
| return jsonwebtoken.sign({ ...args }, this.config.secret, { expiresIn: 10 }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.