BreizhHardware/Jellystat
1
0
Fork 0
mirror of https://github.com/BreizhHardware/Jellystat.git synced 2026-01-18 16:27:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #250 from halkeye/allow-tables-roles

Browse Source 
Allow overriding owner of tables during migrations
This commit is contained in:
Thegan Govender
2024-09-25 08:23:49 +02:00
committed by GitHub
parent 1081cf60bd 1d64ba0b59
commit 33cdc00045
28 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
backend/migrations.js
View File

@@ -1,3 +1,6 @@
process.env.POSTGRES_USER = process.env.POSTGRES_USER ?? "postgres";
process.env.POSTGRES_ROLE =
process.env.POSTGRES_ROLE ?? process.env.POSTGRES_USER;
module.exports = {
development: {
@@ -55,4 +58,4 @@ module.exports = {
}
}
};

2
backend/migrations/001_app_config_table.js
View File

@@ -10,7 +10,7 @@ exports.up = async function(knex) {
table.text('APP_USER');
table.text('APP_PASSWORD');
});
await knex.raw(`ALTER TABLE app_config OWNER TO "${process.env.POSTGRES_USER}";`);
await knex.raw(`ALTER TABLE app_config OWNER TO "${process.env.POSTGRES_ROLE}";`);
}
}catch (error) {
console.error(error);

2
backend/migrations/002_jf_activity_watchdog_table.js
View File

@@ -20,7 +20,7 @@ exports.up = async function(knex) {
table.timestamp('ActivityDateInserted').defaultTo(knex.fn.now());
table.text('PlayMethod');
});
await knex.raw(`ALTER TABLE jf_activity_watchdog OWNER TO "${process.env.POSTGRES_USER}";`);
await knex.raw(`ALTER TABLE jf_activity_watchdog OWNER TO "${process.env.POSTGRES_ROLE}";`);
}
} catch (error) {
console.error(error);

4
backend/migrations/003_jf_libraries_table.js
View File

@@ -11,7 +11,7 @@ exports.up = async function(knex) {
table.text('CollectionType').notNullable();
table.text('ImageTagsPrimary');
});
await knex.raw(`ALTER TABLE jf_libraries OWNER TO "${process.env.POSTGRES_USER}";`);
await knex.raw(`ALTER TABLE jf_libraries OWNER TO "${process.env.POSTGRES_ROLE}";`);
}
} catch (error) {
console.error(error);
@@ -25,4 +25,4 @@ exports.up = async function(knex) {
console.error(error);
}
};

2
backend/migrations/004_jf_library_items_table.js
View File

@@ -22,7 +22,7 @@ exports.up = async function(knex) {
table.text('ParentId').notNullable().references('Id').inTable('jf_libraries').onDelete('SET NULL').onUpdate('NO ACTION');
table.text('PrimaryImageHash');
});
await knex.raw(`ALTER TABLE IF EXISTS jf_library_items OWNER TO "${process.env.POSTGRES_USER}";`);
await knex.raw(`ALTER TABLE IF EXISTS jf_library_items OWNER TO "${process.env.POSTGRES_ROLE}";`);
}
} catch (error) {

2
backend/migrations/005_jf_library_seasons_table.js
View File

@@ -16,7 +16,7 @@ exports.up = async function(knex) {
table.text('SeriesPrimaryImageTag');
});
await knex.raw(`ALTER TABLE IF EXISTS jf_library_seasons OWNER TO "${process.env.POSTGRES_USER}";`);
await knex.raw(`ALTER TABLE IF EXISTS jf_library_seasons OWNER TO "${process.env.POSTGRES_ROLE}";`);
}
} catch (error) {
console.error(error);

2
backend/migrations/006_jf_library_episodes_table.js
View File

@@ -24,7 +24,7 @@ exports.up = async function(knex) {
table.text('SeriesName');
});
await knex.raw(`ALTER TABLE IF EXISTS jf_library_episodes OWNER TO "${process.env.POSTGRES_USER}";`);
await knex.raw(`ALTER TABLE IF EXISTS jf_library_episodes OWNER TO "${process.env.POSTGRES_ROLE}";`);
}
} catch (error) {
console.error(error);

2
backend/migrations/007_jf_playback_activity_table.js
View File

@@ -21,7 +21,7 @@ exports.up = async function(knex) {
table.text('PlayMethod');
});
await knex.raw(`ALTER TABLE IF EXISTS jf_playback_activity OWNER TO "${process.env.POSTGRES_USER}";`);
await knex.raw(`ALTER TABLE IF EXISTS jf_playback_activity OWNER TO "${process.env.POSTGRES_ROLE}";`);
}
} catch (error) {
console.error(error);

4
backend/migrations/008_js_users_table.js
View File

@@ -11,7 +11,7 @@
table.boolean('IsAdministrator');
});
await knex.raw(`ALTER TABLE IF EXISTS jf_users OWNER TO "${process.env.POSTGRES_USER}";`);;
await knex.raw(`ALTER TABLE IF EXISTS jf_users OWNER TO "${process.env.POSTGRES_ROLE}";`);;
}
} catch (error) {
console.error(error);
@@ -26,4 +26,4 @@
}
};

