Fix merge conflicts

backend/src/models/integration.ts

@@ -1,77 +1,83 @@
 import { Schema, model, Types } from 'mongoose';
 import {
-	ENV_DEV,
-	ENV_TESTING,
-	ENV_STAGING,
-	ENV_PROD,
-	INTEGRATION_HEROKU,
-	INTEGRATION_VERCEL,
-	INTEGRATION_NETLIFY
+  ENV_DEV,
+  ENV_TESTING,
+  ENV_STAGING,
+  ENV_PROD,
+  INTEGRATION_HEROKU,
+  INTEGRATION_VERCEL,
+  INTEGRATION_NETLIFY,
+  INTEGRATION_GITHUB
 } from '../variables';
 
 export interface IIntegration {
-	_id: Types.ObjectId;
-	workspace: Types.ObjectId;
-	environment: 'dev' | 'test' | 'staging' | 'prod';
-	isActive: boolean;
-	app: string;
-	target: string;
-	context: string;
-	siteId: string;
-	integration: 'heroku' | 'vercel' | 'netlify';
-	integrationAuth: Types.ObjectId;
+  _id: Types.ObjectId;
+  workspace: Types.ObjectId;
+  environment: 'dev' | 'test' | 'staging' | 'prod';
+  isActive: boolean;
+  app: string;
+  target: string;
+  context: string;
+  siteId: string;
+  integration: 'heroku' | 'vercel' | 'netlify' | 'github';
+  integrationAuth: Types.ObjectId;
 }
 
 const integrationSchema = new Schema<IIntegration>(
-	{
-		workspace: {
-			type: Schema.Types.ObjectId,
-			ref: 'Workspace',
-			required: true
-		},
-		environment: {
-			type: String,
-			enum: [ENV_DEV, ENV_TESTING, ENV_STAGING, ENV_PROD],
-			required: true
-		},
-		isActive: {
-			type: Boolean,
-			required: true
-		},
-		app: { // name of app in provider
-			type: String,
-			default: null
-		},
-		target: { // vercel-specific target (environment)
-			type: String,
-			default: null
-		},
-		context: { // netlify-specific context (deploy)
-			type: String,
-			default: null
-		},
-		siteId: { // netlify-specific site (app) id
-			type: String,
-			default: null
-		},
-		integration: {
-			type: String,
-			enum: [
-				INTEGRATION_HEROKU, 
-				INTEGRATION_VERCEL, 
-				INTEGRATION_NETLIFY
-			],
-			required: true
-		},
-		integrationAuth: {
-			type: Schema.Types.ObjectId,
-			ref: 'IntegrationAuth',
-			required: true
-		}
-	},
-	{
-		timestamps: true
-	}
+  {
+    workspace: {
+      type: Schema.Types.ObjectId,
+      ref: 'Workspace',
+      required: true
+    },
+    environment: {
+      type: String,
+      enum: [ENV_DEV, ENV_TESTING, ENV_STAGING, ENV_PROD],
+      required: true
+    },
+    isActive: {
+      type: Boolean,
+      required: true
+    },
+    app: {
+      // name of app in provider
+      type: String,
+      default: null
+    },
+    target: {
+      // vercel-specific target (environment)
+      type: String,
+      default: null
+    },
+    context: {
+      // netlify-specific context (deploy)
+      type: String,
+      default: null
+    },
+    siteId: {
+      // netlify-specific site (app) id
+      type: String,
+      default: null
+    },
+    integration: {
+      type: String,
+      enum: [
+        INTEGRATION_HEROKU,
+        INTEGRATION_VERCEL,
+        INTEGRATION_NETLIFY,
+        INTEGRATION_GITHUB
+      ],
+      required: true
+    },
+    integrationAuth: {
+      type: Schema.Types.ObjectId,
+      ref: 'IntegrationAuth',
+      required: true
+    }
+  },
+  {
+    timestamps: true
+  }
 );
 
 const Integration = model<IIntegration>('Integration', integrationSchema);

backend/src/models/integrationAuth.ts

@@ -1,83 +1,87 @@
 import { Schema, model, Types } from 'mongoose';
