Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ability to move secrets from main page #2938

Draft
wants to merge 49 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
1103f72
feat: added type check, lint and prettier
akhilmhdh Dec 12, 2024
42a293a
feat: added tailwindcss with prettier tailwind support
akhilmhdh Dec 12, 2024
905181f
feat: added tanstack router
akhilmhdh Dec 12, 2024
72d1ed9
feat: added all old dependencies
akhilmhdh Dec 12, 2024
44ef26d
feat: added ui components
akhilmhdh Dec 13, 2024
142a4ef
feat: first login page base completed
akhilmhdh Dec 14, 2024
66ea245
feat: base for signup pages completed
akhilmhdh Dec 14, 2024
3b7cb16
feat: added signup routes and moved server config to router context
akhilmhdh Dec 15, 2024
43cabc0
feat: modified backend token endpoint to return organizationid
akhilmhdh Dec 15, 2024
3a87cbc
feat: added organization layout base with subscription and user loading
akhilmhdh Dec 15, 2024
07e402d
feat: resolved eslint issues and seperated org layout to make it simple
akhilmhdh Dec 15, 2024
1e7831e
feat: completed signup and personal settings ui
akhilmhdh Dec 15, 2024
438ce0f
feat: added virtual route to mount the layout without wrapping again
akhilmhdh Dec 16, 2024
88a0b19
feat: added hoc, resolved dropdown type issue
akhilmhdh Dec 16, 2024
c23dba0
feat: resolved breaking dev
akhilmhdh Dec 16, 2024
0375bf2
feat: resolved a lot of ts issues, planning to migrate to v5 tanstack…
akhilmhdh Dec 17, 2024
22dfb27
feat: upgrade react-query to v5 and changed hooks to staletime inf fo…
akhilmhdh Dec 17, 2024
3bfc09f
feat: completed project layout base
akhilmhdh Dec 18, 2024
ac34efc
feat: removed $organizationId from the routes
akhilmhdh Dec 18, 2024
911cafd
feat: secret manager routes migration completed
akhilmhdh Dec 20, 2024
413403f
feat: changed to virtual route for auth and personal settings
akhilmhdh Dec 24, 2024
ae68241
feat: completed switch to virtual for org pages
akhilmhdh Dec 24, 2024
089e6e6
feat: changed to virtual route for secret-manager
akhilmhdh Dec 25, 2024
37ee57a
feat: removed routes and added kms, cert to pages setup
akhilmhdh Dec 25, 2024
97493c4
feat: added org route
akhilmhdh Dec 27, 2024
7be9973
feat: added secret-manager routes
akhilmhdh Dec 27, 2024
8ebfbfb
feat: completed cert routes
akhilmhdh Dec 27, 2024
14a4a3d
feat: added kms routes
akhilmhdh Dec 27, 2024
ac52551
feat: resolved almost all ts issues
akhilmhdh Dec 27, 2024
8105772
feat: resolved all ts issues
akhilmhdh Dec 28, 2024
b81f554
feat: resolving issues on loader
akhilmhdh Dec 28, 2024
ed64ba2
feat: resolved ico header, failing translation and lottie icon issues
akhilmhdh Dec 28, 2024
b229560
feat: added static images and fixing minor layout issues
akhilmhdh Dec 29, 2024
b7893c6
feat: re-arranged route paths
akhilmhdh Dec 29, 2024
0795390
feat: completed migration of app connection
akhilmhdh Dec 29, 2024
38ef1ef
feat: completed migration of ssh product
akhilmhdh Dec 29, 2024
b9dd75c
feat: switched to official lottie react and adjusted all the existing…
akhilmhdh Dec 30, 2024
ba8f036
fix: resolved infinite rendering issue caused by zustand
akhilmhdh Dec 30, 2024
77a4fae
feat: bug fixes in overview page and dashboard page
akhilmhdh Jan 1, 2025
f3bbdda
feat: completed secret manager integration list and detail page
akhilmhdh Jan 1, 2025
18862ed
feat: completed migration of all integrations pages
akhilmhdh Jan 3, 2025
eb5c8f9
feat: testing all todo comments and cli
akhilmhdh Jan 3, 2025
d659b4b
feat: added csp and minor changes
akhilmhdh Jan 3, 2025
636e284
feat: added error page and not found page handler
akhilmhdh Jan 4, 2025
83f4d81
feat: renamed old frontend and fixed some minor bugs
akhilmhdh Jan 4, 2025
2a47c53
feat: updated backend to support bare react as standalone
akhilmhdh Jan 4, 2025
beb7b6c
feat: updated docker
akhilmhdh Jan 4, 2025
f21c0c9
feat: resolved typo in integration redirects
akhilmhdh Jan 4, 2025
12df81a
refactor: move 'handleSecretsMove' to hook > 'useHandleSecretsMove'
dBianchii Jan 5, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 3 additions & 10 deletions Dockerfile.fips.standalone-infisical
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM node:20-slim AS base
FROM base AS frontend-dependencies
WORKDIR /app

COPY frontend/package.json frontend/package-lock.json frontend/next.config.js ./
COPY frontend/package.json frontend/package-lock.json ./