2
backend/migrations/009_jf_all_user_activity_view.js
View File

@@ -59,4 +59,4 @@ exports.up = async function(knex) {
exports.down = async function(knex) {
await knex.raw(`DROP VIEW jf_all_user_activity;`);
};

4
backend/migrations/013_fs_last_user_activity_function.js
View File

@@ -44,7 +44,7 @@ exports.up = function(knex) {
$BODY$;
ALTER FUNCTION fs_last_user_activity(text)
OWNER TO "${process.env.POSTGRES_USER}";
OWNER TO "${process.env.POSTGRES_ROLE}";
`).catch(function(error) {
console.error(error);
});
@@ -55,4 +55,4 @@ exports.up = function(knex) {
DROP FUNCTION IF EXISTS fs_last_user_activity(text);
`);
};

4
backend/migrations/014_fs_library_stats_function.js
View File

@@ -28,7 +28,7 @@ exports.up = async function(knex) {
$BODY$;
ALTER FUNCTION fs_library_stats(integer, text)
OWNER TO "${process.env.POSTGRES_USER}";
OWNER TO "${process.env.POSTGRES_ROLE}";
`).catch(function(error) {
console.error(error);
});
@@ -39,4 +39,4 @@ exports.up = async function(knex) {
DROP FUNCTION IF EXISTS fs_library_stats(integer, text);
`);
};

4
backend/migrations/015_fs_most_active_user_function.js
View File

