Merge branch 'develop' into feat/nx-cloud/setup

keyshade-xyz · Feb 5, 2024 · 83a82f6 · 83a82f6
2 parents fe0f08e + 6144aea
commit 83a82f6
Show file tree

Hide file tree

Showing 66 changed files with 4,346 additions and 1,685 deletions.
diff --git a/.auto-changelog.json b/.auto-changelog.json
diff --git a/.github/workflows/api.yaml b/.github/workflows/api.yaml
@@ -51,7 +51,55 @@ jobs:
           pnpm run test:api
 
       - name: E2E tests
+        env:
+          GITHUB_CLIENT_ID: dummy
+          GITHUB_CLIENT_SECRET: dummy
+          GITHUB_CALLBACK_URL: dummy
         run: |
           docker compose up -d
           pnpm run e2e:api
           docker compose down
+
+  build-api-alpha:
+    needs: validate
+    runs-on: ubuntu-latest
+    name: Build and push API docker image for alpha
+    if: ${{ startsWith(github.ref , 'refs/tags/') && contains(github.ref, 'alpha') }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build Docker image
+        run: docker build -t keyshade/keyshade-api:${{ github.ref_name }} keyshade/keyshade-api:alpha-latest -f ./apps/api/Dockerfile .
+
+      - name: Push Docker image
+        run: docker push keyshade/keyshade-api
+
+  build-api-release:
+    needs: validate
+    runs-on: ubuntu-latest
+    name: Build and push API docker image for release
+    if: ${{ startsWith(github.ref , 'refs/tags/') && !contains(github.ref, 'alpha') }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build Docker image
+        run: docker build -t keyshade/keyshade-api:${{ github.ref_name }} keyshade/keyshade-api:latest -f ./apps/api/Dockerfile .
+
+      - name: Push Docker image
+        run: docker push keyshade/keyshade-api
diff --git a/.github/workflows/auto-tag-pr.yml b/.github/workflows/auto-tag-pr.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,19 +1,27 @@
-name: Release Drafter
+name: Semantic Release
 
 on:
   push:
     branches:
-      - release
+      - main
       - alpha
 
 jobs:
-  update_release_draft:
+  release:
     runs-on: ubuntu-latest
     steps:
-      # Drafts your next Release notes as Pull Requests are merged into "main"
-      - uses: release-drafter/release-drafter@v5
+      - name: checkout
+        uses: actions/checkout@v3
         with:
-          config-name: release-drafter.yml
-          disable-autolabeler: false
+          persist-credentials: false
+      - name: node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20.x
+          registry-url: https://registry.npmjs.org
+      - name: install
+        run: npm install --no-save @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/changelog @semantic-release/git @semantic-release/github conventional-changelog-conventionalcommits
+      - name: release
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
+        run: npx semantic-release
diff --git a/.github/workflows/web.yaml b/.github/workflows/web.yaml
@@ -2,7 +2,7 @@ on:
   push:
     paths: ['apps/web/**', '.github/workflows/web.yaml']
     tags:
-      - 'v*.*.*'
+      - '*'
   pull_request:
     paths: ['apps/web/**']
 
@@ -51,15 +51,15 @@ jobs:
         run: |
           pnpm run test:web
 
-  build-alpha:
+  build-web-alpha:
     needs: validate
-    if: ${{ github.ref == 'refs/tags/v*.*.*-alpha' && github.event_name == 'push' }}
     runs-on: ubuntu-latest
-    name: Build and push docker image
+    name: Build and push Web docker image for alpha
+    if: ${{ startsWith(github.ref , 'refs/tags/') && contains(github.ref, 'alpha') }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Login to Docker Hub
         uses: docker/login-action@v1
@@ -68,20 +68,20 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build Docker image
-        run: docker build -t keyshade/keyshade-web:${{ github.ref_name }}-alpha -f ./apps/web/Dockerfile .
+        run: docker build -t keyshade/keyshade-web:${{ github.ref_name }} keyshade/keyshade-web:alpha-latest -f ./apps/web/Dockerfile .
 
       - name: Push Docker image
         run: docker push keyshade/keyshade-web
 
-  build-release:
+  build-web-release:
     needs: validate
-    if: ${{ github.ref == 'refs/tags/v*.*.*' && github.event_name == 'push' }}
     runs-on: ubuntu-latest
-    name: Build and push docker image
+    name: Build and push Web docker image for release
+    if: ${{ startsWith(github.ref , 'refs/tags/') && !contains(github.ref, 'alpha') }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Login to Docker Hub
         uses: docker/login-action@v1
@@ -90,17 +90,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build Docker image
-        run: docker build -t keyshade/keyshade-web:latest -t keyshade/keyshade-web:${{ github.ref_name }} -f ./apps/web/Dockerfile .
+        run: docker build -t keyshade/keyshade-web:${{ github.ref_name }} keyshade/keyshade-web:latest -f ./apps/web/Dockerfile .
 
       - name: Push Docker image
         run: docker push keyshade/keyshade-web
-
-  deploy:
-    needs: build-release
-    if: ${{ github.ref == 'refs/tags/v*.*.*' && github.event_name == 'push' }}
-    runs-on: ubuntu-latest
-    name: Deploy to Render
-
-    steps:
-      - name: deploy
-        run: curl ${{ secrets.RENDER_WEB_DEPLOY_HOOK }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,44 +1,123 @@
-## [Unreleased](https://github.com/keyshade-xyz/keyshade/compare/0.1.0-alpha...HEAD)
-
-### Team Contributions
-
-#### Patches
-
-- chore: remove unused import [`7f189dd`](https://github.com/keyshade-xyz/keyshade/commit/7f189ddc20718b74dd590b826816eced2795e31d)
-
-#### Miscellaneous
-
-- refactor: service functions as suggested [`c1ae78a`](https://github.com/keyshade-xyz/keyshade/commit/c1ae78abb38006cd22ef0c5ea359253e7e8ff6e4)
-- feat(oauth): get 'name' and 'avatar' of the user
-* this for github oauth [`20e8dbf`](https://github.com/keyshade-xyz/keyshade/commit/20e8dbf081aa8948f71fb7cf999125cb175f4bc2)
-
-## 0.1.0-alpha - 2024-01-28
-
-### Community Contributions
-
-#### Bug Fix
-
-- fix: issue auto assign cannot read properties of undefined assignees [`74`](https://github.com/keyshade-xyz/keyshade/pull/74)
-
-#### Patches
-
-- Update README.md [`93`](https://github.com/keyshade-xyz/keyshade/pull/93)
-- chore(eslint): Fix Lint Rules [`50`](https://github.com/keyshade-xyz/keyshade/pull/50)
-- chore: create a cron job function that will run every hour to clean up expired otps [`73`](https://github.com/keyshade-xyz/keyshade/pull/73)
-- Update README.md [`24`](https://github.com/keyshade-xyz/keyshade/pull/24)
-
-#### Documentation
-
-- docs: update license to MPL-2.0 [`7`](https://github.com/keyshade-xyz/keyshade/pull/7)
-
-#### Miscellaneous
-
-- build(cli): Add lint workflow for API [`44`](https://github.com/keyshade-xyz/keyshade/pull/44)
-
-### Team Contributions
-
-#### Patches
-
-- chore: fix changelog script [`78848a0`](https://github.com/keyshade-xyz/keyshade/commit/78848a02f6c0a2be93ca01e43332ac215814b7c4)
-- chore(release): 0.1.0-alpha [`867fb08`](https://github.com/keyshade-xyz/keyshade/commit/867fb08deed16196a83f08de225528fda7bd8d1c)
-- chore(release): 0.2.0-alpha [`de7726c`](https://github.com/keyshade-xyz/keyshade/commit/de7726c345d40661bc37c5128260aa491fc6a194)
+# 1.0.0-alpha.1 (2024-02-02)
+
+
+### bug
+
+* send email async ([728256d](https://github.com/keyshade-xyz/keyshade/commit/728256d0a4d2f45ba7b805affc408c03228c8c4f))
+
+### build
+
+* Add Lint Workflows for `cli` and `sdk-node` ([93ae134](https://github.com/keyshade-xyz/keyshade/commit/93ae134abf5e8113526cdd58f50fa270bb550454))
+* pnpm cache setup ([2db196f](https://github.com/keyshade-xyz/keyshade/commit/2db196f341ad559a35db5c17098e3fa3a91e5767))
+
+### chore
+
+* ad start:api script in package.json ([ee3bc19](https://github.com/keyshade-xyz/keyshade/commit/ee3bc19bcbe83a1840ae64d466065e95b0c827f4))
+* add `getAllUsers` test  ([0b51a02](https://github.com/keyshade-xyz/keyshade/commit/0b51a02c7799d010637dacb357fa6c5a478698b5))
+* add auto release and commit config ([0fe7d19](https://github.com/keyshade-xyz/keyshade/commit/0fe7d19614621deaec83904721ad97c49d691748))
+* add husky pre-commit check ([62bf77e](https://github.com/keyshade-xyz/keyshade/commit/62bf77ebe3c9941c722c126e2bda325b66275b30))
+* add pr auto tag workflow ([7a44137](https://github.com/keyshade-xyz/keyshade/commit/7a44137bc6dd9e7c64baf8c4dd468b2676d378e3))
+* add PR lint ([bb28cb7](https://github.com/keyshade-xyz/keyshade/commit/bb28cb7b2e6d1501c6525690a744068fc5c6e56c))
+* add prettier:fix in package.json and husky ([2451301](https://github.com/keyshade-xyz/keyshade/commit/2451301fe9bf0f32b354a7b3ffb548866cd6b265))
+* add release drafter config ([de36d9f](https://github.com/keyshade-xyz/keyshade/commit/de36d9f5f5de639be300115b7dd62826613d15a6))
+* add render hook in web to auto-deploy ([b0228d0](https://github.com/keyshade-xyz/keyshade/commit/b0228d021e524a8eaf1760f58b74b623ea6ef64a))
+* add semantic release ([af12daa](https://github.com/keyshade-xyz/keyshade/commit/af12daa7e8947d50bf346246412962738b2c9ee0))
+* add test workflow ([77c49de](https://github.com/keyshade-xyz/keyshade/commit/77c49def7fc0b9ec06ce2ccd0790b141fb0a4839))
+* add workflow for CI and deployment of web ([f49b7db](https://github.com/keyshade-xyz/keyshade/commit/f49b7db41458583a74a84f4433e2d685ab1855f9))
+* adding test command to pre commit ([09805a5](https://github.com/keyshade-xyz/keyshade/commit/09805a545639ce4d107dc067e7f50db1a8f4955b))
+* create a cron function that will run every hour to clean up expired otps ([5ffb54d](https://github.com/keyshade-xyz/keyshade/commit/5ffb54d7c8c584cccebcc71728ec84864a49332a))
+* fix changelog script ([0c8c0ef](https://github.com/keyshade-xyz/keyshade/commit/0c8c0efe7743d4f35c5b0301e8e5020b6bf86977))
+* fix changelog script ([78848a0](https://github.com/keyshade-xyz/keyshade/commit/78848a02f6c0a2be93ca01e43332ac215814b7c4))
+* remove / for consistancy ([0da0953](https://github.com/keyshade-xyz/keyshade/commit/0da0953fa0aa2c7295e1ed6652684c1395434631))
+* remove duplicate auth service ([f97adf0](https://github.com/keyshade-xyz/keyshade/commit/f97adf00ed0dc43bd41bd4af18ff5680ad3b4fc6))
+* remove SDK folders ([614c304](https://github.com/keyshade-xyz/keyshade/commit/614c304746388de8c5930ae16421ca6abcc04cba))
+* remove sdk-node workflow ([655ad27](https://github.com/keyshade-xyz/keyshade/commit/655ad27d049170f029bd031d06625eb5e53a09a0))
+* remove unused import ([7f189dd](https://github.com/keyshade-xyz/keyshade/commit/7f189ddc20718b74dd590b826816eced2795e31d))
+* remove unwanted package.json ([14cd7ad](https://github.com/keyshade-xyz/keyshade/commit/14cd7ad6d3145d8f04a1c5dd75f97422ca515bb3))
+* rename file ([0aba0f3](https://github.com/keyshade-xyz/keyshade/commit/0aba0f3bc05edd5da59028fa31d483d7b9e327d6))
+* replace script with makefile ([a92311e](https://github.com/keyshade-xyz/keyshade/commit/a92311e350089a0c1659185f601676bf78735b0e))
+* replace script with makefile ([62d582d](https://github.com/keyshade-xyz/keyshade/commit/62d582d8b6778198669913287f1588c4fb6114b9))
+* resolve comments ([f7562c4](https://github.com/keyshade-xyz/keyshade/commit/f7562c4d28570f3376d92e129a002d071b7d0e6f))
+* update contribution readme with step to auto assign issue ([6459622](https://github.com/keyshade-xyz/keyshade/commit/64596226810cf0e6785ece1d022acbce05f8ab5e))
+* Update web CI and add Dockerfile for web ([fc9571e](https://github.com/keyshade-xyz/keyshade/commit/fc9571e5b61b2810f571a17bb757c8f20f809e5b))
+
+### docs
+
+* Add CHANGELOG.md ([184220e](https://github.com/keyshade-xyz/keyshade/commit/184220e511016d8762fa587375b6a1fa3c651062))
+* add docs folder ([e252d68](https://github.com/keyshade-xyz/keyshade/commit/e252d688357c8bcb0cb4c7d360edca6f2957a945))
+* Add getting-started.md ([617c346](https://github.com/keyshade-xyz/keyshade/commit/617c3460f6debf6f08bddc38010dc62a7e13b59a))
+* update CHANGELOG.md ([b01b5ca](https://github.com/keyshade-xyz/keyshade/commit/b01b5ca6dc5ebce476cdbdfb341236b66484e7bc))
+* Update CONTRIBUTING.md ([7fc895d](https://github.com/keyshade-xyz/keyshade/commit/7fc895d39c128dacb16f184440722fab71f523cf))
+* update DB_URL in .env.example ([325880e](https://github.com/keyshade-xyz/keyshade/commit/325880e42f2ce43736a53a82c1bab0a9c83f4d64))
+* update PULL_REQUEST_TEMPLATE.md ([e091d40](https://github.com/keyshade-xyz/keyshade/commit/e091d40213fd238c74fbd3ec9f8282fb90c99ca2))
+* update README.md ([fb902e5](https://github.com/keyshade-xyz/keyshade/commit/fb902e5052e6707eae09af296aa93d8dbb6869f4))
+* update README.md ([d3d0d86](https://github.com/keyshade-xyz/keyshade/commit/d3d0d861b8d78348dc050d7c3b16f1bc32359e60))
+
+### feat
+
+* add api-keys module ([abb2863](https://github.com/keyshade-xyz/keyshade/commit/abb28632c069bd01e95fbcc8081a5d2eed786b8f))
+* add project module ([c96df17](https://github.com/keyshade-xyz/keyshade/commit/c96df17b94f96578903f3de68394458af8e8a9f2))
+* add project, environment module ([fd5c4d7](https://github.com/keyshade-xyz/keyshade/commit/fd5c4d744467395c0b360916ed85bd6cf88c698e))
+* Add RBAC ([b4cb14f](https://github.com/keyshade-xyz/keyshade/commit/b4cb14f7fbb29c1c53e562c654a4ab5495d69e9f))
+* add secret module ([cd79172](https://github.com/keyshade-xyz/keyshade/commit/cd79172ca33aa5c6c72b7859acdeaa2bb5b10970))
+* add swagger ([b15dbb0](https://github.com/keyshade-xyz/keyshade/commit/b15dbb05b3d2dae83d7250437dfa82077fd31ae4))
+* added the auto assign workflow yaml file ([eadca0c](https://github.com/keyshade-xyz/keyshade/commit/eadca0c0a2012344ef9030fade217e9cf57b7783))
+* added the auto assign workflow yaml file ([5e1d0f1](https://github.com/keyshade-xyz/keyshade/commit/5e1d0f153cda371a415c27e92ac558b770058b3e))
+* AutoCreate Admin On Startup (#101) ([32fac3e](https://github.com/keyshade-xyz/keyshade/commit/32fac3e669a6dd6353ed862a8cb367d184038968)), closes [#101](https://github.com/keyshade-xyz/keyshade/issues/101)
+* create user endpoint ([53913f5](https://github.com/keyshade-xyz/keyshade/commit/53913f545aee2a87571cd9798cd4979b8b47cb4d))
+* dockerize api ([ce8ee23](https://github.com/keyshade-xyz/keyshade/commit/ce8ee23769f0bbbf5b2517278f8d2ea1e58661c1))
+* dockerize api ([dfbc58e](https://github.com/keyshade-xyz/keyshade/commit/dfbc58eaaa15f0529d00e1441c0f56d46a9c8ce0))
+* dockerize api ([63f0a27](https://github.com/keyshade-xyz/keyshade/commit/63f0a2752885b39d13e596b35f70318f36004dc5))
+* dockerize api ([265cec0](https://github.com/keyshade-xyz/keyshade/commit/265cec0f58a9efa5001528ac7e9f4f71be20f190))
+* dockerize api ([ed595c7](https://github.com/keyshade-xyz/keyshade/commit/ed595c79e5739f6d15cd80a6f18d081587d55b34))
+* dockerize api ([6b756e8](https://github.com/keyshade-xyz/keyshade/commit/6b756e8c70388057823e3ef05ae72a059da84e9c))
+* finish environment module ([aaf6783](https://github.com/keyshade-xyz/keyshade/commit/aaf67834298bd6b4836686c4342dc75cce63d1cf))
+* husky configured ([77bba02](https://github.com/keyshade-xyz/keyshade/commit/77bba023c52c871b9a54499cdbc72b67c5438e4f))
+* invalidate older OTPs ([8ca222a](https://github.com/keyshade-xyz/keyshade/commit/8ca222aedd6e4532a498a8b70d837095cfd53a68))
+* landing page ([e1ec4d1](https://github.com/keyshade-xyz/keyshade/commit/e1ec4d171e184d381efb0768d9a3deadb92d5dba))
+* responsive landing ([97bbb0c](https://github.com/keyshade-xyz/keyshade/commit/97bbb0cb42c3b89fd1c9aede9e4d87a215aab7cf))
+
+### fix
+
+* fix syntax error in auto-assign.yaml ([e59d410](https://github.com/keyshade-xyz/keyshade/commit/e59d410f714d89daf53f7e99fd7b1ce30a67e059))
+* indendation errors ([8212d59](https://github.com/keyshade-xyz/keyshade/commit/8212d591df508605d011ce0ad7e4c14162351d16))
+* issue auto assign cannot read properties of undefined assignees ([0ecc749](https://github.com/keyshade-xyz/keyshade/commit/0ecc7494dade74d8ad59da25a73430564808f013))
+* Merge main and made a small fix ([89b0d71](https://github.com/keyshade-xyz/keyshade/commit/89b0d7181abb198404d37e5f8aabce51d7849e30))
+* nx run dev:api failing due to DI error ([81c63ca](https://github.com/keyshade-xyz/keyshade/commit/81c63ca8c89e0dba801167f0216bb4a8b0b79599))
+* remove hardcoded email from adminUserCreateEmail mail function ([b2b9a9e](https://github.com/keyshade-xyz/keyshade/commit/b2b9a9ed87ec999f4d428b819d44f3b129fe4c5d))
+* remove pnpm-lock as it is causing issues in pnpm install ([d3b54d8](https://github.com/keyshade-xyz/keyshade/commit/d3b54d85d9a2c576c3b5964a939538e2dcae33fb))
+* resolved merge conflict ([7ff7afb](https://github.com/keyshade-xyz/keyshade/commit/7ff7afbd97665bee359399d18f6b6560206fed87))
+* typo ([587f06b](https://github.com/keyshade-xyz/keyshade/commit/587f06b4f0497df22cc5a453c8db13fe0c53f2ef))
+* Update discord link in README.md ([c7e4b5a](https://github.com/keyshade-xyz/keyshade/commit/c7e4b5aac24e04a181a1ab21bad9417cf814c7e4))
+* update lockfile ([b6f6e80](https://github.com/keyshade-xyz/keyshade/commit/b6f6e80b66f8531e9bacce8876bfe3d9ec67fb75))
+* update pnpm scripts ([e73a877](https://github.com/keyshade-xyz/keyshade/commit/e73a87769d235f9c61e5f69d9e0ec73bb4f3eaad))
+* update web workflow ([add46dd](https://github.com/keyshade-xyz/keyshade/commit/add46ddd6fc01f4a9202e4b4adb52e847e18d39f))
+
+### Fix
+
+* Fix: ([77f8a84](https://github.com/keyshade-xyz/keyshade/commit/77f8a84354f2dfb5b813bb9f860d20cac59ed9f8))
+* made images not selectable and undraggable ([b8c200e](https://github.com/keyshade-xyz/keyshade/commit/b8c200e7ac33b201a552ca128f6de0938b316313))
+
+### GitBook
+
+* No commit message ([9cc83c9](https://github.com/keyshade-xyz/keyshade/commit/9cc83c95eaeebaf4a08a1b52164afd004e7da670))
+
+### patch
+
+* generate new migration ([00b516f](https://github.com/keyshade-xyz/keyshade/commit/00b516f658b7e3d5772cd690f2509b177ce73fca))
+* improved query of otp ([d9d9260](https://github.com/keyshade-xyz/keyshade/commit/d9d926038055bb2c69bdc05432a8fcd541bb46c3))
+* remove free tier data from migration ([44dc980](https://github.com/keyshade-xyz/keyshade/commit/44dc980610d4b8f47103f4d72d1af1397a15b510))
+* remove repository layer and add prisma to service ([54cc6d4](https://github.com/keyshade-xyz/keyshade/commit/54cc6d403f5151100cb79a8321f628d18229eb1b))
+* replace resend with nodemailer ([f0b0887](https://github.com/keyshade-xyz/keyshade/commit/f0b0887e494f44eeaf01e1ff0945eb2079641683))
+* send email async ([091e49b](https://github.com/keyshade-xyz/keyshade/commit/091e49b48cdd66e7d133e8290959989d8453187e))
+
+### refactor
+
+* move mock data folder inside common module ([832383e](https://github.com/keyshade-xyz/keyshade/commit/832383eabd24ddd47461fb42ebe705957c5483ca))
+* service functions as suggested ([c1ae78a](https://github.com/keyshade-xyz/keyshade/commit/c1ae78abb38006cd22ef0c5ea359253e7e8ff6e4))
+* user mock data change ([ea5c504](https://github.com/keyshade-xyz/keyshade/commit/ea5c504360c4cd0ad28bb5cc01fff66fccacc423))
+
+### test
+
+* add tests for user service ([beb1955](https://github.com/keyshade-xyz/keyshade/commit/beb1955cc2c26c27102ae774b7f288f2e47c8d91))
+* getAllUsers Controller ([cb84237](https://github.com/keyshade-xyz/keyshade/commit/cb84237fce9799d571c730877ee5406f97fb924e))