Compare commits

...
6 changed files with 41 additions and 194 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ maestro:
cookie_secret: "ff7bc13823edb2ae50d248e5780bddc9d4b31c36"
redis_database: "1"
platform_api_url: https://xs2hkhq07k.execute-api.us-east-1.amazonaws.com
storage_explorer_api_url: "https://storage-explorer-{customer}.stg.dadosfera.ai/api"
storage_explorer_api_url: "http://storage-explorer-{customer}.data-apps.svc.cluster.local:8000/api"
hostname: maestro.stg.dadosfera.ai
+4 -152
View File
@@ -7865,16 +7865,7 @@
"post": {
"operationId": "StorageExplorerController_validateTableName",
"summary": "Validate table name in PostgreSQL and Snowflake",
"parameters": [
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"parameters": [],
"responses": {
"201": {
"description": "",
@@ -7904,16 +7895,7 @@
"post": {
"operationId": "StorageExplorerController_createTable",
"summary": "Create a new table",
"parameters": [
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"parameters": [],
"responses": {
"201": {
"description": "",
@@ -7949,14 +7931,6 @@
"schema": {
"type": "number"
}
},
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"responses": {
@@ -7996,14 +7970,6 @@
"schema": {
"type": "string"
}
},
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"responses": {
@@ -8051,14 +8017,6 @@
"schema": {
"type": "string"
}
},
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"responses": {
@@ -8098,14 +8056,6 @@
"schema": {
"type": "string"
}
},
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"responses": {
@@ -8145,14 +8095,6 @@
"schema": {
"type": "string"
}
},
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"responses": {
@@ -8200,14 +8142,6 @@
"schema": {
"type": "string"
}
},
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"responses": {
@@ -8255,14 +8189,6 @@
"schema": {
"type": "number"
}
},
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"responses": {
@@ -8310,14 +8236,6 @@
"schema": {
"type": "boolean"
}
},
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"responses": {
@@ -8357,14 +8275,6 @@
"schema": {
"type": "string"
}
},
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"responses": {
@@ -8404,14 +8314,6 @@
"schema": {
"type": "string"
}
},
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"responses": {
@@ -8467,14 +8369,6 @@
"schema": {
"type": "string"
}
},
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"responses": {
@@ -8514,14 +8408,6 @@
"schema": {
"type": "string"
}
},
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"responses": {
@@ -8553,16 +8439,7 @@
"post": {
"operationId": "StorageExplorerController_batchUpload",
"summary": "Upload multiple files to storage",
"parameters": [
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"parameters": [],
"responses": {
"201": {
"description": "",
@@ -8592,16 +8469,7 @@
"post": {
"operationId": "StorageExplorerController_createFolder",
"summary": "Create a new folder in storage",
"parameters": [
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"parameters": [],
"responses": {
"201": {
"description": "",
@@ -8639,14 +8507,6 @@
"schema": {
"type": "string"
}
},
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"responses": {
@@ -8686,14 +8546,6 @@
"schema": {
"type": "string"
}
},
{
"name": "Authorization",
"required": true,
"in": "header",
"schema": {
"type": "string"
}
}
],
"responses": {
+1 -1
View File
@@ -502,7 +502,7 @@ export class AuthController {
const accessToken = req.cookies['ddf-auth'];
const refreshToken = req.cookies['ddf-refresh-auth'];
const userId = req.cookies['ddf-user-id'];
const resourceHost = req.headers["host"]
const resourceHost = req.headers["x-original-url"] as string || "" ;
const hasUserSession = Boolean(accessToken) && Boolean(userId);
this.logger.info('Has User Session: ' + hasUserSession);
@@ -6,7 +6,7 @@ export const STORAGE_EXPLORER_CONFIG = {
}
// Replace {customer_id} placeholder with actual customer ID
// For local: http://172.17.0.1:8000/api (no placeholder)
// For prod: https://storage-explorer-{customer_id}.stg.dadosfera.ai/api
// For prod: https://storage-explorer-{customer_id}.dadosfera.ai/api
return urlTemplate.replace('{customer}', customerName);
},
timeout: parseInt(process.env.STORAGE_EXPLORER_TIMEOUT || '30000', 10),
@@ -47,13 +47,13 @@ export class StorageExplorerController {
async validateTableName(
@Body() body: any,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'POST',
'/tables/validate-name',
user,
token,
body,
);
}
@@ -64,13 +64,13 @@ export class StorageExplorerController {
async createTable(
@Body() body: any,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'POST',
'/tables/',
user,
token,
body,
);
}
@@ -81,13 +81,13 @@ export class StorageExplorerController {
async listTables(
@Query('page') page: number,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'GET',
'/tables/',
user,
token,
undefined,
{ page },
);
@@ -99,13 +99,12 @@ export class StorageExplorerController {
async getTable(
@Param('tableId') tableId: string,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'GET',
`/tables/${tableId}`,
user,
token
);
}
@@ -116,13 +115,13 @@ export class StorageExplorerController {
@Param('tableId') tableId: string,
@Param('datasetId') datasetId: string,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'POST',
`/tables/${tableId}/datasets/${datasetId}`,
user,
token
);
}
@@ -132,13 +131,13 @@ export class StorageExplorerController {
async getTableDatasets(
@Param('tableId') tableId: string,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'GET',
`/tables/${tableId}/datasets`,
user,
token
);
}
@@ -148,13 +147,13 @@ export class StorageExplorerController {
async getTableSchema(
@Param('tableId') tableId: string,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'GET',
`/tables/${tableId}/schema`,
user,
token
);
}
@@ -165,13 +164,12 @@ export class StorageExplorerController {
@Param('tableId') tableId: string,
@Param('datasetId') datasetId: string,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'POST',
`/tables/${tableId}/validate-compatibility/${datasetId}`,
user,
token
);
}
@@ -186,13 +184,13 @@ export class StorageExplorerController {
@Param('datasetId') datasetId: string,
@Query('limit') limit: number,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'GET',
`/datasets/${datasetId}/preview`,
user,
token,
undefined,
{ limit },
);
@@ -205,13 +203,13 @@ export class StorageExplorerController {
@Param('datasetId') datasetId: string,
@Query('force_refresh') forceRefresh: boolean,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'GET',
`/datasets/${datasetId}/schema`,
user,
token,
undefined,
{ force_refresh: forceRefresh },
);
@@ -223,13 +221,13 @@ export class StorageExplorerController {
async listDatasetsByUpload(
@Param('uploadId') uploadId: string,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'GET',
`/datasets/upload/${uploadId}`,
user,
token
);
}
@@ -240,13 +238,13 @@ export class StorageExplorerController {
@Param('datasetId') datasetId: string,
@Body() body: any,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'PUT',
`/datasets/${datasetId}/refresh-schema`,
user,
token,
body,
);
}
@@ -263,13 +261,13 @@ export class StorageExplorerController {
@Query('limit') limit: number,
@Query('folder_path') folderPath: string,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'GET',
'/storage/uploads/history',
user,
token,
undefined,
{ page, limit, folder_path: folderPath },
);
@@ -281,13 +279,13 @@ export class StorageExplorerController {
async browseStorage(
@Query('path') path: string,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'GET',
'/storage/browse',
user,
token,
undefined,
{ path },
);
@@ -302,7 +300,7 @@ export class StorageExplorerController {
@UploadedFiles() files: Array<Express.Multer.File>,
@Body('folder_path') folderPath: string,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
// Create FormData to forward files to storage-explorer API
const formData = new FormData();
@@ -326,7 +324,7 @@ export class StorageExplorerController {
'POST',
'/storage/upload/batch',
user,
token,
formData,
);
}
@@ -337,13 +335,13 @@ export class StorageExplorerController {
async createFolder(
@Body() body: any,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'POST',
'/storage/folder/create',
user,
token,
body,
);
}
@@ -354,13 +352,13 @@ export class StorageExplorerController {
async downloadFile(
@Query('file_path') filePath: string,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'GET',
'/storage/download',
user,
token,
undefined,
{ file_path: filePath },
);
@@ -372,13 +370,12 @@ export class StorageExplorerController {
async getFileMetadata(
@Query('file_path') filePath: string,
@User() user: RequestUser,
@Headers('Authorization') token: string
) {
return this.storageExplorerService.proxy(
'GET',
'/storage/metadata',
user,
token,
undefined,
{ file_path: filePath },
);
@@ -19,7 +19,6 @@ export class StorageExplorerService {
method: string,
path: string,
user: RequestUser,
token: string,
body?: any,
query?: Record<string, any>
): Promise<any> {
@@ -42,7 +41,6 @@ export class StorageExplorerService {
}
const headers: Record<string, string> = {
'Authorization': token,
'content-type': 'application/json',
};
@@ -115,7 +113,7 @@ export class StorageExplorerService {
}
// Get customer-specific storage-explorer URL
const baseUrl = STORAGE_EXPLORER_CONFIG.getUrl(user.customer_id);
const baseUrl = STORAGE_EXPLORER_CONFIG.getUrl(user.customer_name);
const url = new URL(`${baseUrl}${path}`);
// Add query params