awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-14 13:22:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: fixed server cfg stale in replication

Browse Source
This commit is contained in:
Akhil Mohan
2024-02-07 11:36:13 +05:30
parent 609b224ca9
commit 61ff732ec0
8 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/server/boot-strap-check.ts
+2 -2
View File
@@ -12,9 +12,9 @@ type BootstrapOpt = {
db: Knex;
};
const bootstrapCb = () => {
const bootstrapCb = async () => {
const appCfg = getConfig();
const serverCfg = getServerCfg();
const serverCfg = await getServerCfg();
if (!serverCfg.initialized) {
console.info(`Welcome to Infisical
backend/src/server/routes/index.ts
+2 -2
View File
@@ -513,9 +513,9 @@ export const registerRoutes = async (
})
}
},
handler: () => {
handler: async () => {
const cfg = getConfig();
const serverCfg = getServerCfg();
const serverCfg = await getServerCfg();
return {
date: new Date(),
message: "Ok" as const,
backend/src/server/routes/v1/admin-router.ts
+3 -3
View File
@@ -20,8 +20,8 @@ export const registerAdminRouter = async (server: FastifyZodProvider) => {
})
}
},
handler: () => {
const config = getServerCfg();
handler: async () => {
const config = await getServerCfg();
return { config };
}
});
@@ -78,7 +78,7 @@ export const registerAdminRouter = async (server: FastifyZodProvider) => {
},
handler: async (req, res) => {
const appCfg = getConfig();
const serverCfg = getServerCfg();
const serverCfg = await getServerCfg();
if (serverCfg.initialized)
throw new UnauthorizedError({ name: "Admin sign up", message: "Admin has been created" });
const { user, token } = await server.services.superAdmin.adminSignUp({
backend/src/server/routes/v1/sso-router.ts
+3 -3
View File
@@ -42,7 +42,7 @@ export const registerSsoRouter = async (server: FastifyZodProvider) => {
async (req, _accessToken, _refreshToken, profile, cb) => {
try {
const email = profile?.emails?.[0]?.value;
const serverCfg = getServerCfg();
const serverCfg = await getServerCfg();
if (!email)
throw new BadRequestError({
message: "Email not found",
@@ -84,7 +84,7 @@ export const registerSsoRouter = async (server: FastifyZodProvider) => {
try {
const ghEmails = await fetchGithubEmails(accessToken);
const { email } = ghEmails.filter((gitHubEmail) => gitHubEmail.primary)[0];
const serverCfg = getServerCfg();
const serverCfg = await getServerCfg();
const { isUserCompleted, providerAuthToken } = await server.services.login.oauth2Login({
email,
firstName: profile.displayName,
@@ -120,7 +120,7 @@ export const registerSsoRouter = async (server: FastifyZodProvider) => {
async (req: any, _accessToken: string, _refreshToken: string, profile: any, cb: any) => {
try {
const email = profile.emails[0].value;
const serverCfg = getServerCfg();
const serverCfg = await getServerCfg();
const { isUserCompleted, providerAuthToken } = await server.services.login.oauth2Login({
email,
firstName: profile.displayName,