mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-02-02 07:01:30 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 Fix parsing issues in Firestore node (#1759)

Browse source 
* ⚡ Fix empty document parsing

* ⚡ Add geopoint parsing

* ⚡ Fix date misdetection

* 🔥 Remove logging

* ⚡ Add ISO-8601 format to date validation
This commit is contained in:
Iván Ovejero 2021-05-12 21:21:56 +02:00 committed by GitHub
parent 779da62845
commit b42e1dc366
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
View file

@ -12,6 +12,8 @@ import {
IDataObject, NodeApiError, IDataObject, NodeApiError,
} from 'n8n-workflow'; } from 'n8n-workflow';
import * as moment from 'moment-timezone';
export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri: string | null = null): Promise<any> { // tslint:disable-line:no-any export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri: string | null = null): Promise<any> { // tslint:disable-line:no-any
const options: OptionsWithUri = { const options: OptionsWithUri = {
@ -58,6 +60,7 @@ export async function googleApiRequestAllItems(this: IExecuteFunctions | ILoadOp
return returnData; return returnData;
} }
const isValidDate = (str: string) => moment(str, ['YYYY-MM-DD HH:mm:ss Z', moment.ISO_8601], true).isValid();
// Both functions below were taken from Stack Overflow jsonToDocument was fixed as it was unable to handle null values correctly // Both functions below were taken from Stack Overflow jsonToDocument was fixed as it was unable to handle null values correctly
// https://stackoverflow.com/questions/62246410/how-to-convert-a-firestore-document-to-plain-json-and-vice-versa // https://stackoverflow.com/questions/62246410/how-to-convert-a-firestore-document-to-plain-json-and-vice-versa
@ -73,7 +76,7 @@ export function jsonToDocument(value: string | number | IDataObject | IDataObjec
} else { } else {
return { 'integerValue': value }; return { 'integerValue': value };
} }
} else if (Date.parse(value as string)) { } else if (isValidDate(value as string)) {
const date = new Date(Date.parse(value as string)); const date = new Date(Date.parse(value as string));
return { 'timestampValue': date.toISOString() }; return { 'timestampValue': date.toISOString() };
} else if (typeof value === 'string') { } else if (typeof value === 'string') {
@ -108,13 +111,14 @@ export function fullDocumentToJson(data: IDataObject): IDataObject {
export function documentToJson(fields: IDataObject): IDataObject { export function documentToJson(fields: IDataObject): IDataObject {
if (fields === undefined) return {};
const result = {}; const result = {};
for (const f of Object.keys(fields)) { for (const f of Object.keys(fields)) {
const key = f, value = fields[f], const key = f, value = fields[f],
isDocumentType = ['stringValue', 'booleanValue', 'doubleValue', isDocumentType = ['stringValue', 'booleanValue', 'doubleValue',
'integerValue', 'timestampValue', 'mapValue', 'arrayValue', 'nullValue'].find(t => t === key); 'integerValue', 'timestampValue', 'mapValue', 'arrayValue', 'nullValue', 'geoPointValue'].find(t => t === key);
if (isDocumentType) { if (isDocumentType) {
const item = ['stringValue', 'booleanValue', 'doubleValue', 'integerValue', 'timestampValue', 'nullValue'] const item = ['stringValue', 'booleanValue', 'doubleValue', 'integerValue', 'timestampValue', 'nullValue', 'geoPointValue']
.find(t => t === key); .find(t => t === key);
if (item) { if (item) {
return value as IDataObject; return value as IDataObject;