feat: Add approval support (#158)

keyshade-xyz · Mar 7, 2024 · 4abf251 · 4abf251
1 parent 6134bb2
commit 4abf251
Show file tree

Hide file tree

Showing 60 changed files with 6,030 additions and 1,723 deletions.
diff --git a/.env.example b/.env.example
@@ -5,6 +5,10 @@ GITHUB_CLIENT_ID=
 GITHUB_CLIENT_SECRET= 
 GITHUB_CALLBACK_URL=
 
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
+GOOGLE_CALLBACK_URL=
+
 SENTRY_DSN=
 SENTRY_ORG=
 SENTRY_PROJECT=

diff --git a/README.md b/README.md
@@ -109,3 +109,9 @@ We maintain an in-detailed documentation about how to get started with keyshade.
 ## Contributing
 
 We welcome contributions from everyone. Please read our [contributing guide](./CONTRIBUTING.md) to get started.
+
+## Contributors
+<a href="https://github.com/keyshade-xyz/keyshade/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=keyshade-xyz/keyshade&max=400&columns=20" />
+  <img src="https://us-central1-tooljet-hub.cloudfunctions.net/github" width="0" height="0" />
+</a>
diff --git a/apps/api/.eslintrc.js b/apps/api/.eslintrc.js
@@ -3,23 +3,24 @@ module.exports = {
   parserOptions: {
     project: 'tsconfig.json',
     tsconfigRootDir: __dirname,
-    sourceType: 'module',
+    sourceType: 'module'
   },
   plugins: ['@typescript-eslint/eslint-plugin'],
   extends: [
     'plugin:@typescript-eslint/recommended',
-    'plugin:prettier/recommended',
+    'plugin:prettier/recommended'
   ],
   root: true,
   env: {
     node: true,
-    jest: true,
+    jest: true
   },
   ignorePatterns: ['.eslintrc.js'],
   rules: {
     '@typescript-eslint/interface-name-prefix': 'off',
     '@typescript-eslint/explicit-function-return-type': 'off',
     '@typescript-eslint/explicit-module-boundary-types': 'off',
     '@typescript-eslint/no-explicit-any': 'off',
-  },
-};
+    '@typescript-eslint/no-unused-vars': ['warn']
+  }
+}
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -24,13 +24,15 @@
     "@nestjs/swagger": "^7.3.0",
     "@prisma/client": "^5.10.1",
     "@supabase/supabase-js": "^2.39.6",
+    "@types/uuid": "^9.0.8",
     "chalk": "^4.1.2",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "eccrypto": "^1.1.6",
     "moment": "^2.30.1",
     "nodemailer": "^6.9.9",
     "passport-github2": "^0.1.12",
+    "passport-google-oauth20": "^2.0.0",
     "prisma": "^5.10.1",
     "reflect-metadata": "^0.2.0",
     "rxjs": "^7.8.1",

diff --git a/apps/api/src/api-key/api-key.e2e.spec.ts b/apps/api/src/api-key/api-key.e2e.spec.ts
@@ -138,7 +138,6 @@ describe('Api Key Role Controller Tests', () => {
       url: `/api-key/${apiKey.id}`,
       payload: {
         name: 'Updated Test Key',
-        expiresAfter: '24',
         authorities: ['READ_API_KEY', 'CREATE_ENVIRONMENT']
       },
       headers: {

diff --git a/apps/api/src/app/app.module.ts b/apps/api/src/app/app.module.ts
@@ -17,6 +17,7 @@ import { WorkspaceRoleModule } from '../workspace-role/workspace-role.module'
 import { ApiKeyGuard } from '../auth/guard/api-key/api-key.guard'
 import { EventModule } from '../event/event.module'
 import { VariableModule } from '../variable/variable.module'
+import { ApprovalModule } from '../approval/approval.module'
 
 @Module({
   controllers: [AppController],
@@ -36,7 +37,8 @@ import { VariableModule } from '../variable/variable.module'
     WorkspaceModule,
     WorkspaceRoleModule,
     EventModule,
-    VariableModule
+    VariableModule,
+    ApprovalModule
   ],
   providers: [
     {