Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(grpc-sdk,hermes): rest/graphql cookies support #358

Merged
merged 1 commit into from
Sep 30, 2022
Merged
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
1 change: 1 addition & 0 deletions libraries/grpc-sdk/src/helpers/RoutingUtilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ message RouterRequest {
string path = 2;
string headers = 3;
string context = 4;
string cookies = 5;
}

message RouterResponse {
Expand Down
2 changes: 2 additions & 0 deletions libraries/grpc-sdk/src/helpers/wrapRouterFunctions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export function wrapCallObjectForRouter(call: Indexable): ParsedRouterRequest {
path: '',
headers: {},
context: {},
cookies: {},
},
};
}
Expand Down Expand Up @@ -72,6 +73,7 @@ export function wrapRouterGrpcFunction(
try {
call.request.context = parseRequestData(call.request.context);
call.request.params = parseRequestData(call.request.params);
call.request.cookies = parseRequestData(call.request.cookies);

routerRequest = !call.request.hasOwnProperty('event');
if (routerRequest) {
Expand Down
1 change: 1 addition & 0 deletions libraries/grpc-sdk/src/interfaces/Indexable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ export type Document = Indexable;
export type Route = Indexable;
export type Headers = Indexable;
export type Context = Indexable;
export type Cookies = Indexable;
export type Query = Indexable;
1 change: 1 addition & 0 deletions libraries/grpc-sdk/src/interfaces/Route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export interface ConduitRouteParameters {
path?: string;
headers: IncomingHttpHeaders;
context?: { [field: string]: any };
cookies?: { [field: string]: any };
}

export enum RouteOptionType {
Expand Down
6 changes: 4 additions & 2 deletions libraries/grpc-sdk/src/types/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Metadata, status } from '@grpc/grpc-js';
import { Context, Params, Headers, Indexable } from '../interfaces';
import { Context, Params, Headers, Cookies, Indexable } from '../interfaces';
import {
CounterConfiguration,
GaugeConfiguration,
Expand Down Expand Up @@ -32,6 +32,7 @@ export type ParsedRouterRequest = GrpcRequest<{
path: string;
headers: Headers;
context: Context;
cookies: Cookies;
}>;

export type UnparsedRouterResponse =
Expand All @@ -50,8 +51,9 @@ export type SetConfigResponse = GrpcResponse<{ updatedConfig: string }>;
export type ParsedSocketRequest = GrpcRequest<{
event: string;
socketId: string;
params: any[];
params: Params;
context: Context;
cookies: Cookies;
}>;

type EventResponse = {
Expand Down
3 changes: 2 additions & 1 deletion libraries/hermes/src/GraphQl/GraphQL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ export class GraphQLController extends ConduitRouter {
context: ({ req, res }: Indexable) => {
const context = req.conduit || {};
const headers = req.headers;
return { context, headers, setCookie: [], removeCookie: [], res };
const cookies = req.cookies || {};
return { context, headers, cookies, setCookie: [], removeCookie: [], res };
},
});
this._apollo = server.getMiddleware();
Expand Down
17 changes: 7 additions & 10 deletions libraries/hermes/src/Rest/util.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
import { Request } from 'express';
import {
ConduitError,
TYPE,
Indexable,
Params,
ConduitSchemaOptions,
} from '@conduitplatform/grpc-sdk';
import { ConduitError, TYPE, Indexable, Params } from '@conduitplatform/grpc-sdk';
import { isArray, isNil, isObject } from 'lodash';

export function extractRequestData(req: Request) {
const context = (req as ConduitSchemaOptions).conduit || {};
type ConduitRequest = Request & { conduit?: Indexable };

export function extractRequestData(req: ConduitRequest) {
const context = req.conduit || {};
const params: any = {};
const headers = req.headers;
const cookies = req.cookies;
if (req.query) {
const newObj = {};
Object.keys(req.query).forEach((k: string) => {
Expand Down Expand Up @@ -44,7 +41,7 @@ export function extractRequestData(req: Request) {
}
}
const path = req.baseUrl + req.path;
return { context, params, headers, path };
return { context, params, headers, cookies, path };
}

export function validateParams(params: Params, routeDefinedParams: Params) {
Expand Down
1 change: 1 addition & 0 deletions libraries/hermes/src/utils/GrpcConverter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ function createHandlerForRoute(
path: req.path,
headers: JSON.stringify(req.headers),
context: JSON.stringify(req.context),
cookies: JSON.stringify(req.cookies),
};
return new Promise((resolve, reject) => {
client[route.grpcFunction](
Expand Down