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

feat: Add approval support #158

Merged
merged 8 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
11 changes: 6 additions & 5 deletions apps/api/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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']
}
}
2 changes: 2 additions & 0 deletions apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion apps/api/src/api-key/api-key.e2e.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
4 changes: 3 additions & 1 deletion apps/api/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand All @@ -36,7 +37,8 @@ import { VariableModule } from '../variable/variable.module'
WorkspaceModule,
WorkspaceRoleModule,
EventModule,
VariableModule
VariableModule,
ApprovalModule
],
providers: [
{
Expand Down
Loading
Loading