Skip to content

Commit

Permalink
feat(AP-1871): exclude "localContext" from server-side props result (#15
Browse files Browse the repository at this point in the history
)

Co-authored-by: Matt Strom <matt.strom@evolv.ai>
  • Loading branch information
mattstrom and Matt Strom authored Sep 14, 2022
1 parent c93b707 commit 3919c54
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 11 deletions.
16 changes: 12 additions & 4 deletions examples/nextjs/pages/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { EvolvClientOptions, EvolvProvider, EvolvServerSideProps, getEvolvServerSideProps, RemoteContext } from '@evolv/nextjs';
import {
EvolvClientOptions, EvolvProvider, EvolvServerSideProps, getEvolvServerSideProps, LocalContext, RemoteContext
} from '@evolv/nextjs';
import { GetServerSidePropsContext } from 'next';
import { FC } from 'react';

import { StoreCidCookie, getUserIdProps, UserIdProps } from '../utils';
import { getUserIdProps, StoreCidCookie, UserIdProps } from '../utils';
import Button from './button';
import Heading from './heading';

Expand Down Expand Up @@ -39,11 +41,17 @@ export async function getServerSideProps(ctx: GetServerSidePropsContext) {
postal: '94104',
region: 'CA',
tz: 'America/Los_Angeles'
}
},
customizeButton: false
};

const localContext: LocalContext = {
showHeading: true,
sensitiveInfo: 'Secret'
};

const { props: { uid }} = await getUserIdProps(ctx);
const { props: evolvProps } = await getEvolvServerSideProps({ client: options, uid, remoteContext }, ctx);
const { props: evolvProps } = await getEvolvServerSideProps({ client: options, uid, remoteContext, localContext }, ctx);

return {
props: {
Expand Down
3 changes: 1 addition & 2 deletions packages/nextjs/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module.exports = {
extends: [
'../../.eslintrc.js',
'next'
'../../.eslintrc.js'
]
};
4 changes: 1 addition & 3 deletions packages/nextjs/src/get-evolv-server-side-props.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ type PropsFactory<T extends GetServerSidePropsResult<any>> = (ctx: GetServerSide
export interface EvolvServerSideProps {
hydratedState: Record<string, any>;
remoteContext?: Partial<RemoteContext>;
localContext?: Partial<LocalContext>;
}

interface Result {
Expand Down Expand Up @@ -65,8 +64,7 @@ export function getEvolvServerSideProps(options: EvolvOptions, ctx?: GetServerSi
return {
props: {
hydratedState: adapter.hydratedState,
remoteContext: options.remoteContext ?? {},
localContext: options.localContext ?? {}
remoteContext: options.remoteContext ?? {}
}
};
};
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig-base.json",
"compilerOptions": {
"composite": true,
"rootDir": "./src",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig-base.json",
"compilerOptions": {
"composite": true,
"rootDir": "./src",
Expand Down

0 comments on commit 3919c54

Please sign in to comment.