🔀 Merge branch 'seatable-seatable-node'

This commit is contained in:
Jan Oberhauser 2021-10-07 17:12:28 -05:00
commit afbf905f88
2 changed files with 15 additions and 3 deletions

View file

@ -129,7 +129,7 @@ export async function getBaseAccessToken(this: IExecuteFunctions | ILoadOptionsF
export function resolveBaseUri(ctx: ICtx) { export function resolveBaseUri(ctx: ICtx) {
return (ctx?.credentials?.environment === 'cloudHosted') return (ctx?.credentials?.environment === 'cloudHosted')
? 'https://cloud.seatable.io' : ctx?.credentials?.domain; ? 'https://cloud.seatable.io' : userBaseUri(ctx?.credentials?.domain);
} }
export function simplify(data: { results: IRow[] }, metadata: IDataObject) { export function simplify(data: { results: IRow[] }, metadata: IDataObject) {
@ -292,3 +292,15 @@ export const split = (subject: string): string[] =>
.filter(s => s.length) .filter(s => s.length)
.map(s => s.replace(/\\([\s\S])/gm, ($0, $1) => $1)) .map(s => s.replace(/\\([\s\S])/gm, ($0, $1) => $1))
; ;
const userBaseUri = (uri?: string) => {
if (uri === undefined) {
return uri;
}
if (uri.endsWith('/')) {
return uri.slice(0, -1);
}
return uri;
};

View file

@ -93,9 +93,9 @@ export interface ICtx {
export interface IRowResponse{ export interface IRowResponse{
metadata: [ metadata: [
{ {
key: string, key: string,
name: string name: string,
} }
]; ];
results: IRow[]; results: IRow[];