Skip to content

Commit 4be9ef3

Browse files
committed
update owner flow changed
1 parent cbfd3b6 commit 4be9ef3

File tree

2 files changed

+5
-36
lines changed

2 files changed

+5
-36
lines changed

Minio-SQL-connector/api/controllers/controller.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const common = require("../../utils/common.js")
33
const Log = require('../../utils/logger.js')//.app(module);
44
const { Logger } = Log
55
const logger = new Logger("controller")
6-
6+
const config = require('../../config')
77

88
const queryMongo = async (req, res) => {
99
logger.info(req.body, req.query)
@@ -66,8 +66,8 @@ module.exports = {
6666
getEntries: async (req, res) => {
6767
logger.info("values")
6868
let email = req.body.prefix.split("/")[0]
69-
if (process.queryEngine.updateOwner && !process.queryEngine.updatedOwners[email]) {
70-
service.updateOwner(req.headers.authorization, email)
69+
if (config.updateOwner == "later" && !process.queryEngine.updatedOwners[email]) {
70+
service.updateOwner(req.headers.authorization, email)
7171
}
7272
try {
7373
res.send(await service.getEntries(req.body.prefix, req.body.bucketName, req.headers.visibility, req.query.key, req.query.value))

Minio-SQL-connector/utils/minioWriter.js

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ const { Logger } = Log
1313
const logger = new Logger("miniowriter")
1414
const log = logger.info
1515
const axios = require('axios')
16-
const login = require('./login.js')
17-
let bearer, authMetod //= login.authenticate()
18-
exports.bearer = bearer
19-
exports.authMetod = authMetod
20-
async function getBearer() {
21-
bearer = await login.authenticate()
22-
}
23-
getBearer()
2416
process.queryEngine = {updatedOwners: {}}
2517

2618
function logSizeChecker() {
@@ -221,38 +213,15 @@ module.exports = {
221213
data = JSON.stringify(data)
222214
let owner
223215
try {
224-
if (authMetod == "frontend")
216+
if (config.updateOwner == "later")
225217
owner = "unknown"
226218
else {
227-
if (!bearer)
228-
bearer = await login.authenticate()
229-
owner = (await axios.get(config.minioConfig.ownerInfoEndpoint + "/createdBy?filePath=" + queryName + "&etag=" + record.etag,
230-
{
231-
headers: {
232-
Authorization: bearer
233-
}
234-
})).data
219+
owner = (await axios.get(config.minioConfig.ownerInfoEndpoint + "/createdBy?filePath=" + queryName + "&etag=" + record.etag)).data
235220
}
236221
}
237222
catch (error) {
238223
logger.error("Error getting owner")
239224
logger.error(error)
240-
bearer = await login.authenticate()
241-
try {
242-
owner = (await axios.get(config.minioConfig.ownerInfoEndpoint + "/createdBy?filePath=" + queryName + "&etag=" + record.etag,
243-
{
244-
headers: {
245-
Authorization: bearer
246-
}
247-
})).data
248-
}
249-
catch (error) {
250-
logger.error("Error getting owner")
251-
logger.error(error)
252-
owner = "unknown"
253-
authMetod = "frontend"
254-
process.queryEngine.updateOwner = true
255-
}
256225
}
257226
log("Owner ", owner)
258227
record = { ...record, insertedBy: owner }

0 commit comments

Comments
 (0)