@@ -20,7 +20,7 @@ exports.up = function(knex) {
END;
$BODY$;
ALTER FUNCTION fs_most_active_user(integer)
OWNER TO "${process.env.POSTGRES_USER}";
OWNER TO "${process.env.POSTGRES_ROLE}";
`).catch(function(error) {
console.error(error);
});
@@ -29,4 +29,4 @@ exports.up = function(knex) {
exports.down = function(knex) {
return knex.raw('DROP FUNCTION IF EXISTS fs_most_active_user(integer)');
};

4
backend/migrations/016_fs_most_played_items_function.js
View File

@@ -47,7 +47,7 @@ exports.up = async function(knex) {
$BODY$;
ALTER FUNCTION fs_most_played_items(integer, text)
OWNER TO "${process.env.POSTGRES_USER}";
OWNER TO "${process.env.POSTGRES_ROLE}";
`).catch(function(error) {
console.error(error);
});
@@ -56,4 +56,4 @@ exports.up = async function(knex) {
exports.down = async function(knex) {
await knex.raw('DROP FUNCTION IF EXISTS fs_most_played_items(integer, text)');
};

4
backend/migrations/017_fs_most_popular_items_function.js
View File

@@ -53,7 +53,7 @@ exports.up = async function(knex) {
END;
$BODY$;
ALTER FUNCTION fs_most_popular_items(integer, text)
OWNER TO "${process.env.POSTGRES_USER}";
OWNER TO "${process.env.POSTGRES_ROLE}";
`).catch(function(error) {
console.error(error);
});
@@ -62,4 +62,4 @@ exports.up = async function(knex) {
exports.down = async function(knex) {
await knex.raw(`DROP FUNCTION fs_most_popular_items(integer, text);`);
};

4
backend/migrations/018_fs_most_used_clients_function.js
View File

@@ -22,7 +22,7 @@ exports.up = async function(knex) {
$BODY$;
ALTER FUNCTION fs_most_used_clients(integer)
OWNER TO "${process.env.POSTGRES_USER}";
OWNER TO "${process.env.POSTGRES_ROLE}";
`).catch(function(error) {
console.error(error);
});
@@ -31,4 +31,4 @@ exports.up = async function(knex) {
exports.down = async function(knex) {
await knex.raw(`DROP FUNCTION fs_most_used_clients(integer);`);
};

4
backend/migrations/019_fs_most_viewed_libraries_function.js
View File

@@ -51,7 +51,7 @@ exports.up = function(knex) {
$BODY$;
ALTER FUNCTION fs_most_viewed_libraries(integer)
OWNER TO "${process.env.POSTGRES_USER}";
OWNER TO "${process.env.POSTGRES_ROLE}";
`).catch(function(error) {
console.error(error);
});
@@ -62,4 +62,4 @@ exports.up = function(knex) {
DROP FUNCTION IF EXISTS fs_most_viewed_libraries(integer);
`);
};

2
backend/migrations/020_fs_user_stats_function.js
View File

@@ -32,7 +32,7 @@ exports.up = async function(knex) {
$BODY$;
ALTER FUNCTION fs_user_stats(integer, text)
OWNER TO "${process.env.POSTGRES_USER}";
OWNER TO "${process.env.POSTGRES_ROLE}";
`).catch(function(error) {
console.error(error);
});

2
backend/migrations/021_fs_watch_stats_over_time_functions.js
View File

@@ -48,7 +48,7 @@ exports.up = async function (knex) {
$BODY$;
ALTER FUNCTION fs_watch_stats_over_time(integer)
OWNER TO "${process.env.POSTGRES_USER}";
OWNER TO "${process.env.POSTGRES_ROLE}";
`).catch(function(error) {
console.error(error);
});

2
backend/migrations/022_fs_watch_stats_popular_days_of_week_function.js
View File

@@ -56,7 +56,7 @@ exports.up =async function(knex) {
END;
$BODY$;
ALTER FUNCTION fs_watch_stats_popular_days_of_week(integer)
OWNER TO "${process.env.POSTGRES_USER}";
OWNER TO "${process.env.POSTGRES_ROLE}";
`).catch(function(error) {
console.error(error);
});

2
backend/migrations/023_fs_watch_stats_popular_hour_of_day_function,js.js
View File

@@ -42,7 +42,7 @@ exports.up =async function(knex) {
END;
$BODY$;
ALTER FUNCTION fs_watch_stats_popular_hour_of_day(integer)
OWNER TO "${process.env.POSTGRES_USER}";
OWNER TO "${process.env.POSTGRES_ROLE}";
`).catch(function(error) {
console.error(error);
});

2
backend/migrations/024_jf_item_info_table.js
View File

@@ -12,7 +12,7 @@ exports.up = async function(knex) {
table.text('Type');
});
await knex.raw(`ALTER TABLE IF EXISTS jf_item_info OWNER TO "${process.env.POSTGRES_USER}";`);
await knex.raw(`ALTER TABLE IF EXISTS jf_item_info OWNER TO "${process.env.POSTGRES_ROLE}";`);
}
} catch (error) {
console.error(error);

4
backend/migrations/026_fs_last_user_activity_function.js
View File

@@ -37,7 +37,7 @@ exports.up = function(knex) {
$BODY$;
ALTER FUNCTION fs_last_user_activity(text)
OWNER TO "${process.env.POSTGRES_USER}";
OWNER TO "${process.env.POSTGRES_ROLE}";
`).catch(function(error) {
console.error(error);
});
@@ -90,7 +90,7 @@ exports.up = function(knex) {
$BODY$;
ALTER FUNCTION fs_last_user_activity(text)
OWNER TO "${process.env.POSTGRES_USER}";
OWNER TO "${process.env.POSTGRES_ROLE}";
`);
};

