@remkoj/optimizely-cms-nextjs 2.0.0-pre1 → 2.0.0-pre3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client.js +7 -7
- package/dist/client.js.map +1 -1
- package/dist/cms-page/index.d.ts +5 -5
- package/dist/cms-page/index.js +2 -2
- package/dist/cms-page/index.js.map +1 -1
- package/dist/cms-page/layout.d.ts +2 -2
- package/dist/cms-page/layout.js +2 -2
- package/dist/cms-page/layout.js.map +1 -1
- package/dist/cms-page/page.d.ts +2 -2
- package/dist/cms-page/page.js +14 -11
- package/dist/cms-page/page.js.map +1 -1
- package/dist/cms-page/utils.js +1 -1
- package/dist/cms-page/utils.js.map +1 -1
- package/dist/components/on-page-edit.js +1 -1
- package/dist/components/on-page-edit.js.map +1 -1
- package/dist/index.d.ts +6 -7
- package/dist/index.js +7 -7
- package/dist/index.js.map +1 -1
- package/dist/metadata.js +9 -5
- package/dist/metadata.js.map +1 -1
- package/dist/ope/data.d.ts +1 -1
- package/dist/ope/index.d.ts +3 -3
- package/dist/ope/index.js +3 -3
- package/dist/ope/index.js.map +1 -1
- package/dist/ope/page.d.ts +1 -1
- package/dist/ope/page.js +21 -21
- package/dist/ope/page.js.map +1 -1
- package/dist/page.d.ts +1 -1
- package/dist/publish/index.d.ts +2 -2
- package/dist/publish/index.js +3 -3
- package/dist/publish/index.js.map +1 -1
- package/package.json +19 -20
- package/dist/auth.d.ts +0 -73
- package/dist/auth.js +0 -154
- package/dist/auth.js.map +0 -1
package/dist/client.js
CHANGED
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
import 'server-only';
|
|
2
2
|
import React from 'react';
|
|
3
3
|
import createBaseClient from '@remkoj/optimizely-graph-client';
|
|
4
|
-
import { isDebug } from '@remkoj/optimizely-cms-react/rsc';
|
|
5
4
|
export const getServerClient = React.cache(() => {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
5
|
+
const client = createBaseClient();
|
|
6
|
+
if (client.debug)
|
|
7
|
+
console.log('⚪ [ContentGraph Shared Client] Created new Optimizely Graph client');
|
|
8
|
+
return client;
|
|
9
9
|
});
|
|
10
10
|
export const getAuthorizedServerClient = (token) => {
|
|
11
|
-
if (isDebug())
|
|
12
|
-
console.log('⚪ [ContentGraph Shared Client] Creating new Optimizely Graph client with authentication details');
|
|
13
11
|
const client = createBaseClient();
|
|
12
|
+
if (client.debug)
|
|
13
|
+
console.log('⚪ [ContentGraph Shared Client] Created new Optimizely Graph client with authentication details');
|
|
14
14
|
client.updateAuthentication(token);
|
|
15
|
-
if (
|
|
15
|
+
if (client.debug)
|
|
16
16
|
console.log(`🟡 [ContentGraph Shared Client] Updated authentication, current mode: ${client.currentAuthMode}`);
|
|
17
17
|
return client;
|
|
18
18
|
};
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAA;AACpB,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,gBAA2C,MAAM,iCAAiC,CAAA;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAA;AACpB,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,gBAA2C,MAAM,iCAAiC,CAAA;AAEzF,MAAM,CAAC,MAAM,eAAe,GAA4B,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE;IACrE,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAA;IACjC,IAAI,MAAM,CAAC,KAAK;QACZ,OAAO,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAA;IACrF,OAAO,MAAM,CAAA;AACjB,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAyC,CAAC,KAAK,EAAE,EAAE;IACrF,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAA;IACjC,IAAI,MAAM,CAAC,KAAK;QACZ,OAAO,CAAC,GAAG,CAAC,gGAAgG,CAAC,CAAA;IACjH,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAA;IAClC,IAAI,MAAM,CAAC,KAAK;QACZ,OAAO,CAAC,GAAG,CAAC,yEAA0E,MAAM,CAAC,eAAgB,EAAE,CAAC,CAAA;IACpH,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,eAAe,CAAA;AAC3C,MAAM,CAAC,MAAM,sBAAsB,GAAG,yBAAyB,CAAA;AAC/D,eAAe,eAAe,EAAE,CAAA"}
|
package/dist/cms-page/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export type { GetContentByPathMethod, GetMetaDataByPathMethod } from './data';
|
|
2
|
-
export type { CreatePageOptions, DefaultCmsPageProps as CmsPageProps, DefaultCmsPageParams as CmsPageParams } from './page';
|
|
3
|
-
export type { CreateLayoutOptions } from './layout';
|
|
4
|
-
export { createPage } from './page';
|
|
5
|
-
export { createLayout } from './layout';
|
|
1
|
+
export type { GetContentByPathMethod, GetMetaDataByPathMethod } from './data.js';
|
|
2
|
+
export type { CreatePageOptions, DefaultCmsPageProps as CmsPageProps, DefaultCmsPageParams as CmsPageParams } from './page.js';
|
|
3
|
+
export type { CreateLayoutOptions } from './layout.js';
|
|
4
|
+
export { createPage } from './page.js';
|
|
5
|
+
export { createLayout } from './layout.js';
|
package/dist/cms-page/index.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export { createPage } from './page';
|
|
2
|
-
export { createLayout } from './layout';
|
|
1
|
+
export { createPage } from './page.js';
|
|
2
|
+
export { createLayout } from './layout.js';
|
|
3
3
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cms-page/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cms-page/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { type PropsWithChildren, type ReactNode } from "react";
|
|
2
2
|
import { type Metadata, type ResolvingMetadata } from "next";
|
|
3
3
|
import type { ChannelDefinition, ClientFactory } from "@remkoj/optimizely-graph-client";
|
|
4
|
-
import type { DefaultCmsPageProps } from './page';
|
|
5
|
-
import { type GetMetaDataByPathMethod } from './data';
|
|
4
|
+
import type { DefaultCmsPageProps } from './page.js';
|
|
5
|
+
import { type GetMetaDataByPathMethod } from './data.js';
|
|
6
6
|
export type CmsPageLayout = {
|
|
7
7
|
generateMetadata: (props: Omit<DefaultCmsPageProps, 'searchParams'>, resolving: ResolvingMetadata) => Promise<Metadata>;
|
|
8
8
|
PageLayout: (props: PropsWithChildren<Omit<DefaultCmsPageProps, 'searchParams'>>) => JSX.Element | ReactNode;
|
package/dist/cms-page/layout.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Utils } from "@remkoj/optimizely-cms-react";
|
|
2
|
-
import { getMetaDataByPath as getMetaDataByPathBase } from './data';
|
|
3
|
-
import { getServerClient } from "../client";
|
|
2
|
+
import { getMetaDataByPath as getMetaDataByPathBase } from './data.js';
|
|
3
|
+
import { getServerClient } from "../client.js";
|
|
4
4
|
import { isDebug } from '@remkoj/optimizely-cms-react/rsc';
|
|
5
5
|
const defaultCreateLayoutOptions = {
|
|
6
6
|
defaultLocale: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/cms-page/layout.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAA;AAEpD,OAAO,EAAE,iBAAiB,IAAI,qBAAqB,EAAgC,MAAM,
|
|
1
|
+
{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/cms-page/layout.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAA;AAEpD,OAAO,EAAE,iBAAiB,IAAI,qBAAqB,EAAgC,MAAM,WAAW,CAAA;AAEpG,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAA;AAc1D,MAAM,0BAA0B,GAAyB;IACrD,aAAa,EAAE,IAAI;IACnB,iBAAiB,EAAE,qBAAqB;IACxC,MAAM,EAAE,eAAe;CAC1B,CAAA;AAED,MAAM,UAAU,YAAY,CACxB,OAAsC;IAEtC,MAAM,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAyB;QAC/F,GAAG,0BAA0B;QAC7B,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE;QAC1B,GAAG,OAAO;KACb,CAAA;IAED,MAAM,oBAAoB,GAAmB;QAEzC;;;;;;WAMG;QACH,gBAAgB,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE;YAC9C,MAAM,YAAY,GAAG,IAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAG,EAAE,CAAA;YAE3E,IAAI,OAAO,EAAE;gBACT,OAAO,CAAC,GAAG,CAAC,8CAA+C,YAAa,EAAE,CAAC,CAAA;YAE/E,MAAM,SAAS,GAAG;gBACd,IAAI,EAAE,YAAY;aACrB,CAAA;YACD,MAAM,MAAM,GAAG,aAAa,EAAE,CAAA;YAC9B,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;gBAClE,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,CAAC,CAAC,CAAA;gBACnD,OAAO,SAAS,CAAA;YACpB,CAAC,CAAC,CAAA;YACF,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,kBAAkB,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;YAC/D,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACZ,IAAI,OAAO,EAAE;oBACT,OAAO,CAAC,GAAG,CAAC,qDAAsD,YAAa,EAAE,CAAC,CAAA;gBACtF,OAAO,EAAE,CAAA;YACb,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,SAAS,CAAA;YAC5B,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAClC,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ;gBAC/B,OAAO,EAAE,QAAQ,CAAC,IAAc;aACnC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAc,CAAC;YAC5B,IAAI,YAAY,GAAc;gBAC1B,KAAK;gBACL,UAAU,EAAE;oBACR,SAAS,EAAE,QAAQ,CAAC,SAAmB;oBACvC,SAAS,EAAE,EAAE;iBAChB;gBACD,SAAS,EAAE;oBACP,GAAG,IAAI,CAAC,SAAS;oBACjB,KAAK;oBACL,GAAG,EAAE,QAAQ,CAAC,SAAmB;oBACjC,eAAe,EAAE,EAAE;iBACtB;aACJ,CAAA;YAED,uBAAuB;YACvB,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAoC,CAAA;YACvH,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACrB,IAAI,YAAY,CAAC,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC;oBAClF,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;gBAC3D,CAAC;gBACD,IAAI,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;oBAC/D,+FAA+F;oBAC/F,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,CAAA;gBAC5D,CAAC;YACL,CAAC,CAAC,CAAA;YAEF,OAAO,YAAY,CAAA;QACvB,CAAC;QAED,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ;KACzC,CAAA;IACD,OAAO,oBAAoB,CAAA;AAC/B,CAAC;AAED,eAAe,YAAY,CAAA"}
|
package/dist/cms-page/page.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
/// <reference types="react" />
|
|
1
|
+
/// <reference types="react" resolution-mode="require"/>
|
|
2
2
|
import 'server-only';
|
|
3
3
|
import type { Metadata, ResolvingMetadata } from 'next';
|
|
4
4
|
import { type Route, type ClientFactory, type ChannelDefinition } from '@remkoj/optimizely-graph-client';
|
|
5
5
|
import { type ComponentFactory } from '@remkoj/optimizely-cms-react/rsc';
|
|
6
|
-
import { type GetContentByPathMethod } from './data';
|
|
6
|
+
import { type GetContentByPathMethod } from './data.js';
|
|
7
7
|
export type DefaultCmsPageParams = {
|
|
8
8
|
path?: string[];
|
|
9
9
|
lang?: string;
|
package/dist/cms-page/page.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import 'server-only';
|
|
3
3
|
import deepmerge from 'deepmerge';
|
|
4
|
-
import { notFound } from 'next/navigation';
|
|
4
|
+
import { notFound } from 'next/navigation.js';
|
|
5
5
|
import { RouteResolver } from '@remkoj/optimizely-graph-client';
|
|
6
6
|
import { normalizeContentLinkWithLocale } from '@remkoj/optimizely-graph-client/utils';
|
|
7
7
|
import { CmsContent, isDebug, getServerContext } from '@remkoj/optimizely-cms-react/rsc';
|
|
8
8
|
import { Utils } from '@remkoj/optimizely-cms-react';
|
|
9
|
-
import { MetaDataResolver } from '../metadata';
|
|
10
|
-
import { urlToPath, localeToGraphLocale } from './utils';
|
|
11
|
-
import getContentByPathBase from './data';
|
|
12
|
-
import { getServerClient } from '../client';
|
|
9
|
+
import { MetaDataResolver } from '../metadata.js';
|
|
10
|
+
import { urlToPath, localeToGraphLocale } from './utils.js';
|
|
11
|
+
import getContentByPathBase from './data.js';
|
|
12
|
+
import { getServerClient } from '../client.js';
|
|
13
13
|
export var SystemLocales;
|
|
14
14
|
(function (SystemLocales) {
|
|
15
15
|
SystemLocales["All"] = "ALL";
|
|
@@ -87,13 +87,16 @@ export function createPage(factory, options) {
|
|
|
87
87
|
if (!context.client)
|
|
88
88
|
context.setOptimizelyGraphClient(client);
|
|
89
89
|
context.setComponentFactory(factory);
|
|
90
|
-
// Analyze the
|
|
91
|
-
const
|
|
92
|
-
const graphLocale = (currentLocale ? localeToGraphLocale(currentLocale, channel) : undefined);
|
|
93
|
-
if (currentLocale)
|
|
94
|
-
context.setLocale(currentLocale);
|
|
95
|
-
// Resolve the content based upon the route
|
|
90
|
+
// Analyze the Next.JS Request props
|
|
91
|
+
const requestLocale = propsToCmsLocale(props, defaultLocale);
|
|
96
92
|
const requestPath = propsToCmsPath(props);
|
|
93
|
+
if (isDebug())
|
|
94
|
+
console.log(`⚪ [CmsPage] Processed Next.JS route: ${JSON.stringify(props)} => Optimizely CMS route: ${JSON.stringify({ path: requestPath, locale: requestLocale })}`);
|
|
95
|
+
// Process the locale
|
|
96
|
+
const graphLocale = (requestLocale ? localeToGraphLocale(requestLocale, channel) : undefined);
|
|
97
|
+
if (requestLocale)
|
|
98
|
+
context.setLocale(requestLocale);
|
|
99
|
+
// Resolve the content based upon the path
|
|
97
100
|
if (!requestPath)
|
|
98
101
|
return notFound();
|
|
99
102
|
const response = await getContentByPath(client, { path: requestPath, locale: graphLocale });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/cms-page/page.tsx"],"names":[],"mappings":";AAAA,OAAO,aAAa,CAAA;AAEpB,OAAO,SAAS,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/cms-page/page.tsx"],"names":[],"mappings":"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"}
|
package/dist/cms-page/utils.js
CHANGED
|
@@ -3,7 +3,7 @@ import { localeToGraphLocale as coreLocaleToGraphLocale } from "@remkoj/optimize
|
|
|
3
3
|
export function urlToPath(baseUrl, language) {
|
|
4
4
|
let slugs = baseUrl.pathname.split('/').filter(s => s);
|
|
5
5
|
if (language && slugs[0] == language)
|
|
6
|
-
slugs.
|
|
6
|
+
return slugs.slice(1);
|
|
7
7
|
return slugs;
|
|
8
8
|
}
|
|
9
9
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/cms-page/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,IAAI,uBAAuB,EAAE,MAAM,uCAAuC,CAAA;AAEtG,oDAAoD;AACpD,MAAM,UAAU,SAAS,CAAC,OAAY,EAAE,QAAiB;IACrD,IAAI,KAAK,GAAc,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IACjE,IAAI,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,QAAQ;QAChC,KAAK,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/cms-page/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,IAAI,uBAAuB,EAAE,MAAM,uCAAuC,CAAA;AAEtG,oDAAoD;AACpD,MAAM,UAAU,SAAS,CAAC,OAAY,EAAE,QAAiB;IACrD,IAAI,KAAK,GAAc,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IACjE,IAAI,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,QAAQ;QAChC,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACzB,OAAO,KAAK,CAAA;AAChB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAAc,EAAE,OAA2B;IAE3E,OAAO,OAAO,EAAE,mBAAmB,CAAC,MAAM,CAAC,IAAI,uBAAuB,CAAC,MAAM,CAAC,CAAA;AAClF,CAAC;AAED,MAAM,UAAU,YAAY,CAAsC,OAA0B,EAAE,IAAY,EAAE,YAAe;IAEvH,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5D,OAAO,KAAK,EAAE,IAAI,IAAI,YAAY,CAAA;AACtC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAsC,OAA0B,EAAE,IAAY,EAAE,YAAe;IAE5H,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5D,OAAO,KAAK,EAAE,WAAW,IAAI,YAAY,EAAE,UAAU,CAAC,GAAG,EAAC,GAAG,CAAM,CAAA;AACvE,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
import { useState, useEffect } from 'react';
|
|
3
|
-
import { useRouter } from 'next/navigation';
|
|
3
|
+
import { useRouter } from 'next/navigation.js';
|
|
4
4
|
export const OnPageEdit = ({ mode, children, className, timeout }) => {
|
|
5
5
|
const router = useRouter();
|
|
6
6
|
const [optiCmsReady, setOptiCmsReady] = useState(false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"on-page-edit.js","sourceRoot":"","sources":["../../src/components/on-page-edit.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAkD,MAAM,OAAO,CAAA;AAC3F,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"on-page-edit.js","sourceRoot":"","sources":["../../src/components/on-page-edit.tsx"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
export * from './client';
|
|
2
|
-
export * from './metadata';
|
|
3
|
-
export * from './types';
|
|
4
|
-
export * from './page';
|
|
5
|
-
export * as
|
|
6
|
-
export * as
|
|
7
|
-
export * as CmsPage from './cms-page';
|
|
1
|
+
export * from './client.js';
|
|
2
|
+
export * from './metadata.js';
|
|
3
|
+
export * from './types.js';
|
|
4
|
+
export * from './page.js';
|
|
5
|
+
export * as OnPageEdit from './ope/index.js';
|
|
6
|
+
export * as CmsPage from './cms-page/index.js';
|
package/dist/index.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
export * from './client';
|
|
2
|
-
export * from './metadata';
|
|
3
|
-
export * from './types';
|
|
4
|
-
export * from './page';
|
|
5
|
-
export * as Auth from './auth'
|
|
6
|
-
export * as OnPageEdit from './ope';
|
|
7
|
-
export * as CmsPage from './cms-page';
|
|
1
|
+
export * from './client.js';
|
|
2
|
+
export * from './metadata.js';
|
|
3
|
+
export * from './types.js';
|
|
4
|
+
export * from './page.js';
|
|
5
|
+
//export * as Auth from './auth'
|
|
6
|
+
export * as OnPageEdit from './ope/index.js';
|
|
7
|
+
export * as CmsPage from './cms-page/index.js';
|
|
8
8
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AACzB,gCAAgC;AAChC,OAAO,KAAK,UAAU,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA"}
|
package/dist/metadata.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import createClient, { isContentGraphClient } from '@remkoj/optimizely-graph-client';
|
|
2
|
-
import { isOptimizelyNextPageWithMetaData } from './page';
|
|
2
|
+
import { isOptimizelyNextPageWithMetaData } from './page.js';
|
|
3
3
|
export class MetaDataResolver {
|
|
4
|
-
_cgClient;
|
|
5
4
|
constructor(clientOrConfig) {
|
|
6
5
|
this._cgClient = isContentGraphClient(clientOrConfig) ? clientOrConfig : createClient(clientOrConfig);
|
|
7
6
|
}
|
|
@@ -16,18 +15,23 @@ export class MetaDataResolver {
|
|
|
16
15
|
*/
|
|
17
16
|
async resolve(factory, contentLink, contentType, locale) {
|
|
18
17
|
if (this._cgClient.debug)
|
|
19
|
-
console.log(
|
|
18
|
+
console.log(`⚪ [MetaDataResolver] Resolving metadata for: ${JSON.stringify({ contentLink, contentType, locale })}`);
|
|
20
19
|
if (locale && locale.includes("-"))
|
|
21
|
-
throw new Error("Invalid character detected within the locale");
|
|
20
|
+
throw new Error("🟠 [MetaDataResolver] Invalid character detected within the locale");
|
|
22
21
|
const Component = factory.resolve(contentType);
|
|
23
22
|
if (!Component)
|
|
24
23
|
return {};
|
|
25
24
|
if (isOptimizelyNextPageWithMetaData(Component) && Component.getMetaData) {
|
|
25
|
+
console.log("⚪ [MetaDataResolver] Component for content type has 'getMetaData, invoking...");
|
|
26
26
|
const meta = await Component.getMetaData(contentLink, locale, this._cgClient);
|
|
27
27
|
if (this._cgClient.debug)
|
|
28
|
-
console.log(
|
|
28
|
+
console.log(`⚪ [MetaDataResolver] Resolved metadata to: ${JSON.stringify(meta)}`);
|
|
29
29
|
return meta;
|
|
30
30
|
}
|
|
31
|
+
else {
|
|
32
|
+
if (this._cgClient.debug)
|
|
33
|
+
console.warn(`🟠 [MetaDataResolver] Resolved component for ${JSON.stringify(contentType)} does provide additional metadata`);
|
|
34
|
+
}
|
|
31
35
|
return {};
|
|
32
36
|
}
|
|
33
37
|
}
|
package/dist/metadata.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../src/metadata.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,EAAE,EAAE,oBAAoB,EAAqD,MAAM,iCAAiC,CAAA;AAEvI,OAAO,EAAE,gCAAgC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../src/metadata.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,EAAE,EAAE,oBAAoB,EAAqD,MAAM,iCAAiC,CAAA;AAEvI,OAAO,EAAE,gCAAgC,EAAE,MAAM,WAAW,CAAA;AAE5D,MAAM,OAAO,gBAAgB;IAIzB,YAAmB,cAAyD;QAExE,IAAI,CAAC,SAAS,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC,CAAA;IACzG,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,OAAO,CAAC,OAAyB,EAAE,WAAwB,EAAE,WAAqB,EAAE,MAAsB;QAEnH,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK;YACpB,OAAO,CAAC,GAAG,CAAC,gDAAiD,IAAI,CAAC,SAAS,CAAC,EAAC,WAAW,EAAE,WAAW,EAAE,MAAM,EAAC,CAAC,EAAE,CAAC,CAAA;QAEtH,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAA;QAEzF,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAC9C,IAAI,CAAC,SAAS;YACV,OAAO,EAAE,CAAA;QAEb,IAAI,gCAAgC,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;YACvE,OAAO,CAAC,GAAG,CAAC,+EAA+E,CAAC,CAAA;YAC5F,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;YAC7E,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK;gBACpB,OAAO,CAAC,GAAG,CAAC,8CAA+C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAE,EAAE,CAAC,CAAA;YACvF,OAAO,IAAI,CAAA;QACf,CAAC;aAAM,CAAC;YACJ,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK;gBACpB,OAAO,CAAC,IAAI,CAAC,gDAAiD,IAAI,CAAC,SAAS,CAAC,WAAW,CAAE,mCAAmC,CAAC,CAAA;QACtI,CAAC;QACD,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AAED,eAAe,gBAAgB,CAAA"}
|
package/dist/ope/data.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type { GetContentByIdMethod } from './types';
|
|
1
|
+
import type { GetContentByIdMethod } from './types.js';
|
|
2
2
|
export declare const getContentById: GetContentByIdMethod;
|
package/dist/ope/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import 'server-only';
|
|
2
|
-
export * as Types from './types';
|
|
3
|
-
export * from './page';
|
|
4
|
-
export { createEditPageComponent as default } from './page';
|
|
2
|
+
export * as Types from './types.js';
|
|
3
|
+
export * from './page.js';
|
|
4
|
+
export { createEditPageComponent as default } from './page.js';
|
package/dist/ope/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import 'server-only';
|
|
2
|
-
export * as Types from './types';
|
|
3
|
-
export * from './page';
|
|
4
|
-
export { createEditPageComponent as default } from './page';
|
|
2
|
+
export * as Types from './types.js';
|
|
3
|
+
export * from './page.js';
|
|
4
|
+
export { createEditPageComponent as default } from './page.js';
|
|
5
5
|
//# sourceMappingURL=index.js.map
|
package/dist/ope/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ope/index.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAA;AAEpB,OAAO,KAAK,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ope/index.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAA;AAEpB,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,cAAc,WAAW,CAAA;AACzB,OAAO,EAAE,uBAAuB,IAAI,OAAO,EAAE,MAAM,WAAW,CAAA"}
|
package/dist/ope/page.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import 'server-only';
|
|
2
|
-
import type { EditPageComponent, EditViewOptions } from './types';
|
|
2
|
+
import type { EditPageComponent, EditViewOptions } from './types.js';
|
|
3
3
|
import { type ComponentFactory } from '@remkoj/optimizely-cms-react/rsc';
|
|
4
4
|
/**
|
|
5
5
|
* Create the EditPage component needed by Next.JS to render the "On Page
|
package/dist/ope/page.js
CHANGED
|
@@ -4,12 +4,12 @@ import { AuthMode } from '@remkoj/optimizely-graph-client';
|
|
|
4
4
|
import { contentLinkToString } from '@remkoj/optimizely-graph-client/utils';
|
|
5
5
|
import { Utils } from '@remkoj/optimizely-cms-react';
|
|
6
6
|
import { CmsContent, getServerContext } from '@remkoj/optimizely-cms-react/rsc';
|
|
7
|
-
import { notFound } from 'next/navigation';
|
|
8
|
-
import OnPageEdit from '../components/on-page-edit';
|
|
9
|
-
import { getAuthorizedServerClient } from '../client';
|
|
7
|
+
import { notFound } from 'next/navigation.js';
|
|
8
|
+
import OnPageEdit from '../components/on-page-edit.js';
|
|
9
|
+
import { getAuthorizedServerClient } from '../client.js';
|
|
10
10
|
import React from 'react';
|
|
11
|
-
import Script from 'next/script';
|
|
12
|
-
import { getContentById } from './data';
|
|
11
|
+
import Script from 'next/script.js';
|
|
12
|
+
import { getContentById } from './data.js';
|
|
13
13
|
function readValue(variableName, defaultValue) {
|
|
14
14
|
try {
|
|
15
15
|
const stringValue = process?.env ? process.env[variableName] : undefined;
|
|
@@ -34,7 +34,7 @@ const defaultOptions = {
|
|
|
34
34
|
refreshDelay: 2000,
|
|
35
35
|
refreshNotice: () => _jsx("div", { className: 'optly-refresh-notice', children: "Updating preview, please wait...." }),
|
|
36
36
|
errorNotice: props => _jsxs("div", { className: 'optly-error-notice', children: [_jsx("div", { className: 'optly-error-title', children: props.title }), _jsx("div", { className: 'optly-error-message', children: props.message })] }),
|
|
37
|
-
layout: props => _jsx(
|
|
37
|
+
layout: props => _jsx(_Fragment, { children: props.children }),
|
|
38
38
|
loader: getContentById,
|
|
39
39
|
clientFactory: (token) => getAuthorizedServerClient(token),
|
|
40
40
|
communicationInjectorPath: '/util/javascript/communicationinjector.js'
|
|
@@ -43,7 +43,7 @@ const defaultOptions = {
|
|
|
43
43
|
function getContentRequest(path = "", searchParams) {
|
|
44
44
|
try {
|
|
45
45
|
if (searchParams.preview_token == AuthMode.HMAC || searchParams.preview_token == AuthMode.Basic) {
|
|
46
|
-
console.error("[OnPageEdit]
|
|
46
|
+
console.error("🦺 [OnPageEdit] Edit mode requested with developer tokens, falling back to URL parsing to determine content");
|
|
47
47
|
const fullPath = Array.isArray(path) ? path.map(p => decodeURIComponent(p)).join('/') : decodeURI(path);
|
|
48
48
|
const [cmsPath, contentString] = fullPath.split(',,', 3);
|
|
49
49
|
const [contentKey, contentVersion] = (contentString ?? '').split('_', 3);
|
|
@@ -54,7 +54,7 @@ function getContentRequest(path = "", searchParams) {
|
|
|
54
54
|
key: contentKey,
|
|
55
55
|
version: contentVersion,
|
|
56
56
|
locale: contentLocale,
|
|
57
|
-
path: '/' + contentPath + (contentPath.endsWith('/') ? '' : '/')
|
|
57
|
+
path: '/' + contentPath + (contentPath.endsWith('/') || contentPath == '' ? '' : '/')
|
|
58
58
|
};
|
|
59
59
|
}
|
|
60
60
|
else {
|
|
@@ -82,7 +82,7 @@ function getContentRequest(path = "", searchParams) {
|
|
|
82
82
|
* @returns The React Component that can be used by Next.JS to render the page
|
|
83
83
|
*/
|
|
84
84
|
export function createEditPageComponent(factory, options) {
|
|
85
|
-
const envRefreshDelay = readValueAsInt("
|
|
85
|
+
const envRefreshDelay = readValueAsInt("OPTIMIZELY_GRAPH_UPDATE_DELAY", defaultOptions.refreshDelay);
|
|
86
86
|
const { layout: PageLayout, refreshNotice: RefreshNotice, refreshDelay, errorNotice: ErrorNotice, loader: getContentById, clientFactory, communicationInjectorPath } = { ...defaultOptions, refreshDelay: envRefreshDelay, ...options };
|
|
87
87
|
async function EditPage({ params: { path }, searchParams }) {
|
|
88
88
|
// Create context
|
|
@@ -90,47 +90,47 @@ export function createEditPageComponent(factory, options) {
|
|
|
90
90
|
// Validate the search parameters
|
|
91
91
|
const epiEditMode = searchParams?.epieditmode?.toLowerCase();
|
|
92
92
|
if (epiEditMode != 'true' && epiEditMode != 'false') {
|
|
93
|
-
console.error("[OnPageEdit] Edit mode requested without valid EpiEditMode, refused to render the page. Mode set:", searchParams.epieditmode);
|
|
93
|
+
console.error("🔴 [OnPageEdit] Edit mode requested without valid EpiEditMode, refused to render the page. Mode set:", searchParams.epieditmode);
|
|
94
94
|
return notFound();
|
|
95
95
|
}
|
|
96
96
|
// Allow use-hmac as magic token to be used only on a development environment, otherwise require a minimal length string as token
|
|
97
97
|
const token = searchParams.preview_token;
|
|
98
98
|
const validDev = context.isDevelopment && (searchParams.preview_token == AuthMode.HMAC || searchParams.preview_token == AuthMode.Basic);
|
|
99
99
|
if (!token || (token.length < 20 && !validDev)) {
|
|
100
|
-
console.error("[OnPageEdit] Edit mode requested without valid Preview Token, refused to render the page");
|
|
100
|
+
console.error("🔴 [OnPageEdit] Edit mode requested without valid Preview Token, refused to render the page");
|
|
101
101
|
return notFound();
|
|
102
102
|
}
|
|
103
103
|
if (context.isDebug)
|
|
104
|
-
console.log(
|
|
104
|
+
console.log(`⚪ [OnPageEdit] Valid edit mode request: EpiEditMode=${searchParams.epieditmode}`);
|
|
105
105
|
// Build context
|
|
106
106
|
const client = clientFactory(token);
|
|
107
107
|
context.setOptimizelyGraphClient(client);
|
|
108
108
|
context.setComponentFactory(factory);
|
|
109
|
-
context.setInEditMode(
|
|
109
|
+
context.setInEditMode(true);
|
|
110
110
|
// Get information from the Request URI
|
|
111
111
|
const contentRequest = getContentRequest(path, searchParams);
|
|
112
112
|
if (!contentRequest) {
|
|
113
|
-
console.error("[OnPageEdit] Unable to resolve requested content");
|
|
113
|
+
console.error("🔴 [OnPageEdit] Unable to resolve requested content");
|
|
114
114
|
return notFound();
|
|
115
115
|
}
|
|
116
116
|
if (context.isDebug) {
|
|
117
|
-
console.log("[OnPageEdit] Requested content:", JSON.stringify(contentRequest));
|
|
118
|
-
console.log("[OnPageEdit] Creating GraphQL Client:", token);
|
|
117
|
+
console.log("⚪ [OnPageEdit] Requested content:", JSON.stringify(contentRequest));
|
|
118
|
+
console.log("⚪ [OnPageEdit] Creating GraphQL Client:", token);
|
|
119
119
|
}
|
|
120
120
|
try {
|
|
121
121
|
const contentInfo = await getContentById(client, contentRequest);
|
|
122
122
|
if ((contentInfo?.content?.total ?? 0) > 1) {
|
|
123
|
-
console.warn("[OnPageEdit] Content request " + JSON.stringify(contentRequest) + " yielded more then one item, picking first matching");
|
|
123
|
+
console.warn("🟠 [OnPageEdit] Content request " + JSON.stringify(contentRequest) + " yielded more then one item, picking first matching");
|
|
124
124
|
}
|
|
125
125
|
const contentItem = (contentInfo?.content?.items ?? [])[0];
|
|
126
126
|
const contentType = Utils.normalizeContentType(contentItem?._metadata.types);
|
|
127
127
|
// Return a 404 if the content item or type could not be resolved
|
|
128
128
|
if (!contentItem) {
|
|
129
|
-
console.warn(
|
|
129
|
+
console.warn(`🟠 [OnPageEdit] The content item for ${JSON.stringify(contentRequest)} could not be loaded from Optimizely Graph`);
|
|
130
130
|
return notFound();
|
|
131
131
|
}
|
|
132
132
|
if (!contentType) {
|
|
133
|
-
console.warn(
|
|
133
|
+
console.warn(`🟠 [OnPageEdit] The content item for ${JSON.stringify(contentRequest)} did not contain content type information`);
|
|
134
134
|
return notFound();
|
|
135
135
|
}
|
|
136
136
|
const contentLink = {
|
|
@@ -139,7 +139,7 @@ export function createEditPageComponent(factory, options) {
|
|
|
139
139
|
version: contentItem._metadata.version
|
|
140
140
|
};
|
|
141
141
|
if (context.isDebug) {
|
|
142
|
-
console.log("[OnPageEdit] Resolved content:", JSON.stringify({
|
|
142
|
+
console.log("⚪ [OnPageEdit] Resolved content:", JSON.stringify({
|
|
143
143
|
...contentLink,
|
|
144
144
|
type: (contentItem.contentType ?? []).join('/')
|
|
145
145
|
}));
|
|
@@ -155,7 +155,7 @@ export function createEditPageComponent(factory, options) {
|
|
|
155
155
|
return output;
|
|
156
156
|
}
|
|
157
157
|
catch (e) {
|
|
158
|
-
console.error("[OnPageEdit] Caught error", e);
|
|
158
|
+
console.error("🔴 [OnPageEdit] Caught error", e);
|
|
159
159
|
return notFound();
|
|
160
160
|
}
|
|
161
161
|
}
|
package/dist/ope/page.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/ope/page.tsx"],"names":[],"mappings":";AAAA,OAAO,aAAa,CAAA;AAGpB,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAA;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAA;AAC3E,OAAO,EAAE,KAAK,EAA8B,MAAM,8BAA8B,CAAA;AAChF,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAyB,MAAM,kCAAkC,CAAA;AACtG,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/ope/page.tsx"],"names":[],"mappings":"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"}
|
package/dist/page.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type { OptimizelyNextPage } from "./types";
|
|
1
|
+
import type { OptimizelyNextPage } from "./types.js";
|
|
2
2
|
export declare function isOptimizelyNextPageWithMetaData(toTest: any): toTest is OptimizelyNextPage;
|
package/dist/publish/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type NextRequest, NextResponse } from "next/server";
|
|
2
|
-
import { revalidatePath } from "next/cache";
|
|
1
|
+
import { type NextRequest, NextResponse } from "next/server.js";
|
|
2
|
+
import { revalidatePath } from "next/cache.js";
|
|
3
3
|
import { type IOptiGraphClient, type OptimizelyGraphConfig, type ClientFactory } from "@remkoj/optimizely-graph-client";
|
|
4
4
|
type PublishScopes = NonNullable<Parameters<typeof revalidatePath>[1]>;
|
|
5
5
|
type OptiGraphClientFactory = IOptiGraphClient | OptimizelyGraphConfig | ClientFactory;
|
package/dist/publish/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { NextResponse } from "next/server";
|
|
2
|
-
import { revalidatePath, revalidateTag } from "next/cache";
|
|
1
|
+
import { NextResponse } from "next/server.js";
|
|
2
|
+
import { revalidatePath, revalidateTag } from "next/cache.js";
|
|
3
3
|
import { isContentGraphClient, ContentGraphClient } from "@remkoj/optimizely-graph-client";
|
|
4
|
-
import { getServerClient } from '../client';
|
|
4
|
+
import { getServerClient } from '../client.js';
|
|
5
5
|
export function createPublishApi(options) {
|
|
6
6
|
const defaultOptions = {
|
|
7
7
|
paths: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/publish/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/publish/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@remkoj/optimizely-cms-nextjs",
|
|
3
3
|
"license": "Apache-2.0",
|
|
4
|
-
"version": "2.0.0-
|
|
4
|
+
"version": "2.0.0-pre3",
|
|
5
5
|
"packageManager": "yarn@4.1.1",
|
|
6
6
|
"repository": "https://github.com/remkoj/optimizely-dxp-clients.git",
|
|
7
7
|
"author": "Remko Jantzen <693172+remkoj@users.noreply.github.com>",
|
|
@@ -32,31 +32,30 @@
|
|
|
32
32
|
}
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
-
"@remkoj/optimizely-cms-react": "2.0.0-
|
|
36
|
-
"@remkoj/optimizely-graph-client": "2.0.0-
|
|
37
|
-
"@types/node": "^20.12.
|
|
38
|
-
"@types/react": "^18.2
|
|
39
|
-
"@types/react-dom": "18.
|
|
40
|
-
"deepmerge": "^4.3.1",
|
|
35
|
+
"@remkoj/optimizely-cms-react": "2.0.0-pre3",
|
|
36
|
+
"@remkoj/optimizely-graph-client": "2.0.0-pre3",
|
|
37
|
+
"@types/node": "^20.12.12",
|
|
38
|
+
"@types/react": "^18.3.2",
|
|
39
|
+
"@types/react-dom": "18.3.0",
|
|
41
40
|
"graphql": "^16.8.1",
|
|
42
41
|
"graphql-request": "^6.1.0",
|
|
43
|
-
"next": "^14.2.
|
|
44
|
-
"next-auth": "^4.24.7",
|
|
42
|
+
"next": "^14.2.3",
|
|
45
43
|
"prop-types": "^15.8.1",
|
|
46
|
-
"react": "^18.
|
|
47
|
-
"react-dom": "^18.
|
|
48
|
-
"scheduler": "^0.23.
|
|
44
|
+
"react": "^18.3.1",
|
|
45
|
+
"react-dom": "^18.3.1",
|
|
46
|
+
"scheduler": "^0.23.2",
|
|
49
47
|
"typescript": "^5.4.5"
|
|
50
48
|
},
|
|
49
|
+
"dependencies": {
|
|
50
|
+
"deepmerge": "^4.3.1"
|
|
51
|
+
},
|
|
51
52
|
"peerDependencies": {
|
|
52
|
-
"@remkoj/optimizely-cms-react": "2.0.0-
|
|
53
|
-
"@remkoj/optimizely-graph-client": "2.0.0-
|
|
54
|
-
"
|
|
55
|
-
"graphql": "
|
|
56
|
-
"
|
|
57
|
-
"
|
|
58
|
-
"next-auth": "*",
|
|
59
|
-
"react": "*"
|
|
53
|
+
"@remkoj/optimizely-cms-react": "2.0.0-pre3",
|
|
54
|
+
"@remkoj/optimizely-graph-client": "2.0.0-pre3",
|
|
55
|
+
"graphql": "^16.8.1",
|
|
56
|
+
"graphql-request": "^6.1.0",
|
|
57
|
+
"next": "^14.2.3",
|
|
58
|
+
"react": "^18.3.1"
|
|
60
59
|
},
|
|
61
60
|
"scripts": {
|
|
62
61
|
"clean": "yarn tsc --build --clean",
|
package/dist/auth.d.ts
DELETED
|
@@ -1,73 +0,0 @@
|
|
|
1
|
-
import type { User, Session } from "next-auth";
|
|
2
|
-
import type { OAuthConfig } from "next-auth/providers";
|
|
3
|
-
export type OptimizelyCmsOIDCProviderOptions = {
|
|
4
|
-
id?: string;
|
|
5
|
-
clientId: string;
|
|
6
|
-
clientSecret?: string;
|
|
7
|
-
cmsBaseUrl: string | URL;
|
|
8
|
-
name: string;
|
|
9
|
-
scopes?: string[];
|
|
10
|
-
};
|
|
11
|
-
type OptimizelyProfile = {
|
|
12
|
-
sub: string;
|
|
13
|
-
oi_au_id: string;
|
|
14
|
-
azp: string;
|
|
15
|
-
at_hash: string;
|
|
16
|
-
oi_tkn_id: string;
|
|
17
|
-
aud: string;
|
|
18
|
-
exp: number;
|
|
19
|
-
iss: string;
|
|
20
|
-
iat: number;
|
|
21
|
-
};
|
|
22
|
-
export declare function OptimizelyCmsOIDCProvider(options: OptimizelyCmsOIDCProviderOptions): OAuthConfig<OptimizelyProfile>;
|
|
23
|
-
/**
|
|
24
|
-
* Generate the JWT callback handler to ensure sessions - with JWT storage - are properly prolonged based on the
|
|
25
|
-
* refresh token.
|
|
26
|
-
*
|
|
27
|
-
* @param options The configuration of the connection with Optimizely CMS
|
|
28
|
-
* @returns The callback handler
|
|
29
|
-
*/
|
|
30
|
-
export declare function OptimizelyCmsRefreshJwtCallbackHandler(options: OptimizelyCmsOIDCProviderOptions): (params: {
|
|
31
|
-
token: import("next-auth/jwt").JWT;
|
|
32
|
-
user: User | import("next-auth/adapters").AdapterUser;
|
|
33
|
-
account: import("next-auth").Account | null;
|
|
34
|
-
profile?: import("next-auth").Profile | undefined;
|
|
35
|
-
trigger?: "signIn" | "signUp" | "update" | undefined;
|
|
36
|
-
isNewUser?: boolean | undefined;
|
|
37
|
-
session?: any;
|
|
38
|
-
}) => import("next-auth").Awaitable<import("next-auth/jwt").JWT>;
|
|
39
|
-
/**
|
|
40
|
-
* Generate the Session callback handler to ensure sessions - with JWT storage - contain the needed information to inform users
|
|
41
|
-
* about errors with the login status.
|
|
42
|
-
*
|
|
43
|
-
* @param options The configuration of the connection with Optimizely CMS
|
|
44
|
-
* @returns The callback handler
|
|
45
|
-
*/
|
|
46
|
-
export declare const OptimizelyCmsRefreshSessionCallbackHander: (options: OptimizelyCmsOIDCProviderOptions) => (params: {
|
|
47
|
-
session: Session;
|
|
48
|
-
token: import("next-auth/jwt").JWT;
|
|
49
|
-
user: import("next-auth/adapters").AdapterUser;
|
|
50
|
-
} & {
|
|
51
|
-
newSession: any;
|
|
52
|
-
trigger: "update";
|
|
53
|
-
}) => import("next-auth").Awaitable<Session | import("next-auth").DefaultSession>;
|
|
54
|
-
declare module "next-auth/core/types" {
|
|
55
|
-
interface Session {
|
|
56
|
-
error?: string;
|
|
57
|
-
user?: Omit<User, 'id'>;
|
|
58
|
-
}
|
|
59
|
-
interface User {
|
|
60
|
-
roles?: string;
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
declare module "next-auth/jwt/types" {
|
|
64
|
-
interface DefaultJWT {
|
|
65
|
-
roles?: string;
|
|
66
|
-
access_token?: string;
|
|
67
|
-
provider?: string;
|
|
68
|
-
expires_at?: number;
|
|
69
|
-
refresh_token?: string;
|
|
70
|
-
error?: "tokenRefreshError" | "unknownError" | "tokenExpiredError" | null;
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
export {};
|
package/dist/auth.js
DELETED
|
@@ -1,154 +0,0 @@
|
|
|
1
|
-
const defaultScopes = ['openid', 'offline_access', 'profile', 'email'];
|
|
2
|
-
const defaultRoles = "Everyone Authenticated";
|
|
3
|
-
const defaultProviderId = "optimizely_cms";
|
|
4
|
-
export function OptimizelyCmsOIDCProvider(options) {
|
|
5
|
-
// Merge default scopes & requested scopes
|
|
6
|
-
const scopes = [...defaultScopes];
|
|
7
|
-
options.scopes?.forEach(scope => {
|
|
8
|
-
if (!scopes.includes(scope))
|
|
9
|
-
scopes.push(scope);
|
|
10
|
-
});
|
|
11
|
-
const finalConfig = {
|
|
12
|
-
type: "oauth",
|
|
13
|
-
id: options.id ?? defaultProviderId,
|
|
14
|
-
name: options.name,
|
|
15
|
-
clientId: options.clientId,
|
|
16
|
-
clientSecret: options.clientSecret,
|
|
17
|
-
wellKnown: new URL("/.well-known/openid-configuration", options.cmsBaseUrl).href,
|
|
18
|
-
userinfo: new URL("/api/episerver/connect/userinfo", options.cmsBaseUrl).href,
|
|
19
|
-
accessTokenUrl: new URL("/api/episerver/connect/token", options.cmsBaseUrl).href,
|
|
20
|
-
authorization: { params: { scope: scopes.join(' ') } },
|
|
21
|
-
profileUrl: new URL("/api/episerver/connect/userinfo", options.cmsBaseUrl).href,
|
|
22
|
-
idToken: true,
|
|
23
|
-
checks: ['pkce', 'state'],
|
|
24
|
-
client: {
|
|
25
|
-
token_endpoint_auth_method: options.clientSecret ? 'client_secret_basic' : 'none',
|
|
26
|
-
introspection_endpoint_auth_method: options.clientSecret ? 'client_secret_basic' : 'none',
|
|
27
|
-
revocation_endpoint_auth_method: options.clientSecret ? 'client_secret_basic' : 'none',
|
|
28
|
-
},
|
|
29
|
-
httpOptions: {
|
|
30
|
-
//@ts-expect-error
|
|
31
|
-
cache: "no-store",
|
|
32
|
-
next: {
|
|
33
|
-
revalidate: 0
|
|
34
|
-
},
|
|
35
|
-
revalidate: 0
|
|
36
|
-
},
|
|
37
|
-
async profile(profile, tokens) {
|
|
38
|
-
const auth_header = `${tokens.token_type} ${tokens.access_token}`;
|
|
39
|
-
const response = await fetch(new URL("/api/episerver/connect/userinfo", options.cmsBaseUrl), { headers: { Authorization: auth_header } });
|
|
40
|
-
if (!response.ok)
|
|
41
|
-
return { id: profile.sub, roles: defaultRoles };
|
|
42
|
-
const userinfo = await response.json();
|
|
43
|
-
const u = {
|
|
44
|
-
id: profile.sub,
|
|
45
|
-
email: userinfo.email,
|
|
46
|
-
name: userinfo.name,
|
|
47
|
-
roles: userinfo.role ? userinfo.role.join(' ') : defaultRoles
|
|
48
|
-
};
|
|
49
|
-
return u;
|
|
50
|
-
}
|
|
51
|
-
};
|
|
52
|
-
return finalConfig;
|
|
53
|
-
}
|
|
54
|
-
/**
|
|
55
|
-
* Generate the JWT callback handler to ensure sessions - with JWT storage - are properly prolonged based on the
|
|
56
|
-
* refresh token.
|
|
57
|
-
*
|
|
58
|
-
* @param options The configuration of the connection with Optimizely CMS
|
|
59
|
-
* @returns The callback handler
|
|
60
|
-
*/
|
|
61
|
-
export function OptimizelyCmsRefreshJwtCallbackHandler(options) {
|
|
62
|
-
const providerId = options.id ?? defaultProviderId;
|
|
63
|
-
const OptimizelyCmsRefreshJwtCallback = async ({ account, token, user }) => {
|
|
64
|
-
if (account) // This is the first login
|
|
65
|
-
{
|
|
66
|
-
if (account.provider != providerId)
|
|
67
|
-
return token;
|
|
68
|
-
return {
|
|
69
|
-
sub: account.providerAccountId,
|
|
70
|
-
provider: account.provider,
|
|
71
|
-
access_token: account.access_token,
|
|
72
|
-
expires_at: account.expires_at,
|
|
73
|
-
refresh_token: account.refresh_token,
|
|
74
|
-
name: user?.name,
|
|
75
|
-
email: user?.email,
|
|
76
|
-
roles: user?.roles
|
|
77
|
-
};
|
|
78
|
-
}
|
|
79
|
-
if (token.provider != providerId) {
|
|
80
|
-
return token;
|
|
81
|
-
}
|
|
82
|
-
if (Date.now() < (token.expires_at ?? 0) * 1000) {
|
|
83
|
-
return {
|
|
84
|
-
...token,
|
|
85
|
-
error: null
|
|
86
|
-
};
|
|
87
|
-
}
|
|
88
|
-
if (token.refresh_token) {
|
|
89
|
-
const requestBody = {
|
|
90
|
-
client_id: options.clientId,
|
|
91
|
-
grant_type: "refresh_token",
|
|
92
|
-
refresh_token: token.refresh_token
|
|
93
|
-
};
|
|
94
|
-
if (options.clientSecret)
|
|
95
|
-
requestBody.client_secret = options.clientSecret;
|
|
96
|
-
const response = await fetch(new URL("/api/episerver/connect/token", options.cmsBaseUrl), {
|
|
97
|
-
headers: {
|
|
98
|
-
"Content-Type": "application/x-www-form-urlencoded"
|
|
99
|
-
},
|
|
100
|
-
body: new URLSearchParams(requestBody),
|
|
101
|
-
method: 'POST',
|
|
102
|
-
cache: 'no-cache'
|
|
103
|
-
});
|
|
104
|
-
const tokens = await response.json();
|
|
105
|
-
if (!response.ok)
|
|
106
|
-
throw tokens;
|
|
107
|
-
const newToken = {
|
|
108
|
-
...token,
|
|
109
|
-
access_token: tokens.access_token,
|
|
110
|
-
expires_at: tokens.expires_at,
|
|
111
|
-
refresh_token: tokens.id_token
|
|
112
|
-
};
|
|
113
|
-
if (newToken.error)
|
|
114
|
-
delete newToken.error;
|
|
115
|
-
return newToken;
|
|
116
|
-
}
|
|
117
|
-
return {
|
|
118
|
-
...token,
|
|
119
|
-
error: "tokenExpiredError"
|
|
120
|
-
};
|
|
121
|
-
};
|
|
122
|
-
return OptimizelyCmsRefreshJwtCallback;
|
|
123
|
-
}
|
|
124
|
-
/**
|
|
125
|
-
* Generate the Session callback handler to ensure sessions - with JWT storage - contain the needed information to inform users
|
|
126
|
-
* about errors with the login status.
|
|
127
|
-
*
|
|
128
|
-
* @param options The configuration of the connection with Optimizely CMS
|
|
129
|
-
* @returns The callback handler
|
|
130
|
-
*/
|
|
131
|
-
export const OptimizelyCmsRefreshSessionCallbackHander = (options) => {
|
|
132
|
-
const providerId = options.id ?? defaultProviderId;
|
|
133
|
-
const OptimizelyCmsRefreshSessionCallback = async ({ session, token, user }) => {
|
|
134
|
-
const newSession = { ...session };
|
|
135
|
-
if (token?.provider == providerId) {
|
|
136
|
-
newSession.user = {
|
|
137
|
-
email: token.email,
|
|
138
|
-
name: token.name,
|
|
139
|
-
roles: token.roles
|
|
140
|
-
};
|
|
141
|
-
if (token.error) {
|
|
142
|
-
newSession.error = token.error;
|
|
143
|
-
}
|
|
144
|
-
else if (newSession.error) {
|
|
145
|
-
delete newSession.error;
|
|
146
|
-
}
|
|
147
|
-
}
|
|
148
|
-
if (user)
|
|
149
|
-
newSession.user = user;
|
|
150
|
-
return newSession;
|
|
151
|
-
};
|
|
152
|
-
return OptimizelyCmsRefreshSessionCallback;
|
|
153
|
-
};
|
|
154
|
-
//# sourceMappingURL=auth.js.map
|
package/dist/auth.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"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"}
|