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

Resolve merge conflicts

Browse Source
This commit is contained in:
Tuan Dang
2023-06-21 11:44:07 +07:00
parent e6ad153e83 db019178b7
commit df662b1058
700 changed files with 9499 additions and 9346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/variables/action.ts
+6 -6
View File
@@ -1,6 +1,6 @@
export const ACTION_LOGIN = 'login';
export const ACTION_LOGOUT = 'logout';
export const ACTION_ADD_SECRETS = 'addSecrets';
export const ACTION_DELETE_SECRETS = 'deleteSecrets';
export const ACTION_UPDATE_SECRETS = 'updateSecrets';
export const ACTION_READ_SECRETS = 'readSecrets';
export const ACTION_LOGIN = "login";
export const ACTION_LOGOUT = "logout";
export const ACTION_ADD_SECRETS = "addSecrets";
export const ACTION_DELETE_SECRETS = "deleteSecrets";
export const ACTION_UPDATE_SECRETS = "updateSecrets";
export const ACTION_READ_SECRETS = "readSecrets";
backend/src/variables/authentication.ts
+4 -4
View File
@@ -1,4 +1,4 @@
export const AUTH_MODE_JWT = 'jwt';
export const AUTH_MODE_SERVICE_ACCOUNT = 'serviceAccount';
export const AUTH_MODE_SERVICE_TOKEN = 'serviceToken';
export const AUTH_MODE_API_KEY = 'apiKey'; // TODO: deprecate
export const AUTH_MODE_JWT = "jwt";
export const AUTH_MODE_SERVICE_ACCOUNT = "serviceAccount";
export const AUTH_MODE_SERVICE_TOKEN = "serviceToken";
export const AUTH_MODE_API_KEY = "apiKey"; // TODO: deprecate
backend/src/variables/crypto.ts
+4 -4
View File
@@ -1,7 +1,7 @@
export const ALGORITHM_AES_256_GCM = 'aes-256-gcm';
export const ALGORITHM_AES_256_GCM = "aes-256-gcm";
export const NONCE_BYTES_SIZE = 12;
export const BLOCK_SIZE_BYTES_16 = 16;
export const ENCODING_SCHEME_UTF8 = 'utf8';
export const ENCODING_SCHEME_HEX = 'hex';
export const ENCODING_SCHEME_BASE64 = 'base64';
export const ENCODING_SCHEME_UTF8 = "utf8";
export const ENCODING_SCHEME_HEX = "hex";
export const ENCODING_SCHEME_BASE64 = "base64";
backend/src/variables/environment.ts
+4 -4
View File
@@ -1,6 +1,6 @@
// environments
export const ENV_DEV = 'dev';
export const ENV_TESTING = 'test';
export const ENV_STAGING = 'staging';
export const ENV_PROD = 'prod';
export const ENV_DEV = "dev";
export const ENV_TESTING = "test";
export const ENV_STAGING = "staging";
export const ENV_PROD = "prod";
export const ENV_SET = new Set([ENV_DEV, ENV_TESTING, ENV_STAGING, ENV_PROD]);
backend/src/variables/event.ts
+2 -2
View File
@@ -1,2 +1,2 @@
export const EVENT_PUSH_SECRETS = 'pushSecrets';
export const EVENT_PULL_SECRETS = 'pullSecrets';
export const EVENT_PUSH_SECRETS = "pushSecrets";
export const EVENT_PULL_SECRETS = "pullSecrets";
backend/src/variables/index.ts
+13 -13
View File
@@ -1,13 +1,13 @@
export * from './action';
export * from './authentication';
export * from './crypto';
export * from './environment';
export * from './event';
export * from './integration';
export * from './organization';
export * from './permission';
export * from './secret';
export * from './smtp';
export * from './stripe';
export * from './token';
export * from './user';
export * from "./action";
export * from "./authentication";
export * from "./crypto";
export * from "./environment";
export * from "./event";
export * from "./integration";
export * from "./organization";
export * from "./permission";
export * from "./secret";
export * from "./smtp";
export * from "./stripe";
export * from "./token";
export * from "./user";
backend/src/variables/integration.ts
+104 -104
View File
@@ -1,16 +1,16 @@
import {
getClientIdHeroku,
getClientSlugVercel,
getClientIdNetlify,
getClientIdAzure,
getClientIdGitHub,
getClientIdGitLab,
getClientIdGitHub
} from '../config';
getClientIdHeroku,
getClientIdNetlify,
getClientSlugVercel,
} from "../config";
// integrations
export const INTEGRATION_AZURE_KEY_VAULT = 'azure-key-vault';
export const INTEGRATION_AWS_PARAMETER_STORE = 'aws-parameter-store';
export const INTEGRATION_AWS_SECRET_MANAGER = 'aws-secret-manager';
export const INTEGRATION_AZURE_KEY_VAULT = "azure-key-vault";
export const INTEGRATION_AWS_PARAMETER_STORE = "aws-parameter-store";
export const INTEGRATION_AWS_SECRET_MANAGER = "aws-secret-manager";
export const INTEGRATION_HEROKU = "heroku";
export const INTEGRATION_VERCEL = "vercel";
export const INTEGRATION_NETLIFY = "netlify";
@@ -46,8 +46,8 @@ export const INTEGRATION_SET = new Set([
export const INTEGRATION_OAUTH2 = "oauth2";
// integration oauth endpoints
export const INTEGRATION_AZURE_TOKEN_URL = `https://login.microsoftonline.com/common/oauth2/v2.0/token`;
export const INTEGRATION_HEROKU_TOKEN_URL = 'https://id.heroku.com/oauth/token';
export const INTEGRATION_AZURE_TOKEN_URL = "https://login.microsoftonline.com/common/oauth2/v2.0/token";
export const INTEGRATION_HEROKU_TOKEN_URL = "https://id.heroku.com/oauth/token";
export const INTEGRATION_VERCEL_TOKEN_URL =
"https://api.vercel.com/v2/oauth/access_token";
export const INTEGRATION_NETLIFY_TOKEN_URL = "https://api.netlify.com/oauth/token";
@@ -72,154 +72,154 @@ export const INTEGRATION_CLOUDFLARE_PAGES_API_URL = 'https://api.cloudflare.com'
export const getIntegrationOptions = async () => {
const INTEGRATION_OPTIONS = [
{
name: 'Heroku',
slug: 'heroku',
image: 'Heroku.png',
name: "Heroku",
slug: "heroku",
image: "Heroku.png",
isAvailable: true,
type: 'oauth',
type: "oauth",
clientId: await getClientIdHeroku(),
docsLink: ''
docsLink: "",
},
{
name: 'Vercel',
slug: 'vercel',
image: 'Vercel.png',
name: "Vercel",
slug: "vercel",
image: "Vercel.png",
isAvailable: true,
type: 'oauth',
clientId: '',
type: "oauth",
clientId: "",
clientSlug: await getClientSlugVercel(),
docsLink: ''
docsLink: "",
},
{
name: 'Netlify',
slug: 'netlify',
image: 'Netlify.png',
name: "Netlify",
slug: "netlify",
image: "Netlify.png",
isAvailable: true,
type: 'oauth',
type: "oauth",
clientId: await getClientIdNetlify(),
docsLink: ''
docsLink: "",
},
{
name: 'GitHub',
slug: 'github',
image: 'GitHub.png',
name: "GitHub",
slug: "github",
image: "GitHub.png",
isAvailable: true,
type: 'oauth',
type: "oauth",
clientId: await getClientIdGitHub(),
docsLink: ''
docsLink: "",
},
{
name: 'Render',
slug: 'render',
image: 'Render.png',
name: "Render",
slug: "render",
image: "Render.png",
isAvailable: true,
type: 'pat',
clientId: '',
docsLink: ''
type: "pat",
clientId: "",
docsLink: "",
},
{
name: 'Railway',
slug: 'railway',
image: 'Railway.png',
name: "Railway",
slug: "railway",
image: "Railway.png",
isAvailable: true,
type: 'pat',
clientId: '',
docsLink: ''
type: "pat",
clientId: "",
docsLink: "",
},
{
name: 'Fly.io',
slug: 'flyio',
image: 'Flyio.svg',
name: "Fly.io",
slug: "flyio",
image: "Flyio.svg",
isAvailable: true,
type: 'pat',
clientId: '',
docsLink: ''
type: "pat",
clientId: "",
docsLink: "",
},
{
name: 'AWS Parameter Store',
slug: 'aws-parameter-store',
image: 'Amazon Web Services.png',
name: "AWS Parameter Store",
slug: "aws-parameter-store",
image: "Amazon Web Services.png",
isAvailable: true,
type: 'custom',
clientId: '',
docsLink: ''
type: "custom",
clientId: "",
docsLink: "",
},
{
name: 'AWS Secret Manager',
slug: 'aws-secret-manager',
image: 'Amazon Web Services.png',
name: "AWS Secret Manager",
slug: "aws-secret-manager",
image: "Amazon Web Services.png",
isAvailable: true,
type: 'custom',
clientId: '',
docsLink: ''
type: "custom",
clientId: "",
docsLink: "",
},
{
name: 'Azure Key Vault',
slug: 'azure-key-vault',
image: 'Microsoft Azure.png',
name: "Azure Key Vault",
slug: "azure-key-vault",
image: "Microsoft Azure.png",
isAvailable: true,
type: 'oauth',
type: "oauth",
clientId: await getClientIdAzure(),
docsLink: ''
docsLink: "",
},
{
name: 'Circle CI',
slug: 'circleci',
image: 'Circle CI.png',
name: "Circle CI",
slug: "circleci",
image: "Circle CI.png",
isAvailable: true,
type: 'pat',
clientId: '',
docsLink: ''
type: "pat",
clientId: "",
docsLink: "",
},
{
name: 'GitLab',
slug: 'gitlab',
image: 'GitLab.png',
name: "GitLab",
slug: "gitlab",
image: "GitLab.png",
isAvailable: true,
type: 'custom',
type: "custom",
clientId: await getClientIdGitLab(),
docsLink: ''
docsLink: "",
},
{
name: 'Travis CI',
slug: 'travisci',
image: 'Travis CI.png',
name: "Travis CI",
slug: "travisci",
image: "Travis CI.png",
isAvailable: true,
type: 'pat',
clientId: '',
docsLink: ''
type: "pat",
clientId: "",
docsLink: "",
},
{
name: 'Supabase',
slug: 'supabase',
image: 'Supabase.png',
name: "Supabase",
slug: "supabase",
image: "Supabase.png",
isAvailable: true,
type: 'pat',
clientId: '',
docsLink: ''
type: "pat",
clientId: "",
docsLink: "",
},
{
name: 'Checkly',
slug: 'checkly',
image: 'Checkly.png',
name: "Checkly",
slug: "checkly",
image: "Checkly.png",
isAvailable: true,
type: 'pat',
clientId: '',
docsLink: ''
type: "pat",
clientId: "",
docsLink: "",
},
{
name: 'HashiCorp Vault',
slug: 'hashicorp-vault',
image: 'Vault.png',
name: "HashiCorp Vault",
slug: "hashicorp-vault",
image: "Vault.png",
isAvailable: true,
type: 'pat',
clientId: '',
docsLink: ''
type: "pat",
clientId: "",
docsLink: "",
},
{
name: 'Google Cloud Platform',
slug: 'gcp',
image: 'Google Cloud Platform.png',
name: "Google Cloud Platform",
slug: "gcp",
image: "Google Cloud Platform.png",
isAvailable: false,
type: '',
clientId: '',
backend/src/variables/permission.ts
+2 -2
View File
@@ -1,2 +1,2 @@
export const PERMISSION_READ_SECRETS = 'read';
export const PERMISSION_WRITE_SECRETS = 'write';
export const PERMISSION_READ_SECRETS = "read";
export const PERMISSION_WRITE_SECRETS = "write";
backend/src/variables/secret.ts
+2 -2
View File
@@ -1,3 +1,3 @@
// secrets
export const SECRET_SHARED = 'shared';
export const SECRET_PERSONAL = 'personal';
export const SECRET_SHARED = "shared";
export const SECRET_PERSONAL = "personal";
backend/src/variables/smtp.ts
+5 -5
View File
@@ -1,5 +1,5 @@
export const SMTP_HOST_SENDGRID = 'smtp.sendgrid.net';
export const SMTP_HOST_MAILGUN = 'smtp.mailgun.org';
export const SMTP_HOST_SOCKETLABS = 'smtp.socketlabs.com';
export const SMTP_HOST_ZOHOMAIL = 'smtp.zoho.com';
export const SMTP_HOST_GMAIL = 'smtp.gmail.com';
export const SMTP_HOST_SENDGRID = "smtp.sendgrid.net";
export const SMTP_HOST_MAILGUN = "smtp.mailgun.org";
export const SMTP_HOST_SOCKETLABS = "smtp.socketlabs.com";
export const SMTP_HOST_ZOHOMAIL = "smtp.zoho.com";
export const SMTP_HOST_GMAIL = "smtp.gmail.com";
backend/src/variables/stripe.ts
+2 -2
View File
@@ -1,2 +1,2 @@
export const PLAN_STARTER = 'starter';
export const PLAN_PRO = 'pro';
export const PLAN_STARTER = "starter";
export const PLAN_PRO = "pro";
backend/src/variables/token.ts
+4 -4
View File
@@ -1,4 +1,4 @@
export const TOKEN_EMAIL_CONFIRMATION = 'emailConfirmation';
export const TOKEN_EMAIL_MFA = 'emailMfa';
export const TOKEN_EMAIL_ORG_INVITATION = 'organizationInvitation';
export const TOKEN_EMAIL_PASSWORD_RESET = 'passwordReset';
export const TOKEN_EMAIL_CONFIRMATION = "emailConfirmation";
export const TOKEN_EMAIL_MFA = "emailMfa";
export const TOKEN_EMAIL_ORG_INVITATION = "organizationInvitation";
export const TOKEN_EMAIL_PASSWORD_RESET = "passwordReset";
backend/src/variables/user.ts
+1 -1
View File
@@ -1 +1 @@
export const MFA_METHOD_EMAIL = 'email';
export const MFA_METHOD_EMAIL = "email";