mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-21 11:28:43 +00:00
feat(infisical-pg: linted after import order fix
This commit is contained in:
Vendored
+2
-2
@@ -1,3 +1,5 @@
|
||||
import "fastify";
|
||||
|
||||
import { TUsers } from "@app/db/schemas";
|
||||
import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service";
|
||||
import { TApiKeyServiceFactory } from "@app/services/api-key/api-key-service";
|
||||
@@ -13,8 +15,6 @@ import { TAuthTokenServiceFactory } from "@app/services/token/token-service";
|
||||
import { TUserDalFactory } from "@app/services/user/user-dal";
|
||||
import { TUserServiceFactory } from "@app/services/user/user-service";
|
||||
|
||||
import "fastify";
|
||||
|
||||
declare module "fastify" {
|
||||
interface FastifyRequest {
|
||||
realIp: string;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
// eslint-disable-next-line
|
||||
import "ts-node/register";
|
||||
|
||||
import dotenv from "dotenv";
|
||||
import type { Knex } from "knex";
|
||||
import path from "path";
|
||||
|
||||
// eslint-disable-next-line
|
||||
import "ts-node/register";
|
||||
|
||||
// Update with your config settings.
|
||||
dotenv.config({
|
||||
path: path.join(__dirname, "../../.env"),
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import picomatch from "picomatch";
|
||||
|
||||
import {
|
||||
AbilityBuilder,
|
||||
buildMongoQueryMatcher,
|
||||
@@ -7,6 +5,7 @@ import {
|
||||
MongoAbility
|
||||
} from "@casl/ability";
|
||||
import { FieldCondition, FieldInstruction, JsInterpreter } from "@ucast/mongo2js";
|
||||
import picomatch from "picomatch";
|
||||
|
||||
const $glob: FieldInstruction<string> = {
|
||||
type: "field",
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
import { createMongoAbility, MongoAbility, RawRuleOf } from "@casl/ability";
|
||||
import { unpackRules } from "@casl/ability/extra";
|
||||
|
||||
import { ProjectMembershipRole } from "@app/db/schemas";
|
||||
import { BadRequestError, UnauthorizedError } from "@app/lib/errors";
|
||||
import { ActorType } from "@app/services/auth/auth-type";
|
||||
@@ -15,9 +18,6 @@ import {
|
||||
projectNoAccessPermissions,
|
||||
projectViewerPermission} from "./project-permission";
|
||||
|
||||
import { createMongoAbility, MongoAbility, RawRuleOf } from "@casl/ability";
|
||||
import { unpackRules } from "@casl/ability/extra";
|
||||
|
||||
type TPermissionServiceFactoryDep = {
|
||||
permissionDal: TPermissionDalFactory;
|
||||
};
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import picomatch from "picomatch";
|
||||
|
||||
import {
|
||||
AbilityBuilder,
|
||||
buildMongoQueryMatcher,
|
||||
@@ -7,6 +5,7 @@ import {
|
||||
ForcedSubject,
|
||||
MongoAbility} from "@casl/ability";
|
||||
import { FieldCondition, FieldInstruction, JsInterpreter } from "@ucast/mongo2js";
|
||||
import picomatch from "picomatch";
|
||||
|
||||
const $glob: FieldInstruction<string> = {
|
||||
type: "field",
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import dotenv from "dotenv";
|
||||
|
||||
import { initDbConnection } from "./db";
|
||||
import { formatSmtpConfig, initEnvConfig } from "./lib/config/env";
|
||||
import { initLogger } from "./lib/logger";
|
||||
import { main } from "./server/app";
|
||||
import { smtpServiceFactory } from "./services/smtp/smtp-service";
|
||||
import { initDbConnection } from "./db";
|
||||
|
||||
dotenv.config();
|
||||
const run = async () => {
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
import fasitfy from "fastify";
|
||||
import { Knex } from "knex";
|
||||
import { Logger } from "pino";
|
||||
import type { FastifyCookieOptions } from "@fastify/cookie";
|
||||
import cookie from "@fastify/cookie";
|
||||
import type { FastifyCorsOptions } from "@fastify/cors";
|
||||
@@ -8,6 +5,9 @@ import cors from "@fastify/cors";
|
||||
import helmet from "@fastify/helmet";
|
||||
import type { FastifyRateLimitOptions } from "@fastify/rate-limit";
|
||||
import ratelimiter from "@fastify/rate-limit";
|
||||
import fasitfy from "fastify";
|
||||
import { Knex } from "knex";
|
||||
import { Logger } from "pino";
|
||||
|
||||
import { TSmtpService } from "@app/services/smtp/smtp-service";
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import fp from "fastify-plugin";
|
||||
import swagger from "@fastify/swagger";
|
||||
import swaggerUI from "@fastify/swagger-ui";
|
||||
import fp from "fastify-plugin";
|
||||
|
||||
import { jsonSchemaTransform } from "./fastify-zod";
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { Authenticator } from "@fastify/passport";
|
||||
import fastifySession from "@fastify/session";
|
||||
import { Strategy as GitHubStrategy } from "passport-github";
|
||||
import { Strategy as GitLabStrategy } from "passport-gitlab2";
|
||||
import { Strategy as GoogleStrategy } from "passport-google-oauth20";
|
||||
import { z } from "zod";
|
||||
import { Authenticator } from "@fastify/passport";
|
||||
import fastifySession from "@fastify/session";
|
||||
|
||||
import { getConfig } from "@app/lib/config/env";
|
||||
import { BadRequestError } from "@app/lib/errors";
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import crypto from "node:crypto";
|
||||
|
||||
import bcrypt from "bcrypt";
|
||||
|
||||
import { TApiKeys } from "@app/db/schemas/api-keys";
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import crypto from "node:crypto";
|
||||
|
||||
import bcrypt from "bcrypt";
|
||||
|
||||
import { TAuthTokens, TAuthTokenSessions } from "@app/db/schemas";
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
import { ForbiddenError } from "@casl/ability";
|
||||
import { packRules } from "@casl/ability/extra";
|
||||
|
||||
import { TOrgRolesInsert, TOrgRolesUpdate } from "@app/db/schemas";
|
||||
import {
|
||||
orgAdminPermissions,
|
||||
@@ -10,9 +13,6 @@ import { BadRequestError } from "@app/lib/errors";
|
||||
|
||||
import { TOrgRoleDalFactory } from "./org-role-dal";
|
||||
|
||||
import { ForbiddenError } from "@casl/ability";
|
||||
import { packRules } from "@casl/ability/extra";
|
||||
|
||||
type TOrgRoleServiceFactoryDep = {
|
||||
orgRoleDal: TOrgRoleDalFactory;
|
||||
permissionService: TPermissionServiceFactory;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { ForbiddenError } from "@casl/ability";
|
||||
import jwt from "jsonwebtoken";
|
||||
|
||||
import { OrgMembershipRole, OrgMembershipStatus } from "@app/db/schemas";
|
||||
@@ -25,8 +26,6 @@ import {
|
||||
TVerifyUserToOrgDTO
|
||||
} from "./org-types";
|
||||
|
||||
import { ForbiddenError } from "@casl/ability";
|
||||
|
||||
type TOrgServiceFactoryDep = {
|
||||
orgDal: TOrgDalFactory;
|
||||
orgRoleDal: TOrgRoleDalFactory;
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { ForbiddenError } from "@casl/ability";
|
||||
|
||||
import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service";
|
||||
import {
|
||||
ProjectPermissionActions,
|
||||
@@ -8,8 +10,6 @@ import { BadRequestError } from "@app/lib/errors";
|
||||
import { TProjectEnvDalFactory } from "./project-env-dal";
|
||||
import { TCreateEnvDTO, TDeleteEnvDTO, TUpdateEnvDTO } from "./project-env-types";
|
||||
|
||||
import { ForbiddenError } from "@casl/ability";
|
||||
|
||||
type TProjectEnvServiceFactoryDep = {
|
||||
projectEnvDal: TProjectEnvDalFactory;
|
||||
permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { ForbiddenError } from "@casl/ability";
|
||||
|
||||
import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service";
|
||||
import {
|
||||
ProjectPermissionActions,
|
||||
@@ -9,8 +11,6 @@ import { TProjectMembershipDalFactory } from "../project-membership/project-memb
|
||||
import { TProjectKeyDalFactory } from "./project-key-dal";
|
||||
import { TGetLatestProjectKeyDTO, TUploadProjectKeyDTO } from "./project-key-types";
|
||||
|
||||
import { ForbiddenError } from "@casl/ability";
|
||||
|
||||
type TProjectKeyServiceFactoryDep = {
|
||||
permissionService: TPermissionServiceFactory;
|
||||
projectKeyDal: TProjectKeyDalFactory;
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { ForbiddenError } from "@casl/ability";
|
||||
|
||||
import { OrgMembershipStatus, ProjectMembershipRole } from "@app/db/schemas";
|
||||
import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service";
|
||||
import {
|
||||
@@ -21,8 +23,6 @@ import {
|
||||
TUpdateProjectMembershipDTO
|
||||
} from "./project-membership-types";
|
||||
|
||||
import { ForbiddenError } from "@casl/ability";
|
||||
|
||||
type TProjectMembershipServiceFactoryDep = {
|
||||
permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
|
||||
smtpService: TSmtpService;
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
import { ForbiddenError } from "@casl/ability";
|
||||
import { packRules } from "@casl/ability/extra";
|
||||
|
||||
import { ProjectMembershipRole, TOrgRolesUpdate, TProjectRolesInsert } from "@app/db/schemas";
|
||||
import {
|
||||
OrgPermissionActions,
|
||||
@@ -15,9 +18,6 @@ import { BadRequestError } from "@app/lib/errors";
|
||||
import { ActorType } from "../auth/auth-type";
|
||||
import { TProjectRoleDalFactory } from "./project-role-dal";
|
||||
|
||||
import { ForbiddenError } from "@casl/ability";
|
||||
import { packRules } from "@casl/ability/extra";
|
||||
|
||||
type TProjectRoleServiceFactoryDep = {
|
||||
projectRoleDal: TProjectRoleDalFactory;
|
||||
permissionService: Pick<
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { ForbiddenError } from "@casl/ability";
|
||||
|
||||
import { ProjectMembershipRole } from "@app/db/schemas";
|
||||
import {
|
||||
OrgPermissionActions,
|
||||
@@ -14,8 +16,6 @@ import { TProjectMembershipDalFactory } from "../project-membership/project-memb
|
||||
import { TProjectDalFactory } from "./project-dal";
|
||||
import { TCreateProjectDTO, TDeleteProjectDTO, TGetProjectDTO } from "./project-types";
|
||||
|
||||
import { ForbiddenError } from "@casl/ability";
|
||||
|
||||
const DEFAULT_PROJECT_ENVS = [
|
||||
{ name: "Development", slug: "dev" },
|
||||
{ name: "Staging", slug: "staging" },
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import fs from "node:fs/promises";
|
||||
import path from "node:path";
|
||||
|
||||
import handlebars from "handlebars";
|
||||
import { createTransport } from "nodemailer";
|
||||
import SMTPTransport from "nodemailer/lib/smtp-transport";
|
||||
|
||||
Reference in New Issue
Block a user