Skip to content

Commit 885b9fc

Browse files
committed
Merge branch 'main' of https://github.com/rowyio/rowyRun into main
2 parents 9c380b8 + 737636d commit 885b9fc

39 files changed

+1029
-919
lines changed

.prettierignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
node_modules/
2+
.yarn

package-lock.json

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+8-3
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,20 @@
3434
"@types/node": "^16.6.1",
3535
"firebase-tools": "^9.18.0",
3636
"google-auth-library": "^7.0.0",
37-
"husky": "^4.2.5",
37+
"husky": "^4.3.8",
3838
"js-beautify": "^1.13.0",
3939
"mocha": "^9.0.0",
4040
"nodemon": "^2.0.12",
41-
"prettier": "^2.1.1",
42-
"pretty-quick": "^3.0.0",
41+
"prettier": "^2.4.0",
42+
"pretty-quick": "^3.1.1",
4343
"supertest": "^6.0.0",
4444
"ts-node": "^9.1.1",
4545
"tslint": "^6.1.0",
4646
"typescript": "^4.2.3"
47+
},
48+
"husky": {
49+
"hooks": {
50+
"pre-commit": "pretty-quick --staged"
51+
}
4752
}
4853
}

src/actionScripts/index.ts

-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ export const actionScript = async (req: Request, res: Response) => {
5555
if (!requiredRoles || requiredRoles.length === 0) {
5656
throw Error(`You need to specify at least one role to run this script`);
5757
}
58-
console.log(`requiredRoles: ${requiredRoles}`);
59-
console.log(`userRoles: ${user.customClaims.roles}`);
6058
if (!requiredRoles.some((role) => user.customClaims.roles.includes(role))) {
6159
throw Error(`You don't have the required roles permissions`);
6260
}

src/constants/Collections.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
export const rowyUsers = '_rowy_/userManagement/users'
2-
export const rowyUsersImpersonationLogs = '_rowy_/userManagement/impersonationLogs'
1+
export const rowyUsers = "_rowy_/userManagement/users";
2+
export const rowyUsersImpersonationLogs =
3+
"_rowy_/userManagement/impersonationLogs";
34

45
export default {
56
rowyUsers,
6-
rowyUsersImpersonationLogs
7-
}
7+
rowyUsersImpersonationLogs,
8+
};

src/firebaseConfig.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Initialize Firebase Admin
22
import * as admin from "firebase-admin";
33

4-
const credential = process.env.DEV ?
5-
admin.credential.cert(require(`../firebase-adminsdk.json`))
6-
:admin.credential.applicationDefault()
4+
const credential = process.env.DEV
5+
? admin.credential.cert(require(`../firebase-adminsdk.json`))
6+
: admin.credential.applicationDefault();
77
admin.initializeApp({
8-
credential
8+
credential,
99
});
1010
const db = admin.firestore();
1111
const auth = admin.auth();

src/firestore/index.ts

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
2-
import { db, admin } from '../firebaseConfig'
3-
import { Request, Response } from 'express';
4-
export const listCollections =async (req: Request) => {
1+
import { db, admin } from "../firebaseConfig";
2+
import { Request, Response } from "express";
3+
export const listCollections = async (req: Request) => {
54
const { path } = req.query;
65
if (path) {
7-
const collections = await db.doc(decodeURIComponent(path as string)).listCollections()
8-
return collections.map(collection => collection.id)
9-
6+
const collections = await db
7+
.doc(decodeURIComponent(path as string))
8+
.listCollections();
9+
return collections.map((collection) => collection.id);
1010
} else {
11-
const collections = await db.listCollections()
12-
return collections.map(collection => collection.id)
11+
const collections = await db.listCollections();
12+
return collections.map((collection) => collection.id);
1313
}
14-
}
15-
14+
};
1615

1716
export const getFirestoreRules = async () => {
18-
const securityRules = admin.securityRules()
19-
const firestoreRules = await securityRules.getFirestoreRuleset()
20-
return firestoreRules
21-
}
17+
const securityRules = admin.securityRules();
18+
const firestoreRules = await securityRules.getFirestoreRuleset();
19+
return firestoreRules;
20+
};

src/functionBuilder/compiler/index.ts