# Install dependencies
RUN npm ci --only-production --ignore-scripts
Expand All @@ -23,7 +23,6 @@ COPY --from=frontend-dependencies /app/node_modules ./node_modules
COPY /frontend .

ENV NODE_ENV production
ENV NEXT_PUBLIC_ENV production
ARG POSTHOG_HOST
ENV NEXT_PUBLIC_POSTHOG_HOST $POSTHOG_HOST
ARG POSTHOG_API_KEY
Expand All @@ -44,20 +43,14 @@ WORKDIR /app

RUN groupadd -r -g 1001 nodejs && useradd -r -u 1001 -g nodejs non-root-user

RUN mkdir -p /app/.next/cache/images && chown non-root-user:nodejs /app/.next/cache/images
VOLUME /app/.next/cache/images

COPY --chown=non-root-user:nodejs --chmod=555 frontend/scripts ./scripts
COPY --from=frontend-builder /app/public ./public
RUN chown non-root-user:nodejs ./public/data
COPY --from=frontend-builder --chown=non-root-user:nodejs /app/dist ./

COPY --from=frontend-builder --chown=non-root-user:nodejs /app/.next/standalone ./
COPY --from=frontend-builder --chown=non-root-user:nodejs /app/.next/static ./.next/static

USER non-root-user

ENV NEXT_TELEMETRY_DISABLED 1

##
## BACKEND
##
Expand Down Expand Up @@ -192,4 +185,4 @@ EXPOSE 443

USER non-root-user

CMD ["./standalone-entrypoint.sh"]
CMD ["./standalone-entrypoint.sh"]
16 changes: 3 additions & 13 deletions Dockerfile.standalone-infisical
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN apk add --no-cache libc6-compat

WORKDIR /app

COPY frontend/package.json frontend/package-lock.json frontend/next.config.js ./
COPY frontend/package.json frontend/package-lock.json ./

# Install dependencies
RUN npm ci --only-production --ignore-scripts
Expand All @@ -27,7 +27,6 @@ COPY --from=frontend-dependencies /app/node_modules ./node_modules
COPY /frontend .

ENV NODE_ENV production
ENV NEXT_PUBLIC_ENV production
ARG POSTHOG_HOST
ENV NEXT_PUBLIC_POSTHOG_HOST $POSTHOG_HOST
ARG POSTHOG_API_KEY
Expand All @@ -49,20 +48,11 @@ WORKDIR /app
RUN addgroup --system --gid 1001 nodejs
RUN adduser --system --uid 1001 non-root-user

RUN mkdir -p /app/.next/cache/images && chown non-root-user:nodejs /app/.next/cache/images
VOLUME /app/.next/cache/images

COPY --chown=non-root-user:nodejs --chmod=555 frontend/scripts ./scripts
COPY --from=frontend-builder /app/public ./public
RUN chown non-root-user:nodejs ./public/data

COPY --from=frontend-builder --chown=non-root-user:nodejs /app/.next/standalone ./
COPY --from=frontend-builder --chown=non-root-user:nodejs /app/.next/static ./.next/static
COPY --from=frontend-builder --chown=non-root-user:nodejs /app/dist ./

USER non-root-user

ENV NEXT_TELEMETRY_DISABLED 1

##
## BACKEND
##
Expand Down Expand Up @@ -189,4 +179,4 @@ EXPOSE 443

USER non-root-user

CMD ["./standalone-entrypoint.sh"]
CMD ["./standalone-entrypoint.sh"]
128 changes: 110 additions & 18 deletions backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
"@fastify/rate-limit": "^9.0.0",
"@fastify/request-context": "^5.1.0",
"@fastify/session": "^10.7.0",
"@fastify/static": "^7.0.4",
"@fastify/swagger": "^8.14.0",
"@fastify/swagger-ui": "^2.1.0",
"@google-cloud/kms": "^4.5.0",
Expand Down
7 changes: 3 additions & 4 deletions backend/src/server/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import { globalRateLimiterCfg } from "./config/rateLimiter";
import { addErrorsToResponseSchemas } from "./plugins/add-errors-to-response-schemas";
import { apiMetrics } from "./plugins/api-metrics";
import { fastifyErrHandler } from "./plugins/error-handler";
import { registerExternalNextjs } from "./plugins/external-nextjs";
import { serializerCompiler, validatorCompiler, ZodTypeProvider } from "./plugins/fastify-zod";
import { fastifyIp } from "./plugins/ip";
import { maintenanceMode } from "./plugins/maintenanceMode";
import { registerServeUI } from "./plugins/serve-ui";
import { fastifySwagger } from "./plugins/swagger";
import { registerRoutes } from "./routes";

Expand Down Expand Up @@ -121,10 +121,9 @@ export const main = async ({ db, hsmModule, auditLogDb, smtp, logger, queue, key
await server.register(registerRoutes, { smtp, queue, db, auditLogDb, keyStore, hsmModule });

if (appCfg.isProductionMode) {
await server.register(registerExternalNextjs, {
await server.register(registerServeUI, {
standaloneMode: appCfg.STANDALONE_MODE || IS_PACKAGED,
dir: path.join(__dirname, IS_PACKAGED ? "../../../" : "../../"),
port: appCfg.PORT
dir: path.join(__dirname, IS_PACKAGED ? "../../../" : "../../")
});
}

Expand Down
Loading