-import { 
-	INTEGRATION_HEROKU, 
-	INTEGRATION_VERCEL,
-	INTEGRATION_NETLIFY 
+import {
+  INTEGRATION_HEROKU,
+  INTEGRATION_VERCEL,
+  INTEGRATION_NETLIFY,
+  INTEGRATION_GITHUB
 } from '../variables';
 
 export interface IIntegrationAuth {
-	_id: Types.ObjectId;
-	workspace: Types.ObjectId;
-	integration: 'heroku' | 'vercel' | 'netlify';
-	teamId: string;
-	accountId: string;
-	refreshCiphertext?: string;
-	refreshIV?: string;
-	refreshTag?: string;
-	accessCiphertext?: string;
-	accessIV?: string;
-	accessTag?: string;
-	accessExpiresAt?: Date;
+  _id: Types.ObjectId;
+  workspace: Types.ObjectId;
+  integration: 'heroku' | 'vercel' | 'netlify' | 'github';
+  teamId: string;
+  accountId: string;
+  refreshCiphertext?: string;
+  refreshIV?: string;
+  refreshTag?: string;
+  accessCiphertext?: string;
+  accessIV?: string;
+  accessTag?: string;
+  accessExpiresAt?: Date;
 }
 
 const integrationAuthSchema = new Schema<IIntegrationAuth>(
-	{
-		workspace: {
-			type: Schema.Types.ObjectId,
-			required: true
-		},
-		integration: {
-			type: String,
-			enum: [
-				INTEGRATION_HEROKU, 
-				INTEGRATION_VERCEL,
-				INTEGRATION_NETLIFY
-			],
-			required: true
-		},
-		teamId: { // vercel-specific integration param
-			type: String
-		},
-		accountId: { // netlify-specific integration param
-			type: String
-		},
-		refreshCiphertext: {
-			type: String,
-			select: false
-		},
-		refreshIV: {
-			type: String,
-			select: false
-		},
-		refreshTag: {
-			type: String,
-			select: false
-		},
-		accessCiphertext: {
-			type: String,
-			select: false
-		},
-		accessIV: {
-			type: String,
-			select: false
-		},
-		accessTag: {
-			type: String,
-			select: false
-		},
-		accessExpiresAt: {
-			type: Date,
-			select: false
-		}
-	},
-	{
-		timestamps: true
-	}
+  {
+    workspace: {
+      type: Schema.Types.ObjectId,
+      required: true
+    },
+    integration: {
+      type: String,
+      enum: [
+        INTEGRATION_HEROKU,
+        INTEGRATION_VERCEL,
+        INTEGRATION_NETLIFY,
+        INTEGRATION_GITHUB
+      ],
+      required: true
+    },
+    teamId: {
+      // vercel-specific integration param
+      type: String
+    },
+    accountId: {
+      // netlify-specific integration param
+      type: String
+    },
+    refreshCiphertext: {
+      type: String,
+      select: false
+    },
+    refreshIV: {
+      type: String,
+      select: false
+    },
+    refreshTag: {
+      type: String,
+      select: false
+    },
+    accessCiphertext: {
+      type: String,
+      select: false
+    },
+    accessIV: {
+      type: String,
+      select: false
+    },
+    accessTag: {
+      type: String,
+      select: false
+    },
+    accessExpiresAt: {
+      type: Date,
+      select: false
+    }
+  },
+  {
+    timestamps: true
+  }
 );
 
 const IntegrationAuth = model<IIntegrationAuth>(
-	'IntegrationAuth',
-	integrationAuthSchema
+  'IntegrationAuth',
+  integrationAuthSchema
 );
 
 export default IntegrationAuth;

backend/src/models/secret.ts

@@ -10,6 +10,7 @@ import {
 
 export interface ISecret {
 	_id: Types.ObjectId;
+	version: number;
 	workspace: Types.ObjectId;
 	type: string;
 	user: Types.ObjectId;
@@ -22,10 +23,18 @@ export interface ISecret {
 	secretValueIV: string;
 	secretValueTag: string;
 	secretValueHash: string;
+	secretCommentCiphertext?: string;
+	secretCommentIV?: string;
+	secretCommentTag?: string;
+	secretCommentHash?: string;
 }
 
 const secretSchema = new Schema<ISecret>(
 	{
+		version: {
+			type: Number,
+			required: true
+		},
 		workspace: {
 			type: Schema.Types.ObjectId,
 			ref: 'Workspace',
@@ -77,6 +86,22 @@ const secretSchema = new Schema<ISecret>(
 		secretValueHash: {
 			type: String,
 			required: true
+		},
+		secretCommentCiphertext: {
+			type: String,
+			required: false
+		},
+		secretCommentIV: {
+			type: String, // symmetric
+			required: false
+		},
+		secretCommentTag: {
+			type: String, // symmetric
+			required: false
+		},
+		secretCommentHash: {
+			type: String,
+			required: false
 		}
 	},
 	{