+53-52
Original file line numberDiff line numberDiff line change
@@ -10,63 +10,64 @@ export default async function generateConfig(
1010
user: admin.auth.UserRecord,
1111
streamLogger
1212
) {
13-
return await generateConfigOfTriggerPath(
14-
triggerPath,
15-
streamLogger
16-
).then(async () => {
17-
await streamLogger.info(`generateConfigFromTableSchema done`);
18-
const configFile = fs.readFileSync(
19-
path.resolve(__dirname, "../functions/src/functionConfig.ts"),
20-
"utf-8"
21-
);
22-
await streamLogger.info(`configFile: ${JSON.stringify(configFile)}`);
23-
const requiredDependencies = configFile.match(
24-
/(?<=(require\(("|'))).*?(?=("|')\))/g
25-
);
26-
if (requiredDependencies) {
27-
const packgesAdded = await addPackages(
28-
requiredDependencies.map((p: any) => ({ name: p })),
29-
user,
30-
streamLogger
13+
return await generateConfigOfTriggerPath(triggerPath, streamLogger).then(
14+
async () => {
15+
await streamLogger.info(`generateConfigFromTableSchema done`);
16+
const configFile = fs.readFileSync(
17+
path.resolve(__dirname, "../functions/src/functionConfig.ts"),
18+
"utf-8"
3119
);
32-
if (!packgesAdded) {
33-
return false;
20+
await streamLogger.info(`configFile: ${JSON.stringify(configFile)}`);
21+
const requiredDependencies = configFile.match(
22+
/(?<=(require\(("|'))).*?(?=("|')\))/g
23+
);
24+
if (requiredDependencies) {
25+
const packgesAdded = await addPackages(
26+
requiredDependencies.map((p: any) => ({ name: p })),
27+
user,
28+
streamLogger
29+
);
30+
if (!packgesAdded) {
31+
return false;
32+
}
3433
}
35-
}
36-
await streamLogger.info(
37-
`requiredDependencies: ${JSON.stringify(requiredDependencies)}`
38-
);
34+
await streamLogger.info(
35+
`requiredDependencies: ${JSON.stringify(requiredDependencies)}`
36+
);
3937

40-
const isFunctionConfigValid = await asyncExecute(
41-
"cd build/functionBuilder/functions/src; tsc functionConfig.ts",
42-
commandErrorHandler(
43-
{
44-
user,
45-
functionConfigTs: configFile,
46-
description: `Invalid compiled functionConfig.ts`,
47-
},
48-
streamLogger
49-
)
50-
);
51-
await streamLogger.info(
52-
`isFunctionConfigValid: ${JSON.stringify(isFunctionConfigValid)}`
53-
);
54-
if (!isFunctionConfigValid) {
55-
return false;
56-
}
38+
const isFunctionConfigValid = await asyncExecute(
39+
"cd build/functionBuilder/functions/src; tsc functionConfig.ts",
40+
commandErrorHandler(
41+
{
42+
user,
43+
functionConfigTs: configFile,
44+
description: `Invalid compiled functionConfig.ts`,
45+
},
46+
streamLogger
47+
)
48+
);
49+
await streamLogger.info(
50+
`isFunctionConfigValid: ${JSON.stringify(isFunctionConfigValid)}`
51+
);
52+
if (!isFunctionConfigValid) {
53+
return false;
54+
}
5755

58-
const { extensionsConfig } = require("../functions/src/functionConfig.js");
59-
const requiredExtensions = extensionsConfig.map((s: any) => s.type);
60-
await streamLogger.info(
61-
`requiredExtensions: ${JSON.stringify(requiredExtensions)}`
62-
);
56+
const {
57+
extensionsConfig,
58+
} = require("../functions/src/functionConfig.js");
59+
const requiredExtensions = extensionsConfig.map((s: any) => s.type);
60+
await streamLogger.info(
61+
`requiredExtensions: ${JSON.stringify(requiredExtensions)}`
62+
);
6363

64-
for (const lib of requiredExtensions) {
65-
const success = await addExtensionLib(lib, user, streamLogger);
66-
if (!success) {
67-
return false;
64+
for (const lib of requiredExtensions) {
65+
const success = await addExtensionLib(lib, user, streamLogger);
66+
if (!success) {
67+
return false;
68+
}
6869
}
70+
return true;
6971
}
70-
return true;
71-
});
72+
);
7273
}

0 commit comments

Comments
 (0)