2
backend/migrations/028_jf_playback_reporting_plugin_data_table.js
View File

@@ -15,7 +15,7 @@ exports.up = async function(knex) {
table.bigInteger('PlayDuration');
});
await knex.raw(`ALTER TABLE IF EXISTS jf_playback_reporting_plugin_data OWNER TO "${process.env.POSTGRES_USER}";`);
await knex.raw(`ALTER TABLE IF EXISTS jf_playback_reporting_plugin_data OWNER TO "${process.env.POSTGRES_ROLE}";`);
}
} catch (error) {
console.error(error);

2
backend/migrations/030_jf_logging_table.js
View File

@@ -12,7 +12,7 @@ exports.up = async function(knex) {
table.json('Log');
table.text('Result');
});
await knex.raw(`ALTER TABLE jf_logging OWNER TO "${process.env.POSTGRES_USER}";`);
await knex.raw(`ALTER TABLE jf_logging OWNER TO "${process.env.POSTGRES_ROLE}";`);
}
} catch (error) {
console.error(error);

4
backend/migrations/065_ji_insert_playback_plugin_data_to_activity_table_fixes.js
View File

@@ -54,7 +54,7 @@ exports.up = async function (knex) {
$BODY$;
ALTER PROCEDURE public.ji_insert_playback_plugin_data_to_activity_table()
OWNER TO "${process.env.POSTGRES_USER ?? postgres}";`);
OWNER TO "${process.env.POSTGRES_ROLE}";`);
} catch (error) {
console.error(error);
}
@@ -114,7 +114,7 @@ exports.down = async function (knex) {
$BODY$;
ALTER PROCEDURE public.ji_insert_playback_plugin_data_to_activity_table()
OWNER TO "${process.env.POSTGRES_USER ?? postgres}";`);
OWNER TO "${process.env.POSTGRES_ROLE}";`);
} catch (error) {
console.error(error);
}

4
backend/migrations/068_ji_insert_playback_plugin_data_to_activity_table_fixes_2.js
View File

@@ -55,7 +55,7 @@ exports.up = async function (knex) {
$BODY$;
ALTER PROCEDURE public.ji_insert_playback_plugin_data_to_activity_table()
OWNER TO "${process.env.POSTGRES_USER ?? postgres}";
OWNER TO "${process.env.POSTGRES_ROLE}";
`);
} catch (error) {
console.error(error);
@@ -118,7 +118,7 @@ exports.down = async function (knex) {
$BODY$;
ALTER PROCEDURE public.ji_insert_playback_plugin_data_to_activity_table()
OWNER TO "${process.env.POSTGRES_USER ?? postgres}";`);
OWNER TO "${process.env.POSTGRES_ROLE}";`);
} catch (error) {
console.error(error);
}

8
backend/server.js
View File

@@ -34,6 +34,10 @@ const tasks = require("./tasks/tasks");
const { setupWebSocketServer } = require("./ws");
const writeEnvVariables = require("./classes/env");
process.env.POSTGRES_USER = process.env.POSTGRES_USER ?? "postgres";
process.env.POSTGRES_ROLE =
process.env.POSTGRES_ROLE ?? process.env.POSTGRES_USER;
const app = express();
const db = knex(knexConfig.development);
@@ -202,7 +206,9 @@ async function authenticate(req, res, next) {
}
} else {
if (apiKey) {
const keysjson = await dbInstance.query('SELECT api_keys FROM app_config where "ID"=1').then((res) => res.rows[0].api_keys);
const keysjson = await dbInstance
.query('SELECT api_keys FROM app_config where "ID"=1')
.then((res) => res.rows[0].api_keys);
if (!keysjson || Object.keys(keysjson).length === 0) {
return res.status(404).json({ message: "No API keys configured" });