fix: backend/package.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-MYSQL2-6670046

.github/workflows/build-patroni-docker-img.yml

@@ -1,38 +0,0 @@
-name: Build patroni 
-on: [workflow_dispatch]
-
-jobs:
-  patroni-image:
-    name: Build patroni
-    runs-on: ubuntu-latest
-    steps:
-      - name: ☁️ Checkout source
-        uses: actions/checkout@v3
-        with:
-          repository: 'zalando/patroni'
-      - name: Save commit hashes for tag
-        id: commit
-        uses: pr-mpt/actions-commit-hash@v2
-      - name: 🔧 Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: 🐋 Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Set up Depot CLI
-        uses: depot/setup-action@v1
-      - name: 🏗️ Build backend and push to docker hub
-        uses: depot/build-push-action@v1
-        with:
-          project: 64mmf0n610
-          token: ${{ secrets.DEPOT_PROJECT_TOKEN }}
-          push: true
-          context: .
-          file: Dockerfile
-          tags: |
-            infisical/patroni:${{ steps.commit.outputs.short }}
-            infisical/patroni:latest
-          platforms: linux/amd64,linux/arm64
-    
-  

.github/workflows/release_build_infisical_cli.yml

@@ -1,72 +1,60 @@
 name: Build and release CLI
 
 on:
-    workflow_dispatch:
-
-    push:
-        # run only against tags
-        tags:
-            - "infisical-cli/v*.*.*"
+  push:
+    # run only against tags
+    tags:
+      - "infisical-cli/v*.*.*"
 
 permissions:
-    contents: write
-    # packages: write
-    # issues: write
-jobs:
-    cli-integration-tests:
-        name: Run tests before deployment
-        uses: ./.github/workflows/run-cli-tests.yml
-        secrets:
-            CLI_TESTS_UA_CLIENT_ID: ${{ secrets.CLI_TESTS_UA_CLIENT_ID }}
-            CLI_TESTS_UA_CLIENT_SECRET: ${{ secrets.CLI_TESTS_UA_CLIENT_SECRET }}
-            CLI_TESTS_SERVICE_TOKEN: ${{ secrets.CLI_TESTS_SERVICE_TOKEN }}
-            CLI_TESTS_PROJECT_ID: ${{ secrets.CLI_TESTS_PROJECT_ID }}
-            CLI_TESTS_ENV_SLUG: ${{ secrets.CLI_TESTS_ENV_SLUG }}
+  contents: write
+  # packages: write
+  # issues: write
 
-    goreleaser:
-        runs-on: ubuntu-20.04
-        needs: [cli-integration-tests]
-        steps:
-            - uses: actions/checkout@v3
-              with:
-                  fetch-depth: 0
-            - name: 🐋 Login to Docker Hub
-              uses: docker/login-action@v2
-              with:
-                  username: ${{ secrets.DOCKERHUB_USERNAME }}
-                  password: ${{ secrets.DOCKERHUB_TOKEN }}
-            - name: 🔧 Set up Docker Buildx
-              uses: docker/setup-buildx-action@v2
-            - run: git fetch --force --tags
-            - run: echo "Ref name ${{github.ref_name}}"
-            - uses: actions/setup-go@v3
-              with:
-                  go-version: ">=1.19.3"
-                  cache: true
-                  cache-dependency-path: cli/go.sum
-            - name: libssl1.1 => libssl1.0-dev for OSXCross
-              run: |
-                  echo 'deb http://security.ubuntu.com/ubuntu bionic-security main' | sudo tee -a /etc/apt/sources.list
-                  sudo apt update && apt-cache policy libssl1.0-dev
-                  sudo apt-get install libssl1.0-dev
-            - name: OSXCross for CGO Support
-              run: |
-                  mkdir ../../osxcross
-                  git clone https://github.com/plentico/osxcross-target.git ../../osxcross/target
-            - uses: goreleaser/goreleaser-action@v4
-              with:
-                  distribution: goreleaser-pro
-                  version: latest
-                  args: release --clean
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }}
-                  POSTHOG_API_KEY_FOR_CLI: ${{ secrets.POSTHOG_API_KEY_FOR_CLI }}
-                  FURY_TOKEN: ${{ secrets.FURYPUSHTOKEN }}
-                  AUR_KEY: ${{ secrets.AUR_KEY }}
-                  GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
-            - uses: actions/setup-python@v4
-            - run: pip install --upgrade cloudsmith-cli
-            - name: Publish to CloudSmith
-              run: sh cli/upload_to_cloudsmith.sh
-              env:
-                  CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
+jobs:
+  goreleaser:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: 🐋 Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: 🔧 Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - run: git fetch --force --tags
+      - run: echo "Ref name ${{github.ref_name}}"
+      - uses: actions/setup-go@v3
+        with:
+          go-version: ">=1.19.3"
+          cache: true
+          cache-dependency-path: cli/go.sum
+      - name: libssl1.1 => libssl1.0-dev for OSXCross
+        run: |
+          echo 'deb http://security.ubuntu.com/ubuntu bionic-security main' | sudo tee -a /etc/apt/sources.list
+          sudo apt update && apt-cache policy libssl1.0-dev
+          sudo apt-get install libssl1.0-dev
+      - name: OSXCross for CGO Support
+        run: |
+          mkdir ../../osxcross
+          git clone https://github.com/plentico/osxcross-target.git ../../osxcross/target
+      - uses: goreleaser/goreleaser-action@v4
+        with:
+          distribution: goreleaser-pro
+          version: latest
+          args: release --clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }}
+          POSTHOG_API_KEY_FOR_CLI: ${{ secrets.POSTHOG_API_KEY_FOR_CLI }}
+          FURY_TOKEN: ${{ secrets.FURYPUSHTOKEN }}
+          AUR_KEY: ${{ secrets.AUR_KEY }}
+          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
+      - uses: actions/setup-python@v4
+      - run: pip install --upgrade cloudsmith-cli
+      - name: Publish to CloudSmith
+        run: sh cli/upload_to_cloudsmith.sh
+        env:
+          CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}

.github/workflows/run-cli-tests.yml

@@ -1,47 +0,0 @@
-name: Go CLI Tests
-
-on:
-    pull_request:
-        types: [opened, synchronize]
-        paths:
-            - "cli/**"
-
-    workflow_dispatch:
-
-    workflow_call:
-        secrets:
-            CLI_TESTS_UA_CLIENT_ID:
-                required: true
-            CLI_TESTS_UA_CLIENT_SECRET:
-                required: true
-            CLI_TESTS_SERVICE_TOKEN:
-                required: true
-            CLI_TESTS_PROJECT_ID:
-                required: true
-            CLI_TESTS_ENV_SLUG:
-                required: true
-
-jobs:
-    test:
-        defaults:
-            run:
-                working-directory: ./cli
-        runs-on: ubuntu-latest
-
-        steps:
-            - uses: actions/checkout@v4
-            - name: Setup Go
-              uses: actions/setup-go@v4
-              with:
-                  go-version: "1.21.x"
-            - name: Install dependencies
-              run: go get .
-            - name: Test with the Go CLI
-              env:
-                  CLI_TESTS_UA_CLIENT_ID: ${{ secrets.CLI_TESTS_UA_CLIENT_ID }}
-                  CLI_TESTS_UA_CLIENT_SECRET: ${{ secrets.CLI_TESTS_UA_CLIENT_SECRET }}
-                  CLI_TESTS_SERVICE_TOKEN: ${{ secrets.CLI_TESTS_SERVICE_TOKEN }}
-                  CLI_TESTS_PROJECT_ID: ${{ secrets.CLI_TESTS_PROJECT_ID }}
-                  CLI_TESTS_ENV_SLUG: ${{ secrets.CLI_TESTS_ENV_SLUG }}
-
-              run: go test -v -count=1 ./test

.gitignore

@@ -67,5 +67,3 @@ yarn-error.log*
 frontend-build
 
 *.tgz
-cli/infisical-merge
-cli/test/infisical-merge

backend/e2e-test/routes/v3/secrets.spec.ts

@@ -942,113 +942,6 @@ describe.each([{ auth: AuthMode.JWT }, { auth: AuthMode.IDENTITY_ACCESS_TOKEN }]
       const secrets = await getSecrets(seedData1.environment.slug, path);
       expect(secrets).toEqual([]);
     });
-
-    test.each(testRawSecrets)("Bulk create secret raw in path $path", async ({ path, secret }) => {
-      const createSecretReqBody = {
-        projectSlug: seedData1.project.slug,
-        environment: seedData1.environment.slug,
-        secretPath: path,
-        secrets: [
-          {
-            secretKey: secret.key,
-            secretValue: secret.value,
-            secretComment: secret.comment
-          }
-        ]
-      };
-      const createSecRes = await testServer.inject({
-        method: "POST",
-        url: `/api/v3/secrets/batch/raw`,
-        headers: {
-          authorization: `Bearer ${authToken}`
-        },
-        body: createSecretReqBody
-      });
-      expect(createSecRes.statusCode).toBe(200);
-      const createdSecretPayload = JSON.parse(createSecRes.payload);
-      expect(createdSecretPayload).toHaveProperty("secrets");
-
-      // fetch secrets
-      const secrets = await getSecrets(seedData1.environment.slug, path);
-      expect(secrets).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            key: secret.key,
-            value: secret.value,
-            type: SecretType.Shared
-          })
-        ])
-      );
-
-      await deleteRawSecret({ path, key: secret.key });
-    });
-
-    test.each(testRawSecrets)("Bulk update secret raw in path $path", async ({ secret, path }) => {
-      await createRawSecret({ path, ...secret });
-      const updateSecretReqBody = {
-        projectSlug: seedData1.project.slug,
-        environment: seedData1.environment.slug,
-        secretPath: path,
-        secrets: [
-          {
-            secretValue: "new-value",
-            secretKey: secret.key
-          }
-        ]
-      };
-      const updateSecRes = await testServer.inject({
-        method: "PATCH",
-        url: `/api/v3/secrets/batch/raw`,
-        headers: {
-          authorization: `Bearer ${authToken}`
-        },
-        body: updateSecretReqBody
-      });
-      expect(updateSecRes.statusCode).toBe(200);
-      const updatedSecretPayload = JSON.parse(updateSecRes.payload);
-      expect(updatedSecretPayload).toHaveProperty("secrets");
-
-      // fetch secrets
-      const secrets = await getSecrets(seedData1.environment.slug, path);
-      expect(secrets).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            key: secret.key,
-            value: "new-value",
-            version: 2,
-            type: SecretType.Shared
-          })
-        ])
-      );
-
-      await deleteRawSecret({ path, key: secret.key });
-    });
-
-    test.each(testRawSecrets)("Bulk delete secret raw in path $path", async ({ path, secret }) => {
-      await createRawSecret({ path, ...secret });
-
-      const deletedSecretReqBody = {
-        projectSlug: seedData1.project.slug,
-        environment: seedData1.environment.slug,
-        secretPath: path,
-        secrets: [{ secretKey: secret.key }]
-      };
-      const deletedSecRes = await testServer.inject({
-        method: "DELETE",
-        url: `/api/v3/secrets/batch/raw`,
-        headers: {
-          authorization: `Bearer ${authToken}`
-        },
-        body: deletedSecretReqBody
-      });
-      expect(deletedSecRes.statusCode).toBe(200);
-      const deletedSecretPayload = JSON.parse(deletedSecRes.payload);
-      expect(deletedSecretPayload).toHaveProperty("secrets");
-
-      // fetch secrets
-      const secrets = await getSecrets(seedData1.environment.slug, path);
-      expect(secrets).toEqual([]);
-    });
   }
 );
 

backend/package.json

@@ -109,7 +109,7 @@
     "libsodium-wrappers": "^0.7.13",
     "lodash.isequal": "^4.5.0",
     "ms": "^2.1.3",
-    "mysql2": "^3.9.4",
+    "mysql2": "^3.9.7",
     "nanoid": "^5.0.4",
     "nodemailer": "^6.9.9",
     "ora": "^7.0.1",

backend/src/db/migrations/20240405000045_org-memberships-unique-constraint.ts

@@ -42,7 +42,6 @@ export async function up(knex: Knex): Promise<void> {
   await knex.transaction(async (tx) => {
     const duplicateRows = await tx(TableName.OrgMembership)
       .select("userId", "orgId") // Select the userId and orgId so we can group by them
-      .whereNotNull("userId") // Ensure that the userId is not null
       .count("* as cnt") // Count the number of rows for each userId and orgId, so we can make sure there are more than 1 row (a duplicate)
       .groupBy("userId", "orgId")
       .havingRaw("count(*) > ?", [1]); // Using havingRaw for direct SQL expressions

backend/src/db/migrations/20240417032913_pending-group-addition.ts

@@ -1,15 +0,0 @@
-import { Knex } from "knex";
-
-import { TableName } from "../schemas";
-
-export async function up(knex: Knex): Promise<void> {
-  await knex.schema.alterTable(TableName.UserGroupMembership, (t) => {
-    t.boolean("isPending").notNullable().defaultTo(false);
-  });
-}
-
-export async function down(knex: Knex): Promise<void> {
-  await knex.schema.alterTable(TableName.UserGroupMembership, (t) => {
-    t.dropColumn("isPending");
-  });
-}

backend/src/db/schemas/user-group-membership.ts

@@ -12,8 +12,7 @@ export const UserGroupMembershipSchema = z.object({
   userId: z.string().uuid(),
   groupId: z.string().uuid(),
   createdAt: z.date(),
-  updatedAt: z.date(),
-  isPending: z.boolean().default(false)
+  updatedAt: z.date()
 });
 
 export type TUserGroupMembership = z.infer<typeof UserGroupMembershipSchema>;

backend/src/ee/routes/v1/project-role-router.ts

@@ -157,13 +157,7 @@ export const registerProjectRoleRouter = async (server: FastifyZodProvider) => {
       response: {
         200: z.object({
           data: z.object({
-            membership: ProjectMembershipsSchema.extend({
-              roles: z
-                .object({
-                  role: z.string()
-                })
-                .array()
-            }),
+            membership: ProjectMembershipsSchema,
             permissions: z.any().array()
           })
         })

backend/src/ee/routes/v1/scim-router.ts

@@ -289,28 +289,14 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
       body: z.object({
         schemas: z.array(z.string()),
         displayName: z.string().trim(),
-        members: z
-          .array(
-            z.object({
-              value: z.string(),
-              display: z.string()
-            })
-          )
-          .optional() // okta-specific
+        members: z.array(z.any()).length(0).optional() // okta-specific
       }),
       response: {
         200: z.object({
           schemas: z.array(z.string()),
           id: z.string().trim(),
           displayName: z.string().trim(),
-          members: z
-            .array(
-              z.object({
-                value: z.string(),
-                display: z.string()
-              })
-            )
-            .optional(),
+          members: z.array(z.any()).length(0),
           meta: z.object({
             resourceType: z.string().trim()
           })
@@ -320,8 +306,8 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
     onRequest: verifyAuth([AuthMode.SCIM_TOKEN]),
     handler: async (req) => {
       const group = await req.server.services.scim.createScimGroup({
-        orgId: req.permission.orgId,
-        ...req.body
+        displayName: req.body.displayName,
+        orgId: req.permission.orgId
       });
 
       return group;
@@ -414,12 +400,7 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
         schemas: z.array(z.string()),
         id: z.string().trim(),
         displayName: z.string().trim(),
-        members: z.array(
-          z.object({
-            value: z.string(), // infisical userId
-            display: z.string()
-          })
-        ) // note: is this where members are added to group?
+        members: z.array(z.any()).length(0)
       }),
       response: {
         200: z.object({
@@ -443,7 +424,7 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
       const group = await req.server.services.scim.updateScimGroupNamePut({
         groupId: req.params.groupId,
         orgId: req.permission.orgId,
-        ...req.body
+        displayName: req.body.displayName
       });
 
       return group;
@@ -501,6 +482,8 @@ export const registerScimRouter = async (server: FastifyZodProvider) => {
     },
     onRequest: verifyAuth([AuthMode.SCIM_TOKEN]),
     handler: async (req) => {
+      // console.log("PATCH /Groups/:groupId req.body: ", req.body);
+      // console.log("PATCH /Groups/:groupId req.body: ", req.body.Operations[0]);
       const group = await req.server.services.scim.updateScimGroupNamePatch({
         groupId: req.params.groupId,
         orgId: req.permission.orgId,

backend/src/ee/services/group/group-dal.ts

@@ -59,6 +59,32 @@ export const groupDALFactory = (db: TDbClient) => {
     }
   };
 
+  const countAllGroupMembers = async ({ orgId, groupId }: { orgId: string; groupId: string }) => {
+    try {
+      interface CountResult {
+        count: string;
+      }
+
+      const doc = await db<CountResult>(TableName.OrgMembership)
+        .where(`${TableName.OrgMembership}.orgId`, orgId)
+        .join(TableName.Users, `${TableName.OrgMembership}.userId`, `${TableName.Users}.id`)
+        .leftJoin(TableName.UserGroupMembership, function () {
+          this.on(`${TableName.UserGroupMembership}.userId`, "=", `${TableName.Users}.id`).andOn(
+            `${TableName.UserGroupMembership}.groupId`,
+            "=",
+            db.raw("?", [groupId])
+          );
+        })
+        .where({ isGhost: false })
+        .count(`${TableName.Users}.id`)
+        .first();
+
+      return parseInt((doc?.count as string) || "0", 10);
+    } catch (err) {
+      throw new DatabaseError({ error: err, name: "Count all group members" });
+    }
+  };
+
   // special query
   const findAllGroupMembers = async ({
     orgId,
@@ -124,6 +150,7 @@ export const groupDALFactory = (db: TDbClient) => {
   return {
     findGroups,
     findByOrgId,
+    countAllGroupMembers,
     findAllGroupMembers,
     ...groupOrm
   };

backend/src/ee/services/group/group-fns.ts

@@ -1,454 +0,0 @@
-import { Knex } from "knex";
-
-import { SecretKeyEncoding, TUsers } from "@app/db/schemas";
-import { decryptAsymmetric, encryptAsymmetric, infisicalSymmetricDecrypt } from "@app/lib/crypto/encryption";
-import { BadRequestError, ScimRequestError } from "@app/lib/errors";
-
-import {
-  TAddUsersToGroup,
-  TAddUsersToGroupByUserIds,
-  TConvertPendingGroupAdditionsToGroupMemberships,
-  TRemoveUsersFromGroupByUserIds
-} from "./group-types";
-
-const addAcceptedUsersToGroup = async ({
-  userIds,
-  group,
-  userGroupMembershipDAL,
-  userDAL,
-  groupProjectDAL,
-  projectKeyDAL,
-  projectDAL,
-  projectBotDAL,
-  tx
-}: TAddUsersToGroup) => {
-  console.log("addAcceptedUsersToGroup args: ", {
-    userIds,
-    group
-  });
-  const users = await userDAL.findUserEncKeyByUserIdsBatch(
-    {
-      userIds
-    },
-    tx
-  );
-
-  await userGroupMembershipDAL.insertMany(
-    users.map((user) => ({
-      userId: user.userId,
-      groupId: group.id,
-      isPending: false
-    })),
-    tx
-  );
-
-  // check which projects the group is part of
-  const projectIds = Array.from(
-    new Set(
-      (
-        await groupProjectDAL.find(
-          {
-            groupId: group.id
-          },
-          { tx }
-        )
-      ).map((gp) => gp.projectId)
-    )
-  );
-
-  const keys = await projectKeyDAL.find(
-    {
-      $in: {
-        projectId: projectIds,
-        receiverId: users.map((u) => u.id)
-      }
-    },
-    { tx }
-  );
-
-  const userKeysSet = new Set(keys.map((k) => `${k.projectId}-${k.receiverId}`));
-
-  for await (const projectId of projectIds) {
-    const usersToAddProjectKeyFor = users.filter((u) => !userKeysSet.has(`${projectId}-${u.userId}`));
-
-    if (usersToAddProjectKeyFor.length) {
-      // there are users who need to be shared keys
-      // process adding bulk users to projects for each project individually
-      const ghostUser = await projectDAL.findProjectGhostUser(projectId, tx);
-
-      if (!ghostUser) {
-        throw new BadRequestError({
-          message: "Failed to find sudo user"
-        });
-      }
-
-      const ghostUserLatestKey = await projectKeyDAL.findLatestProjectKey(ghostUser.id, projectId, tx);
-
-      if (!ghostUserLatestKey) {
-        throw new BadRequestError({
-          message: "Failed to find sudo user latest key"
-        });
-      }
-
-      const bot = await projectBotDAL.findOne({ projectId }, tx);
-
-      if (!bot) {
-        throw new BadRequestError({
-          message: "Failed to find bot"
-        });
-      }
-
-      const botPrivateKey = infisicalSymmetricDecrypt({
-        keyEncoding: bot.keyEncoding as SecretKeyEncoding,
-        iv: bot.iv,
-        tag: bot.tag,
-        ciphertext: bot.encryptedPrivateKey
-      });
-
-      const plaintextProjectKey = decryptAsymmetric({
-        ciphertext: ghostUserLatestKey.encryptedKey,
-        nonce: ghostUserLatestKey.nonce,
-        publicKey: ghostUserLatestKey.sender.publicKey,
-        privateKey: botPrivateKey
-      });
-
-      const projectKeysToAdd = usersToAddProjectKeyFor.map((user) => {
-        const { ciphertext: encryptedKey, nonce } = encryptAsymmetric(
-          plaintextProjectKey,
-          user.publicKey,
-          botPrivateKey
-        );
-        return {
-          encryptedKey,
-          nonce,
-          senderId: ghostUser.id,
-          receiverId: user.userId,
-          projectId
-        };
-      });
-
-      await projectKeyDAL.insertMany(projectKeysToAdd, tx);
-    }
-  }
-};
-
-/**
- * Add users with user ids [userIds] to group [group].
- * - Users may or may not have finished completing their accounts; this function will
- * handle both adding users to groups directly and via pending group additions.
- * @param {group} group - group to add user(s) to
- * @param {string[]} userIds - id(s) of user(s) to add to group
- */
-export const addUsersToGroupByUserIds = async ({
-  group,
-  userIds,
-  userDAL,
-  userGroupMembershipDAL,
-  orgDAL,
-  groupProjectDAL,
-  projectKeyDAL,
-  projectDAL,
-  projectBotDAL,
-  tx: outerTx
-}: TAddUsersToGroupByUserIds) => {
-  const processAddition = async (tx: Knex) => {
-    const foundMembers = await userDAL.find(
-      {
-        $in: {
-          id: userIds
-        }
-      },
-      { tx }
-    );
-
-    const foundMembersIdsSet = new Set(foundMembers.map((member) => member.id));
-
-    const isCompleteMatch = userIds.every((userId) => foundMembersIdsSet.has(userId));
-
-    if (!isCompleteMatch) {
-      throw new ScimRequestError({
-        detail: "Members not found",
-        status: 404
-      });
-    }
-
-    // check if user(s) group membership(s) already exists
-    const existingUserGroupMemberships = await userGroupMembershipDAL.find(
-      {
-        groupId: group.id,
-        $in: {
-          userId: userIds
-        }
-      },
-      { tx }
-    );
-
-    if (existingUserGroupMemberships.length) {
-      throw new BadRequestError({
-        message: `User(s) are already part of the group ${group.slug}`
-      });
-    }
-
-    // check if all user(s) are part of the organization
-    const existingUserOrgMemberships = await orgDAL.findMembership(
-      {
-        orgId: group.orgId,
-        $in: {
-          userId: userIds
-        }
-      },
-      { tx }
-    );
-
-    const existingUserOrgMembershipsUserIdsSet = new Set(existingUserOrgMemberships.map((u) => u.userId));
-
-    userIds.forEach((userId) => {
-      if (!existingUserOrgMembershipsUserIdsSet.has(userId))
-        throw new BadRequestError({
-          message: `User with id ${userId} is not part of the organization`
-        });
-    });
-
-    const membersToAddToGroupNonPending: TUsers[] = [];
-    const membersToAddToGroupPending: TUsers[] = [];
-
-    foundMembers.forEach((member) => {
-      if (member.isAccepted) {
-        // add accepted member to group
-        membersToAddToGroupNonPending.push(member);
-      } else {
-        // add incomplete member to pending group addition
-        membersToAddToGroupPending.push(member);
-      }
-    });
-
-    if (membersToAddToGroupNonPending.length) {
-      await addAcceptedUsersToGroup({
-        userIds: membersToAddToGroupNonPending.map((member) => member.id),
-        group,
-        userDAL,
-        userGroupMembershipDAL,
-        groupProjectDAL,
-        projectKeyDAL,
-        projectDAL,
-        projectBotDAL,
-        tx
-      });
-    }
-
-    if (membersToAddToGroupPending.length) {
-      await userGroupMembershipDAL.insertMany(
-        membersToAddToGroupPending.map((member) => ({
-          userId: member.id,
-          groupId: group.id,
-          isPending: true
-        })),
-        tx
-      );
-    }
-
-    return membersToAddToGroupNonPending.concat(membersToAddToGroupPending);
-  };
-
-  if (outerTx) {
-    return processAddition(outerTx);
-  }
-  return userDAL.transaction(async (tx) => {
-    return processAddition(tx);
-  });
-};
-
-/**
- * Remove users with user ids [userIds] from group [group].
- * - Users may be part of the group (non-pending + pending);
- * this function will handle both cases.
- * @param {group} group - group to remove user(s) from
- * @param {string[]} userIds - id(s) of user(s) to remove from group
- */
-export const removeUsersFromGroupByUserIds = async ({
-  group,
-  userIds,
-  userDAL,
-  userGroupMembershipDAL,
-  groupProjectDAL,
-  projectKeyDAL,
-  tx: outerTx
-}: TRemoveUsersFromGroupByUserIds) => {
-  const processRemoval = async (tx: Knex) => {
-    const foundMembers = await userDAL.find({
-      $in: {
-        id: userIds
-      }
-    });
-
-    const foundMembersIdsSet = new Set(foundMembers.map((member) => member.id));
-
-    const isCompleteMatch = userIds.every((userId) => foundMembersIdsSet.has(userId));
-
-    if (!isCompleteMatch) {
-      throw new ScimRequestError({
-        detail: "Members not found",
-        status: 404
-      });
-    }
-
-    // check if user group membership already exists
-    const existingUserGroupMemberships = await userGroupMembershipDAL.find(
-      {
-        groupId: group.id,
-        $in: {
-          userId: userIds
-        }
-      },
-      { tx }
-    );
-
-    const existingUserGroupMembershipsUserIdsSet = new Set(existingUserGroupMemberships.map((u) => u.userId));
-
-    userIds.forEach((userId) => {
-      if (!existingUserGroupMembershipsUserIdsSet.has(userId))
-        throw new BadRequestError({
-          message: `User(s) are not part of the group ${group.slug}`
-        });
-    });
-
-    const membersToRemoveFromGroupNonPending: TUsers[] = [];
-    const membersToRemoveFromGroupPending: TUsers[] = [];
-
-    foundMembers.forEach((member) => {
-      if (member.isAccepted) {
-        // remove accepted member from group
-        membersToRemoveFromGroupNonPending.push(member);
-      } else {
-        // remove incomplete member from pending group addition
-        membersToRemoveFromGroupPending.push(member);
-      }
-    });
-
-    if (membersToRemoveFromGroupNonPending.length) {
-      // check which projects the group is part of
-      const projectIds = Array.from(
-        new Set(
-          (
-            await groupProjectDAL.find(
-              {
-                groupId: group.id
-              },
-              { tx }
-            )
-          ).map((gp) => gp.projectId)
-        )
-      );
-
-      // TODO: this part can be optimized
-      for await (const userId of userIds) {
-        const t = await userGroupMembershipDAL.filterProjectsByUserMembership(userId, group.id, projectIds, tx);
-        const projectsToDeleteKeyFor = projectIds.filter((p) => !t.has(p));
-
-        if (projectsToDeleteKeyFor.length) {
-          await projectKeyDAL.delete(
-            {
-              receiverId: userId,
-              $in: {
-                projectId: projectsToDeleteKeyFor
-              }
-            },
-            tx
-          );
-        }
-
-        await userGroupMembershipDAL.delete(
-          {
-            groupId: group.id,
-            userId
-          },
-          tx
-        );
-      }
-    }
-
-    if (membersToRemoveFromGroupPending.length) {
-      await userGroupMembershipDAL.delete({
-        groupId: group.id,
-        $in: {
-          userId: membersToRemoveFromGroupPending.map((member) => member.id)
-        }
-      });
-    }
-
-    return membersToRemoveFromGroupNonPending.concat(membersToRemoveFromGroupPending);
-  };
-
-  if (outerTx) {
-    return processRemoval(outerTx);
-  }
-  return userDAL.transaction(async (tx) => {
-    return processRemoval(tx);
-  });
-};
-
-/**
- * Convert pending group additions for users with ids [userIds] to group memberships.
- * @param {string[]} userIds - id(s) of user(s) to try to convert pending group additions to group memberships
- */
-export const convertPendingGroupAdditionsToGroupMemberships = async ({
-  userIds,
-  userDAL,
-  userGroupMembershipDAL,
-  groupProjectDAL,
-  projectKeyDAL,
-  projectDAL,
-  projectBotDAL,
-  tx: outerTx
-}: TConvertPendingGroupAdditionsToGroupMemberships) => {
-  const processConversion = async (tx: Knex) => {
-    const users = await userDAL.find(
-      {
-        $in: {
-          id: userIds
-        }
-      },
-      { tx }
-    );
-
-    const usersUserIdsSet = new Set(users.map((u) => u.id));
-    userIds.forEach((userId) => {
-      if (!usersUserIdsSet.has(userId)) {
-        throw new BadRequestError({
-          message: `Failed to find user with id ${userId}`
-        });
-      }
-    });
-
-    users.forEach((user) => {
-      if (!user.isAccepted) {
-        throw new BadRequestError({
-          message: `Failed to convert pending group additions to group memberships for user ${user.username} because they have not confirmed their account`
-        });
-      }
-    });
-
-    const pendingGroupAdditions = await userGroupMembershipDAL.deletePendingUserGroupMembershipsByUserIds(userIds, tx);
-
-    for await (const pendingGroupAddition of pendingGroupAdditions) {
-      await addAcceptedUsersToGroup({
-        userIds: [pendingGroupAddition.user.id],
-        group: pendingGroupAddition.group,
-        userDAL,
-        userGroupMembershipDAL,
-        groupProjectDAL,
-        projectKeyDAL,
-        projectDAL,
-        projectBotDAL,
-        tx
-      });
-    }
-  };
-
-  if (outerTx) {
-    return processConversion(outerTx);
-  }
-  return userDAL.transaction(async (tx) => {
-    await processConversion(tx);
-  });
-};

backend/src/ee/services/group/group-service.ts

@@ -1,22 +1,22 @@
 import { ForbiddenError } from "@casl/ability";
 import slugify from "@sindresorhus/slugify";
 
-import { OrgMembershipRole, TOrgRoles } from "@app/db/schemas";
+import { OrgMembershipRole, SecretKeyEncoding, TOrgRoles } from "@app/db/schemas";
 import { isAtLeastAsPrivileged } from "@app/lib/casl";
+import { decryptAsymmetric, encryptAsymmetric, infisicalSymmetricDecrypt } from "@app/lib/crypto/encryption";
 import { BadRequestError, ForbiddenRequestError } from "@app/lib/errors";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
-import { TGroupProjectDALFactory } from "@app/services/group-project/group-project-dal";
-import { TOrgDALFactory } from "@app/services/org/org-dal";
-import { TProjectDALFactory } from "@app/services/project/project-dal";
-import { TProjectBotDALFactory } from "@app/services/project-bot/project-bot-dal";
-import { TProjectKeyDALFactory } from "@app/services/project-key/project-key-dal";
-import { TUserDALFactory } from "@app/services/user/user-dal";
 
+import { TGroupProjectDALFactory } from "../../../services/group-project/group-project-dal";
+import { TOrgDALFactory } from "../../../services/org/org-dal";
+import { TProjectDALFactory } from "../../../services/project/project-dal";
+import { TProjectBotDALFactory } from "../../../services/project-bot/project-bot-dal";
+import { TProjectKeyDALFactory } from "../../../services/project-key/project-key-dal";
+import { TUserDALFactory } from "../../../services/user/user-dal";
 import { TLicenseServiceFactory } from "../license/license-service";
 import { OrgPermissionActions, OrgPermissionSubjects } from "../permission/org-permission";
 import { TPermissionServiceFactory } from "../permission/permission-service";
 import { TGroupDALFactory } from "./group-dal";
-import { addUsersToGroupByUserIds, removeUsersFromGroupByUserIds } from "./group-fns";
 import {
   TAddUserToGroupDTO,
   TCreateGroupDTO,
@@ -28,17 +28,20 @@ import {
 import { TUserGroupMembershipDALFactory } from "./user-group-membership-dal";
 
 type TGroupServiceFactoryDep = {
-  userDAL: Pick<TUserDALFactory, "find" | "findUserEncKeyByUserIdsBatch" | "transaction" | "findOne">;
-  groupDAL: Pick<TGroupDALFactory, "create" | "findOne" | "update" | "delete" | "findAllGroupMembers">;
+  userDAL: Pick<TUserDALFactory, "findOne" | "findUserEncKeyByUsername">;
+  groupDAL: Pick<
+    TGroupDALFactory,
+    "create" | "findOne" | "update" | "delete" | "findAllGroupMembers" | "countAllGroupMembers"
+  >;
   groupProjectDAL: Pick<TGroupProjectDALFactory, "find">;
-  orgDAL: Pick<TOrgDALFactory, "findMembership" | "countAllOrgMembers">;
+  orgDAL: Pick<TOrgDALFactory, "findMembership">;
   userGroupMembershipDAL: Pick<
     TUserGroupMembershipDALFactory,
-    "findOne" | "delete" | "filterProjectsByUserMembership" | "transaction" | "insertMany" | "find"
+    "findOne" | "create" | "delete" | "filterProjectsByUserMembership"
   >;
   projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser">;
   projectBotDAL: Pick<TProjectBotDALFactory, "findOne">;
-  projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "delete" | "findLatestProjectKey" | "insertMany">;
+  projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "create" | "delete" | "findLatestProjectKey">;
   permissionService: Pick<TPermissionServiceFactory, "getOrgPermission" | "getOrgPermissionByRole">;
   licenseService: Pick<TLicenseServiceFactory, "getPlan">;
 };
@@ -224,9 +227,12 @@ export const groupServiceFactory = ({
       username
     });
 
-    const count = await orgDAL.countAllOrgMembers(group.orgId);
+    const totalCount = await groupDAL.countAllGroupMembers({
+      orgId: group.orgId,
+      groupId: group.id
+    });
 
-    return { users, totalCount: count };
+    return { users, totalCount };
   };
 
   const addUserToGroup = async ({
@@ -266,22 +272,111 @@ export const groupServiceFactory = ({
     if (!hasRequiredPriviledges)
       throw new ForbiddenRequestError({ message: "Failed to add user to more privileged group" });
 
-    const user = await userDAL.findOne({ username });
-    if (!user) throw new BadRequestError({ message: `Failed to find user with username ${username}` });
-
-    const users = await addUsersToGroupByUserIds({
-      group,
-      userIds: [user.id],
-      userDAL,
-      userGroupMembershipDAL,
-      orgDAL,
-      groupProjectDAL,
-      projectKeyDAL,
-      projectDAL,
-      projectBotDAL
+    // get user with username
+    const user = await userDAL.findUserEncKeyByUsername({
+      username
     });
 
-    return users[0];
+    if (!user)
+      throw new BadRequestError({
+        message: `Failed to find user with username ${username}`
+      });
+
+    // check if user group membership already exists
+    const existingUserGroupMembership = await userGroupMembershipDAL.findOne({
+      groupId: group.id,
+      userId: user.userId
+    });
+
+    if (existingUserGroupMembership)
+      throw new BadRequestError({
+        message: `User ${username} is already part of the group ${groupSlug}`
+      });
+
+    // check if user is even part of the organization
+    const existingUserOrgMembership = await orgDAL.findMembership({
+      userId: user.userId,
+      orgId: actorOrgId
+    });
+
+    if (!existingUserOrgMembership)
+      throw new BadRequestError({
+        message: `User ${username} is not part of the organization`
+      });
+
+    await userGroupMembershipDAL.create({
+      userId: user.userId,
+      groupId: group.id
+    });
+
+    // check which projects the group is part of
+    const projectIds = (
+      await groupProjectDAL.find({
+        groupId: group.id
+      })
+    ).map((gp) => gp.projectId);
+
+    const keys = await projectKeyDAL.find({
+      receiverId: user.userId,
+      $in: {
+        projectId: projectIds
+      }
+    });
+
+    const keysSet = new Set(keys.map((k) => k.projectId));
+    const projectsToAddKeyFor = projectIds.filter((p) => !keysSet.has(p));
+
+    for await (const projectId of projectsToAddKeyFor) {
+      const ghostUser = await projectDAL.findProjectGhostUser(projectId);
+
+      if (!ghostUser) {
+        throw new BadRequestError({
+          message: "Failed to find sudo user"
+        });
+      }
+
+      const ghostUserLatestKey = await projectKeyDAL.findLatestProjectKey(ghostUser.id, projectId);
+
+      if (!ghostUserLatestKey) {
+        throw new BadRequestError({
+          message: "Failed to find sudo user latest key"
+        });
+      }
+
+      const bot = await projectBotDAL.findOne({ projectId });
+
+      if (!bot) {
+        throw new BadRequestError({
+          message: "Failed to find bot"
+        });
+      }
+
+      const botPrivateKey = infisicalSymmetricDecrypt({
+        keyEncoding: bot.keyEncoding as SecretKeyEncoding,
+        iv: bot.iv,
+        tag: bot.tag,
+        ciphertext: bot.encryptedPrivateKey
+      });
+
+      const plaintextProjectKey = decryptAsymmetric({
+        ciphertext: ghostUserLatestKey.encryptedKey,
+        nonce: ghostUserLatestKey.nonce,
+        publicKey: ghostUserLatestKey.sender.publicKey,
+        privateKey: botPrivateKey
+      });
+
+      const { ciphertext: encryptedKey, nonce } = encryptAsymmetric(plaintextProjectKey, user.publicKey, botPrivateKey);
+
+      await projectKeyDAL.create({
+        encryptedKey,
+        nonce,
+        senderId: ghostUser.id,
+        receiverId: user.userId,
+        projectId
+      });
+    }
+
+    return user;
   };
 
   const removeUserFromGroup = async ({
@@ -321,19 +416,51 @@ export const groupServiceFactory = ({
     if (!hasRequiredPriviledges)
       throw new ForbiddenRequestError({ message: "Failed to delete user from more privileged group" });
 
-    const user = await userDAL.findOne({ username });
-    if (!user) throw new BadRequestError({ message: `Failed to find user with username ${username}` });
-
-    const users = await removeUsersFromGroupByUserIds({
-      group,
-      userIds: [user.id],
-      userDAL,
-      userGroupMembershipDAL,
-      groupProjectDAL,
-      projectKeyDAL
+    const user = await userDAL.findOne({
+      username
     });
 
-    return users[0];
+    if (!user)
+      throw new BadRequestError({
+        message: `Failed to find user with username ${username}`
+      });
+
+    // check if user group membership already exists
+    const existingUserGroupMembership = await userGroupMembershipDAL.findOne({
+      groupId: group.id,
+      userId: user.id
+    });
+
+    if (!existingUserGroupMembership)
+      throw new BadRequestError({
+        message: `User ${username} is not part of the group ${groupSlug}`
+      });
+
+    const projectIds = (
+      await groupProjectDAL.find({
+        groupId: group.id
+      })
+    ).map((gp) => gp.projectId);
+
+    const t = await userGroupMembershipDAL.filterProjectsByUserMembership(user.id, group.id, projectIds);
+
+    const projectsToDeleteKeyFor = projectIds.filter((p) => !t.has(p));
+
+    if (projectsToDeleteKeyFor.length) {
+      await projectKeyDAL.delete({
+        receiverId: user.id,
+        $in: {
+          projectId: projectsToDeleteKeyFor
+        }
+      });
+    }
+
+    await userGroupMembershipDAL.delete({
+      groupId: group.id,
+      userId: user.id
+    });
+
+    return user;
   };
 
   return {

backend/src/ee/services/group/group-types.ts

@@ -1,14 +1,4 @@
-import { Knex } from "knex";
-
-import { TGroups } from "@app/db/schemas";
-import { TUserGroupMembershipDALFactory } from "@app/ee/services/group/user-group-membership-dal";
 import { TGenericPermission } from "@app/lib/types";
-import { TGroupProjectDALFactory } from "@app/services/group-project/group-project-dal";
-import { TOrgDALFactory } from "@app/services/org/org-dal";
-import { TProjectDALFactory } from "@app/services/project/project-dal";
-import { TProjectBotDALFactory } from "@app/services/project-bot/project-bot-dal";
-import { TProjectKeyDALFactory } from "@app/services/project-key/project-key-dal";
-import { TUserDALFactory } from "@app/services/user/user-dal";
 
 export type TCreateGroupDTO = {
   name: string;
@@ -45,54 +35,3 @@ export type TRemoveUserFromGroupDTO = {
   groupSlug: string;
   username: string;
 } & TGenericPermission;
-
-// group fns types
-
-export type TAddUsersToGroup = {
-  userIds: string[];
-  group: TGroups;
-  userDAL: Pick<TUserDALFactory, "findUserEncKeyByUserIdsBatch">;
-  userGroupMembershipDAL: Pick<TUserGroupMembershipDALFactory, "find" | "transaction" | "insertMany">;
-  groupProjectDAL: Pick<TGroupProjectDALFactory, "find">;
-  projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "findLatestProjectKey" | "insertMany">;
-  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser">;
-  projectBotDAL: Pick<TProjectBotDALFactory, "findOne">;
-  tx: Knex;
-};
-
-export type TAddUsersToGroupByUserIds = {
-  group: TGroups;
-  userIds: string[];
-  userDAL: Pick<TUserDALFactory, "find" | "findUserEncKeyByUserIdsBatch" | "transaction">;
-  userGroupMembershipDAL: Pick<TUserGroupMembershipDALFactory, "find" | "transaction" | "insertMany">;
-  orgDAL: Pick<TOrgDALFactory, "findMembership">;
-  groupProjectDAL: Pick<TGroupProjectDALFactory, "find">;
-  projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "findLatestProjectKey" | "insertMany">;
-  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser">;
-  projectBotDAL: Pick<TProjectBotDALFactory, "findOne">;
-  tx?: Knex;
-};
-
-export type TRemoveUsersFromGroupByUserIds = {
-  group: TGroups;
-  userIds: string[];
-  userDAL: Pick<TUserDALFactory, "find" | "transaction">;
-  userGroupMembershipDAL: Pick<TUserGroupMembershipDALFactory, "find" | "filterProjectsByUserMembership" | "delete">;
-  groupProjectDAL: Pick<TGroupProjectDALFactory, "find">;
-  projectKeyDAL: Pick<TProjectKeyDALFactory, "delete">;
-  tx?: Knex;
-};
-
-export type TConvertPendingGroupAdditionsToGroupMemberships = {
-  userIds: string[];
-  userDAL: Pick<TUserDALFactory, "findUserEncKeyByUserIdsBatch" | "transaction" | "find" | "findById">;
-  userGroupMembershipDAL: Pick<
-    TUserGroupMembershipDALFactory,
-    "find" | "transaction" | "insertMany" | "deletePendingUserGroupMembershipsByUserIds"
-  >;
-  groupProjectDAL: Pick<TGroupProjectDALFactory, "find">;
-  projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "findLatestProjectKey" | "insertMany">;
-  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser">;
-  projectBotDAL: Pick<TProjectBotDALFactory, "findOne">;
-  tx?: Knex;
-};

backend/src/ee/services/group/user-group-membership-dal.ts

@@ -1,5 +1,3 @@
-import { Knex } from "knex";
-
 import { TDbClient } from "@app/db";
 import { TableName, TUserEncryptionKeys } from "@app/db/schemas";
 import { DatabaseError } from "@app/lib/errors";
@@ -16,28 +14,24 @@ export const userGroupMembershipDALFactory = (db: TDbClient) => {
    * - The user is a member of a group that is a member of the project, excluding projects that they are part of
    * through the group with id [groupId].
    */
-  const filterProjectsByUserMembership = async (userId: string, groupId: string, projectIds: string[], tx?: Knex) => {
-    try {
-      const userProjectMemberships: string[] = await (tx || db)(TableName.ProjectMembership)
-        .where(`${TableName.ProjectMembership}.userId`, userId)
-        .whereIn(`${TableName.ProjectMembership}.projectId`, projectIds)
-        .pluck(`${TableName.ProjectMembership}.projectId`);
+  const filterProjectsByUserMembership = async (userId: string, groupId: string, projectIds: string[]) => {
+    const userProjectMemberships: string[] = await db(TableName.ProjectMembership)
+      .where(`${TableName.ProjectMembership}.userId`, userId)
+      .whereIn(`${TableName.ProjectMembership}.projectId`, projectIds)
+      .pluck(`${TableName.ProjectMembership}.projectId`);
 
-      const userGroupMemberships: string[] = await (tx || db)(TableName.UserGroupMembership)
-        .where(`${TableName.UserGroupMembership}.userId`, userId)
-        .whereNot(`${TableName.UserGroupMembership}.groupId`, groupId)
-        .join(
-          TableName.GroupProjectMembership,
-          `${TableName.UserGroupMembership}.groupId`,
-          `${TableName.GroupProjectMembership}.groupId`
-        )
-        .whereIn(`${TableName.GroupProjectMembership}.projectId`, projectIds)
-        .pluck(`${TableName.GroupProjectMembership}.projectId`);
+    const userGroupMemberships: string[] = await db(TableName.UserGroupMembership)
+      .where(`${TableName.UserGroupMembership}.userId`, userId)
+      .whereNot(`${TableName.UserGroupMembership}.groupId`, groupId)
+      .join(
+        TableName.GroupProjectMembership,
+        `${TableName.UserGroupMembership}.groupId`,
+        `${TableName.GroupProjectMembership}.groupId`
+      )
+      .whereIn(`${TableName.GroupProjectMembership}.projectId`, projectIds)
+      .pluck(`${TableName.GroupProjectMembership}.projectId`);
 
-      return new Set(userProjectMemberships.concat(userGroupMemberships));
-    } catch (error) {
-      throw new DatabaseError({ error, name: "Filter projects by user membership" });
-    }
+    return new Set(userProjectMemberships.concat(userGroupMemberships));
   };
 
   // special query
@@ -51,7 +45,7 @@ export const userGroupMembershipDALFactory = (db: TDbClient) => {
         )
         .join(TableName.Users, `${TableName.UserGroupMembership}.userId`, `${TableName.Users}.id`)
         .where(`${TableName.GroupProjectMembership}.projectId`, projectId)
-        .whereIn(`${TableName.Users}.username`, usernames)
+        .whereIn(`${TableName.Users}.username`, usernames) // TODO: pluck usernames
         .pluck(`${TableName.Users}.id`);
 
       return usernameDocs;
@@ -61,7 +55,7 @@ export const userGroupMembershipDALFactory = (db: TDbClient) => {
   };
 
   /**
-   * Return list of completed/accepted users that are part of the group with id [groupId]
+   * Return list of users that are part of the group with id [groupId]
    * that have not yet been added individually to project with id [projectId].
    *
    * Note: Filters out users that are part of other groups in the project.
@@ -69,19 +63,18 @@ export const userGroupMembershipDALFactory = (db: TDbClient) => {
    * @param projectId
    * @returns
    */
-  const findGroupMembersNotInProject = async (groupId: string, projectId: string, tx?: Knex) => {
+  const findGroupMembersNotInProject = async (groupId: string, projectId: string) => {
     try {
       // get list of groups in the project with id [projectId]
       // that that are not the group with id [groupId]
-      const groups: string[] = await (tx || db)(TableName.GroupProjectMembership)
+      const groups: string[] = await db(TableName.GroupProjectMembership)
         .where(`${TableName.GroupProjectMembership}.projectId`, projectId)
         .whereNot(`${TableName.GroupProjectMembership}.groupId`, groupId)
         .pluck(`${TableName.GroupProjectMembership}.groupId`);
 
       // main query
-      const members = await (tx || db)(TableName.UserGroupMembership)
+      const members = await db(TableName.UserGroupMembership)
         .where(`${TableName.UserGroupMembership}.groupId`, groupId)
-        .where(`${TableName.UserGroupMembership}.isPending`, false)
         .join(TableName.Users, `${TableName.UserGroupMembership}.userId`, `${TableName.Users}.id`)
         .leftJoin(TableName.ProjectMembership, function () {
           this.on(`${TableName.Users}.id`, "=", `${TableName.ProjectMembership}.userId`).andOn(
@@ -123,49 +116,10 @@ export const userGroupMembershipDALFactory = (db: TDbClient) => {
     }
   };
 
-  const deletePendingUserGroupMembershipsByUserIds = async (userIds: string[], tx?: Knex) => {
-    try {
-      const members = await (tx || db)(TableName.UserGroupMembership)
-        .whereIn(`${TableName.UserGroupMembership}.userId`, userIds)
-        .where(`${TableName.UserGroupMembership}.isPending`, true)
-        .join(TableName.Groups, `${TableName.UserGroupMembership}.groupId`, `${TableName.Groups}.id`)
-        .join(TableName.Users, `${TableName.UserGroupMembership}.userId`, `${TableName.Users}.id`);
-
-      await userGroupMembershipOrm.delete(
-        {
-          $in: {
-            userId: userIds
-          }
-        },
-        tx
-      );
-
-      return members.map(({ userId, username, groupId, orgId, name, slug, role, roleId }) => ({
-        user: {
-          id: userId,
-          username
-        },
-        group: {
-          id: groupId,
-          orgId,
-          name,
-          slug,
-          role,
-          roleId,
-          createdAt: new Date(),
-          updatedAt: new Date()
-        }
-      }));
-    } catch (error) {
-      throw new DatabaseError({ error, name: "Delete pending user group memberships by user ids" });
-    }
-  };
-
   return {
     ...userGroupMembershipOrm,
     filterProjectsByUserMembership,
     findUserGroupMembershipsInProject,
-    findGroupMembersNotInProject,
-    deletePendingUserGroupMembershipsByUserIds
+    findGroupMembersNotInProject
   };
 };

backend/src/ee/services/scim/scim-service.ts

@@ -4,20 +4,15 @@ import jwt from "jsonwebtoken";
 
 import { OrgMembershipRole, OrgMembershipStatus, TableName, TGroups } from "@app/db/schemas";
 import { TGroupDALFactory } from "@app/ee/services/group/group-dal";
-import { addUsersToGroupByUserIds, removeUsersFromGroupByUserIds } from "@app/ee/services/group/group-fns";
-import { TUserGroupMembershipDALFactory } from "@app/ee/services/group/user-group-membership-dal";
 import { TScimDALFactory } from "@app/ee/services/scim/scim-dal";
 import { getConfig } from "@app/lib/config/env";
 import { BadRequestError, ScimRequestError, UnauthorizedError } from "@app/lib/errors";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 import { TOrgPermission } from "@app/lib/types";
 import { AuthMethod, AuthTokenType } from "@app/services/auth/auth-type";
-import { TGroupProjectDALFactory } from "@app/services/group-project/group-project-dal";
 import { TOrgDALFactory } from "@app/services/org/org-dal";
 import { deleteOrgMembership } from "@app/services/org/org-fns";
 import { TProjectDALFactory } from "@app/services/project/project-dal";
-import { TProjectBotDALFactory } from "@app/services/project-bot/project-bot-dal";
-import { TProjectKeyDALFactory } from "@app/services/project-key/project-key-dal";
 import { TProjectMembershipDALFactory } from "@app/services/project-membership/project-membership-dal";
 import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service";
 import { TUserDALFactory } from "@app/services/user/user-dal";
@@ -47,21 +42,14 @@ import {
 
 type TScimServiceFactoryDep = {
   scimDAL: Pick<TScimDALFactory, "create" | "find" | "findById" | "deleteById">;
-  userDAL: Pick<TUserDALFactory, "find" | "findOne" | "create" | "transaction" | "findUserEncKeyByUserIdsBatch">;
+  userDAL: Pick<TUserDALFactory, "findOne" | "create" | "transaction">;
   orgDAL: Pick<
     TOrgDALFactory,
     "createMembership" | "findById" | "findMembership" | "deleteMembershipById" | "transaction"
   >;
-  projectDAL: Pick<TProjectDALFactory, "find" | "findProjectGhostUser">;
+  projectDAL: Pick<TProjectDALFactory, "find">;
   projectMembershipDAL: Pick<TProjectMembershipDALFactory, "find" | "delete">;
-  groupDAL: Pick<
-    TGroupDALFactory,
-    "create" | "findOne" | "findAllGroupMembers" | "update" | "delete" | "findGroups" | "transaction"
-  >;
-  groupProjectDAL: Pick<TGroupProjectDALFactory, "find">;
-  userGroupMembershipDAL: TUserGroupMembershipDALFactory; // TODO: Pick
-  projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "findLatestProjectKey" | "insertMany" | "delete">;
-  projectBotDAL: Pick<TProjectBotDALFactory, "findOne">;
+  groupDAL: Pick<TGroupDALFactory, "create" | "findOne" | "findAllGroupMembers" | "update" | "delete" | "findGroups">;
   licenseService: Pick<TLicenseServiceFactory, "getPlan">;
   permissionService: Pick<TPermissionServiceFactory, "getOrgPermission">;
   smtpService: TSmtpService;
@@ -77,10 +65,6 @@ export const scimServiceFactory = ({
   projectDAL,
   projectMembershipDAL,
   groupDAL,
-  groupProjectDAL,
-  userGroupMembershipDAL,
-  projectKeyDAL,
-  projectBotDAL,
   permissionService,
   smtpService
 }: TScimServiceFactoryDep) => {
@@ -489,19 +473,7 @@ export const scimServiceFactory = ({
   };
 
   const listScimGroups = async ({ orgId, offset, limit }: TListScimGroupsDTO) => {
-    const plan = await licenseService.getPlan(orgId);
-    if (!plan.groups)
-      throw new BadRequestError({
-        message: "Failed to list SCIM groups due to plan restriction. Upgrade plan to list SCIM groups."
-      });
-
     const org = await orgDAL.findById(orgId);
-    if (!org) {
-      throw new ScimRequestError({
-        detail: "Organization Not Found",
-        status: 404
-      });
-    }
 
     if (!org.scimEnabled)
       throw new ScimRequestError({
@@ -528,76 +500,30 @@ export const scimServiceFactory = ({
     });
   };
 
-  const createScimGroup = async ({ displayName, orgId, members }: TCreateScimGroupDTO) => {
-    const plan = await licenseService.getPlan(orgId);
-    if (!plan.groups)
-      throw new BadRequestError({
-        message: "Failed to create a SCIM group due to plan restriction. Upgrade plan to create a SCIM group."
-      });
-
+  const createScimGroup = async ({ displayName, orgId }: TCreateScimGroupDTO) => {
     const org = await orgDAL.findById(orgId);
 
-    if (!org) {
-      throw new ScimRequestError({
-        detail: "Organization Not Found",
-        status: 404
-      });
-    }
-
     if (!org.scimEnabled)
       throw new ScimRequestError({
         detail: "SCIM is disabled for the organization",
         status: 403
       });
 
-    const newGroup = await groupDAL.transaction(async (tx) => {
-      const group = await groupDAL.create(
-        {
-          name: displayName,
-          slug: slugify(`${displayName}-${alphaNumericNanoId(4)}`),
-          orgId,
-          role: OrgMembershipRole.NoAccess
-        },
-        tx
-      );
-
-      if (members && members.length) {
-        const newMembers = await addUsersToGroupByUserIds({
-          group,
-          userIds: members.map((member) => member.value),
-          userDAL,
-          userGroupMembershipDAL,
-          orgDAL,
-          groupProjectDAL,
-          projectKeyDAL,
-          projectDAL,
-          projectBotDAL,
-          tx
-        });
-
-        return { group, newMembers };
-      }
-
-      return { group, newMembers: [] };
+    const group = await groupDAL.create({
+      name: displayName,
+      slug: slugify(`${displayName}-${alphaNumericNanoId(4)}`),
+      orgId,
+      role: OrgMembershipRole.NoAccess
     });
 
     return buildScimGroup({
-      groupId: newGroup.group.id,
-      name: newGroup.group.name,
-      members: newGroup.newMembers.map((member) => ({
-        value: member.id,
-        display: `${member.firstName} ${member.lastName}`
-      }))
+      groupId: group.id,
+      name: group.name,
+      members: []
     });
   };
 
   const getScimGroup = async ({ groupId, orgId }: TGetScimGroupDTO) => {
-    const plan = await licenseService.getPlan(orgId);
-    if (!plan.groups)
-      throw new BadRequestError({
-        message: "Failed to get SCIM group due to plan restriction. Upgrade plan to get SCIM group."
-      });
-
     const group = await groupDAL.findOne({
       id: groupId,
       orgId
@@ -627,123 +553,35 @@ export const scimServiceFactory = ({
     });
   };
 
-  const updateScimGroupNamePut = async ({ groupId, orgId, displayName, members }: TUpdateScimGroupNamePutDTO) => {
-    const plan = await licenseService.getPlan(orgId);
-    if (!plan.groups)
-      throw new BadRequestError({
-        message: "Failed to update SCIM group due to plan restriction. Upgrade plan to update SCIM group."
-      });
+  const updateScimGroupNamePut = async ({ groupId, orgId, displayName }: TUpdateScimGroupNamePutDTO) => {
+    const [group] = await groupDAL.update(
+      {
+        id: groupId,
+        orgId
+      },
+      {
+        name: displayName
+      }
+    );
 
-    const org = await orgDAL.findById(orgId);
-    if (!org) {
+    if (!group) {
       throw new ScimRequestError({
-        detail: "Organization Not Found",
+        detail: "Group Not Found",
         status: 404
       });
     }
 
-    if (!org.scimEnabled)
-      throw new ScimRequestError({
-        detail: "SCIM is disabled for the organization",
-        status: 403
-      });
-
-    const updatedGroup = await groupDAL.transaction(async (tx) => {
-      const [group] = await groupDAL.update(
-        {
-          id: groupId,
-          orgId
-        },
-        {
-          name: displayName
-        }
-      );
-
-      if (!group) {
-        throw new ScimRequestError({
-          detail: "Group Not Found",
-          status: 404
-        });
-      }
-
-      if (members) {
-        const membersIdsSet = new Set(members.map((member) => member.value));
-
-        const directMemberUserIds = (
-          await userGroupMembershipDAL.find({
-            groupId: group.id,
-            isPending: false
-          })
-        ).map((membership) => membership.userId);
-
-        const pendingGroupAdditionsUserIds = (
-          await userGroupMembershipDAL.find({
-            groupId: group.id,
-            isPending: true
-          })
-        ).map((pendingGroupAddition) => pendingGroupAddition.userId);
-
-        const allMembersUserIds = directMemberUserIds.concat(pendingGroupAdditionsUserIds);
-        const allMembersUserIdsSet = new Set(allMembersUserIds);
-
-        const toAddUserIds = members.filter((member) => !allMembersUserIdsSet.has(member.value));
-        const toRemoveUserIds = allMembersUserIds.filter((userId) => !membersIdsSet.has(userId));
-
-        if (toAddUserIds.length) {
-          await addUsersToGroupByUserIds({
-            group,
-            userIds: toAddUserIds.map((member) => member.value),
-            userDAL,
-            userGroupMembershipDAL,
-            orgDAL,
-            groupProjectDAL,
-            projectKeyDAL,
-            projectDAL,
-            projectBotDAL,
-            tx
-          });
-        }
-
-        if (toRemoveUserIds.length) {
-          await removeUsersFromGroupByUserIds({
-            group,
-            userIds: toRemoveUserIds,
-            userDAL,
-            userGroupMembershipDAL,
-            groupProjectDAL,
-            projectKeyDAL,
-            tx
-          });
-        }
-      }
-
-      return group;
-    });
-
     return buildScimGroup({
-      groupId: updatedGroup.id,
-      name: updatedGroup.name,
-      members
+      groupId: group.id,
+      name: group.name,
+      members: []
     });
   };
 
   // TODO: add support for add/remove op
   const updateScimGroupNamePatch = async ({ groupId, orgId, operations }: TUpdateScimGroupNamePatchDTO) => {
-    const plan = await licenseService.getPlan(orgId);
-    if (!plan.groups)
-      throw new BadRequestError({
-        message: "Failed to update SCIM group due to plan restriction. Upgrade plan to update SCIM group."
-      });
-
     const org = await orgDAL.findById(orgId);
 
-    if (!org) {
-      throw new ScimRequestError({
-        detail: "Organization Not Found",
-        status: 404
-      });
-    }
-
     if (!org.scimEnabled)
       throw new ScimRequestError({
         detail: "SCIM is disabled for the organization",
@@ -797,26 +635,6 @@ export const scimServiceFactory = ({
   };
 
   const deleteScimGroup = async ({ groupId, orgId }: TDeleteScimGroupDTO) => {
-    const plan = await licenseService.getPlan(orgId);
-    if (!plan.groups)
-      throw new BadRequestError({
-        message: "Failed to delete SCIM group due to plan restriction. Upgrade plan to delete SCIM group."
-      });
-
-    const org = await orgDAL.findById(orgId);
-    if (!org) {
-      throw new ScimRequestError({
-        detail: "Organization Not Found",
-        status: 404
-      });
-    }
-
-    if (!org.scimEnabled)
-      throw new ScimRequestError({
-        detail: "SCIM is disabled for the organization",
-        status: 403
-      });
-
     const [group] = await groupDAL.delete({
       id: groupId,
       orgId

backend/src/ee/services/scim/scim-types.ts

@@ -81,11 +81,6 @@ export type TListScimGroups = {
 export type TCreateScimGroupDTO = {
   displayName: string;
   orgId: string;
-  members?: {
-    // TODO: account for members with value and display (is this optional?)
-    value: string;
-    display: string;
-  }[];
 };
 
 export type TGetScimGroupDTO = {
@@ -97,10 +92,6 @@ export type TUpdateScimGroupNamePutDTO = {
   groupId: string;
   orgId: string;
   displayName: string;
-  members: {
-    value: string;
-    display: string;
-  }[];
 };
 
 export type TUpdateScimGroupNamePatchDTO = {

backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts

@@ -495,11 +495,7 @@ export const secretApprovalRequestServiceFactory = ({
     await projectDAL.checkProjectUpgradeStatus(projectId);
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, secretPath);
-    if (!folder)
-      throw new BadRequestError({
-        message: "Folder not found for the given environment slug & secret path",
-        name: "GenSecretApproval"
-      });
+    if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "GenSecretApproval" });
     const folderId = folder.id;
 
     const blindIndexCfg = await secretBlindIndexDAL.findOne({ projectId });

backend/src/lib/api-docs/constants.ts

@@ -282,7 +282,6 @@ export const RAW_SECRETS = {
   },
   CREATE: {
     secretName: "The name of the secret to create.",
-    projectSlug: "The slug of the project to create the secret in.",
     environment: "The slug of the environment to create the secret in.",
     secretComment: "Attach a comment to the secret.",
     secretPath: "The path to create the secret in.",
@@ -302,13 +301,11 @@ export const RAW_SECRETS = {
   },
   UPDATE: {
     secretName: "The name of the secret to update.",
-    secretComment: "Update comment to the secret.",
     environment: "The slug of the environment where the secret is located.",
     secretPath: "The path of the secret to update",
     secretValue: "The new value of the secret.",
     skipMultilineEncoding: "Skip multiline encoding for the secret value.",
     type: "The type of the secret to update.",
-    projectSlug: "The slug of the project to update the secret in.",
     workspaceId: "The ID of the project to update the secret in."
   },
   DELETE: {
@@ -316,7 +313,6 @@ export const RAW_SECRETS = {
     environment: "The slug of the environment where the secret is located.",
     secretPath: "The path of the secret.",
     type: "The type of the secret to delete.",
-    projectSlug: "The slug of the project to delete the secret in.",
     workspaceId: "The ID of the project where the secret is located."
   }
 } as const;

backend/src/server/routes/index.ts

@@ -290,10 +290,6 @@ export const registerRoutes = async (
     projectDAL,
     projectMembershipDAL,
     groupDAL,
-    groupProjectDAL,
-    userGroupMembershipDAL,
-    projectKeyDAL,
-    projectBotDAL,
     permissionService,
     smtpService
   });
@@ -348,11 +344,6 @@ export const registerRoutes = async (
     smtpService,
     authDAL,
     userDAL,
-    userGroupMembershipDAL,
-    projectKeyDAL,
-    projectDAL,
-    projectBotDAL,
-    groupProjectDAL,
     orgDAL,
     orgService,
     licenseService

backend/src/server/routes/v2/organization-router.ts

@@ -44,6 +44,7 @@ export const registerOrgRouter = async (server: FastifyZodProvider) => {
     onRequest: verifyAuth([AuthMode.JWT, AuthMode.API_KEY, AuthMode.IDENTITY_ACCESS_TOKEN]),
     handler: async (req) => {
       if (req.auth.actor !== ActorType.USER) return;
+
       const users = await server.services.org.findAllOrgMembers(
         req.permission.id,
         req.params.organizationId,

backend/src/server/routes/v3/secret-router.ts

@@ -1656,263 +1656,4 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       return { secrets };
     }
   });
-
-  server.route({
-    method: "POST",
-    url: "/batch/raw",
-    config: {
-      rateLimit: secretsLimit
-    },
-    schema: {
-      description: "Create many secrets",
-      security: [
-        {
-          bearerAuth: []
-        }
-      ],
-      body: z.object({
-        projectSlug: z.string().trim().describe(RAW_SECRETS.CREATE.projectSlug),
-        environment: z.string().trim().describe(RAW_SECRETS.CREATE.environment),
-        secretPath: z
-          .string()
-          .trim()
-          .default("/")
-          .transform(removeTrailingSlash)
-          .describe(RAW_SECRETS.CREATE.secretPath),
-        secrets: z
-          .object({
-            secretKey: z.string().trim().describe(RAW_SECRETS.CREATE.secretName),
-            secretValue: z
-              .string()
-              .transform((val) => (val.at(-1) === "\n" ? `${val.trim()}\n` : val.trim()))
-              .describe(RAW_SECRETS.CREATE.secretValue),
-            secretComment: z.string().trim().optional().default("").describe(RAW_SECRETS.CREATE.secretComment),
-            skipMultilineEncoding: z.boolean().optional().describe(RAW_SECRETS.CREATE.skipMultilineEncoding)
-          })
-          .array()
-          .min(1)
-      }),
-      response: {
-        200: z.object({
-          secrets: secretRawSchema.array()
-        })
-      }
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.API_KEY, AuthMode.SERVICE_TOKEN, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    handler: async (req) => {
-      const { environment, projectSlug, secretPath, secrets: inputSecrets } = req.body;
-
-      const secrets = await server.services.secret.createManySecretsRaw({
-        actorId: req.permission.id,
-        actor: req.permission.type,
-        actorAuthMethod: req.permission.authMethod,
-        actorOrgId: req.permission.orgId,
-        secretPath,
-        environment,
-        projectSlug,
-        secrets: inputSecrets
-      });
-
-      await server.services.auditLog.createAuditLog({
-        projectId: secrets[0].workspace,
-        ...req.auditLogInfo,
-        event: {
-          type: EventType.CREATE_SECRETS,
-          metadata: {
-            environment: req.body.environment,
-            secretPath: req.body.secretPath,
-            secrets: secrets.map((secret, i) => ({
-              secretId: secret.id,
-              secretKey: inputSecrets[i].secretKey,
-              secretVersion: secret.version
-            }))
-          }
-        }
-      });
-
-      await server.services.telemetry.sendPostHogEvents({
-        event: PostHogEventTypes.SecretCreated,
-        distinctId: getTelemetryDistinctId(req),
-        properties: {
-          numberOfSecrets: secrets.length,
-          workspaceId: secrets[0].workspace,
-          environment: req.body.environment,
-          secretPath: req.body.secretPath,
-          channel: getUserAgentType(req.headers["user-agent"]),
-          ...req.auditLogInfo
-        }
-      });
-      return { secrets };
-    }
-  });
-
-  server.route({
-    method: "PATCH",
-    url: "/batch/raw",
-    config: {
-      rateLimit: secretsLimit
-    },
-    schema: {
-      description: "Update many secrets",
-      security: [
-        {
-          bearerAuth: []
-        }
-      ],
-      body: z.object({
-        projectSlug: z.string().trim().describe(RAW_SECRETS.UPDATE.projectSlug),
-        environment: z.string().trim().describe(RAW_SECRETS.UPDATE.environment),
-        secretPath: z
-          .string()
-          .trim()
-          .default("/")
-          .transform(removeTrailingSlash)
-          .describe(RAW_SECRETS.UPDATE.secretPath),
-        secrets: z
-          .object({
-            secretKey: z.string().trim().describe(RAW_SECRETS.UPDATE.secretName),
-            secretValue: z
-              .string()
-              .transform((val) => (val.at(-1) === "\n" ? `${val.trim()}\n` : val.trim()))
-              .describe(RAW_SECRETS.UPDATE.secretValue),
-            secretComment: z.string().trim().optional().describe(RAW_SECRETS.UPDATE.secretComment),
-            skipMultilineEncoding: z.boolean().optional().describe(RAW_SECRETS.UPDATE.skipMultilineEncoding)
-          })
-          .array()
-          .min(1)
-      }),
-      response: {
-        200: z.object({
-          secrets: secretRawSchema.array()
-        })
-      }
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.API_KEY, AuthMode.SERVICE_TOKEN, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    handler: async (req) => {
-      const { environment, projectSlug, secretPath, secrets: inputSecrets } = req.body;
-      const secrets = await server.services.secret.updateManySecretsRaw({
-        actorId: req.permission.id,
-        actor: req.permission.type,
-        actorAuthMethod: req.permission.authMethod,
-        actorOrgId: req.permission.orgId,
-        secretPath,
-        environment,
-        projectSlug,
-        secrets: inputSecrets
-      });
-
-      await server.services.auditLog.createAuditLog({
-        projectId: secrets[0].workspace,
-        ...req.auditLogInfo,
-        event: {
-          type: EventType.UPDATE_SECRETS,
-          metadata: {
-            environment: req.body.environment,
-            secretPath: req.body.secretPath,
-            secrets: secrets.map((secret, i) => ({
-              secretId: secret.id,
-              secretKey: inputSecrets[i].secretKey,
-              secretVersion: secret.version
-            }))
-          }
-        }
-      });
-
-      await server.services.telemetry.sendPostHogEvents({
-        event: PostHogEventTypes.SecretUpdated,
-        distinctId: getTelemetryDistinctId(req),
-        properties: {
-          numberOfSecrets: secrets.length,
-          workspaceId: secrets[0].workspace,
-          environment: req.body.environment,
-          secretPath: req.body.secretPath,
-          channel: getUserAgentType(req.headers["user-agent"]),
-          ...req.auditLogInfo
-        }
-      });
-      return { secrets };
-    }
-  });
-
-  server.route({
-    method: "DELETE",
-    url: "/batch/raw",
-    config: {
-      rateLimit: secretsLimit
-    },
-    schema: {
-      description: "Delete many secrets",
-      security: [
-        {
-          bearerAuth: []
-        }
-      ],
-      body: z.object({
-        projectSlug: z.string().trim().describe(RAW_SECRETS.DELETE.projectSlug),
-        environment: z.string().trim().describe(RAW_SECRETS.DELETE.environment),
-        secretPath: z
-          .string()
-          .trim()
-          .default("/")
-          .transform(removeTrailingSlash)
-          .describe(RAW_SECRETS.DELETE.secretPath),
-        secrets: z
-          .object({
-            secretKey: z.string().trim().describe(RAW_SECRETS.DELETE.secretName)
-          })
-          .array()
-          .min(1)
-      }),
-      response: {
-        200: z.object({
-          secrets: secretRawSchema.array()
-        })
-      }
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.API_KEY, AuthMode.SERVICE_TOKEN, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    handler: async (req) => {
-      const { environment, projectSlug, secretPath, secrets: inputSecrets } = req.body;
-      const secrets = await server.services.secret.deleteManySecretsRaw({
-        actorId: req.permission.id,
-        actor: req.permission.type,
-        actorAuthMethod: req.permission.authMethod,
-        actorOrgId: req.permission.orgId,
-        environment,
-        projectSlug,
-        secretPath,
-        secrets: inputSecrets
-      });
-
-      await server.services.auditLog.createAuditLog({
-        projectId: secrets[0].workspace,
-        ...req.auditLogInfo,
-        event: {
-          type: EventType.DELETE_SECRETS,
-          metadata: {
-            environment: req.body.environment,
-            secretPath: req.body.secretPath,
-            secrets: secrets.map((secret, i) => ({
-              secretId: secret.id,
-              secretKey: inputSecrets[i].secretKey,
-              secretVersion: secret.version
-            }))
-          }
-        }
-      });
-
-      await server.services.telemetry.sendPostHogEvents({
-        event: PostHogEventTypes.SecretDeleted,
-        distinctId: getTelemetryDistinctId(req),
-        properties: {
-          numberOfSecrets: secrets.length,
-          workspaceId: secrets[0].workspace,
-          environment: req.body.environment,
-          secretPath: req.body.secretPath,
-          channel: getUserAgentType(req.headers["user-agent"]),
-          ...req.auditLogInfo
-        }
-      });
-      return { secrets };
-    }
-  });
 };

backend/src/services/auth/auth-signup-service.ts

@@ -1,16 +1,10 @@
 import jwt from "jsonwebtoken";
 
 import { OrgMembershipStatus } from "@app/db/schemas";
-import { convertPendingGroupAdditionsToGroupMemberships } from "@app/ee/services/group/group-fns";
-import { TUserGroupMembershipDALFactory } from "@app/ee/services/group/user-group-membership-dal";
 import { TLicenseServiceFactory } from "@app/ee/services/license/license-service";
 import { getConfig } from "@app/lib/config/env";
 import { BadRequestError } from "@app/lib/errors";
 import { isDisposableEmail } from "@app/lib/validator";
-import { TGroupProjectDALFactory } from "@app/services/group-project/group-project-dal";
-import { TProjectDALFactory } from "@app/services/project/project-dal";
-import { TProjectBotDALFactory } from "@app/services/project-bot/project-bot-dal";
-import { TProjectKeyDALFactory } from "@app/services/project-key/project-key-dal";
 
 import { TAuthTokenServiceFactory } from "../auth-token/auth-token-service";
 import { TokenType } from "../auth-token/auth-token-types";
@@ -26,14 +20,6 @@ import { AuthMethod, AuthTokenType } from "./auth-type";
 type TAuthSignupDep = {
   authDAL: TAuthDALFactory;
   userDAL: TUserDALFactory;
-  userGroupMembershipDAL: Pick<
-    TUserGroupMembershipDALFactory,
-    "find" | "transaction" | "insertMany" | "deletePendingUserGroupMembershipsByUserIds"
-  >;
-  projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "findLatestProjectKey" | "insertMany">;
-  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser">;
-  projectBotDAL: Pick<TProjectBotDALFactory, "findOne">;
-  groupProjectDAL: Pick<TGroupProjectDALFactory, "find">;
   orgService: Pick<TOrgServiceFactory, "createOrganization">;
   orgDAL: TOrgDALFactory;
   tokenService: TAuthTokenServiceFactory;
@@ -45,11 +31,6 @@ export type TAuthSignupFactory = ReturnType<typeof authSignupServiceFactory>;
 export const authSignupServiceFactory = ({
   authDAL,
   userDAL,
-  userGroupMembershipDAL,
-  projectKeyDAL,
-  projectDAL,
-  projectBotDAL,
-  groupProjectDAL,
   tokenService,
   smtpService,
   orgService,
@@ -187,16 +168,6 @@ export const authSignupServiceFactory = ({
     const uniqueOrgId = [...new Set(updatedMembersips.map(({ orgId }) => orgId))];
     await Promise.allSettled(uniqueOrgId.map((orgId) => licenseService.updateSubscriptionOrgMemberCount(orgId)));
 
-    await convertPendingGroupAdditionsToGroupMemberships({
-      userIds: [user.id],
-      userDAL,
-      userGroupMembershipDAL,
-      groupProjectDAL,
-      projectKeyDAL,
-      projectDAL,
-      projectBotDAL
-    });
-
     const tokenSession = await tokenService.getUserTokenSession({
       userAgent,
       ip,
@@ -299,17 +270,6 @@ export const authSignupServiceFactory = ({
       const uniqueOrgId = [...new Set(updatedMembersips.map(({ orgId }) => orgId))];
       await Promise.allSettled(uniqueOrgId.map((orgId) => licenseService.updateSubscriptionOrgMemberCount(orgId)));
 
-      await convertPendingGroupAdditionsToGroupMemberships({
-        userIds: [user.id],
-        userDAL,
-        userGroupMembershipDAL,
-        groupProjectDAL,
-        projectKeyDAL,
-        projectDAL,
-        projectBotDAL,
-        tx
-      });
-
       return { info: us, key: userEncKey };
     });
 

backend/src/services/group-project/group-project-service.ts

@@ -32,7 +32,7 @@ type TGroupProjectServiceFactoryDep = {
     TGroupProjectMembershipRoleDALFactory,
     "create" | "transaction" | "insertMany" | "delete"
   >;
-  userGroupMembershipDAL: Pick<TUserGroupMembershipDALFactory, "findGroupMembersNotInProject">;
+  userGroupMembershipDAL: TUserGroupMembershipDALFactory;
   projectDAL: Pick<TProjectDALFactory, "findOne" | "findProjectGhostUser">;
   projectKeyDAL: Pick<TProjectKeyDALFactory, "findLatestProjectKey" | "delete" | "insertMany" | "transaction">;
   projectRoleDAL: Pick<TProjectRoleDALFactory, "find">;
@@ -116,69 +116,68 @@ export const groupProjectServiceFactory = ({
         },
         tx
       );
-
-      // share project key with users in group that have not
-      // individually been added to the project and that are not part of
-      // other groups that are in the project
-      const groupMembers = await userGroupMembershipDAL.findGroupMembersNotInProject(group.id, project.id, tx);
-
-      if (groupMembers.length) {
-        const ghostUser = await projectDAL.findProjectGhostUser(project.id, tx);
-
-        if (!ghostUser) {
-          throw new BadRequestError({
-            message: "Failed to find sudo user"
-          });
-        }
-
-        const ghostUserLatestKey = await projectKeyDAL.findLatestProjectKey(ghostUser.id, project.id, tx);
-
-        if (!ghostUserLatestKey) {
-          throw new BadRequestError({
-            message: "Failed to find sudo user latest key"
-          });
-        }
-
-        const bot = await projectBotDAL.findOne({ projectId: project.id }, tx);
-
-        if (!bot) {
-          throw new BadRequestError({
-            message: "Failed to find bot"
-          });
-        }
-
-        const botPrivateKey = infisicalSymmetricDecrypt({
-          keyEncoding: bot.keyEncoding as SecretKeyEncoding,
-          iv: bot.iv,
-          tag: bot.tag,
-          ciphertext: bot.encryptedPrivateKey
-        });
-
-        const plaintextProjectKey = decryptAsymmetric({
-          ciphertext: ghostUserLatestKey.encryptedKey,
-          nonce: ghostUserLatestKey.nonce,
-          publicKey: ghostUserLatestKey.sender.publicKey,
-          privateKey: botPrivateKey
-        });
-
-        const projectKeyData = groupMembers.map(({ user: { publicKey, id } }) => {
-          const { ciphertext: encryptedKey, nonce } = encryptAsymmetric(plaintextProjectKey, publicKey, botPrivateKey);
-
-          return {
-            encryptedKey,
-            nonce,
-            senderId: ghostUser.id,
-            receiverId: id,
-            projectId: project.id
-          };
-        });
-
-        await projectKeyDAL.insertMany(projectKeyData, tx);
-      }
-
       return groupProjectMembership;
     });
 
+    // share project key with users in group that have not
+    // individually been added to the project and that are not part of
+    // other groups that are in the project
+    const groupMembers = await userGroupMembershipDAL.findGroupMembersNotInProject(group.id, project.id);
+
+    if (groupMembers.length) {
+      const ghostUser = await projectDAL.findProjectGhostUser(project.id);
+
+      if (!ghostUser) {
+        throw new BadRequestError({
+          message: "Failed to find sudo user"
+        });
+      }
+
+      const ghostUserLatestKey = await projectKeyDAL.findLatestProjectKey(ghostUser.id, project.id);
+
+      if (!ghostUserLatestKey) {
+        throw new BadRequestError({
+          message: "Failed to find sudo user latest key"
+        });
+      }
+
+      const bot = await projectBotDAL.findOne({ projectId: project.id });
+
+      if (!bot) {
+        throw new BadRequestError({
+          message: "Failed to find bot"
+        });
+      }
+
+      const botPrivateKey = infisicalSymmetricDecrypt({
+        keyEncoding: bot.keyEncoding as SecretKeyEncoding,
+        iv: bot.iv,
+        tag: bot.tag,
+        ciphertext: bot.encryptedPrivateKey
+      });
+
+      const plaintextProjectKey = decryptAsymmetric({
+        ciphertext: ghostUserLatestKey.encryptedKey,
+        nonce: ghostUserLatestKey.nonce,
+        publicKey: ghostUserLatestKey.sender.publicKey,
+        privateKey: botPrivateKey
+      });
+
+      const projectKeyData = groupMembers.map(({ user: { publicKey, id } }) => {
+        const { ciphertext: encryptedKey, nonce } = encryptAsymmetric(plaintextProjectKey, publicKey, botPrivateKey);
+
+        return {
+          encryptedKey,
+          nonce,
+          senderId: ghostUser.id,
+          receiverId: id,
+          projectId: project.id
+        };
+      });
+
+      await projectKeyDAL.insertMany(projectKeyData);
+    }
+
     return projectGroup;
   };
 
@@ -288,26 +287,20 @@ export const groupProjectServiceFactory = ({
     );
     ForbiddenError.from(permission).throwUnlessCan(ProjectPermissionActions.Delete, ProjectPermissionSub.Groups);
 
-    const deletedProjectGroup = await groupProjectDAL.transaction(async (tx) => {
-      const groupMembers = await userGroupMembershipDAL.findGroupMembersNotInProject(group.id, project.id, tx);
+    const groupMembers = await userGroupMembershipDAL.findGroupMembersNotInProject(group.id, project.id);
 
-      if (groupMembers.length) {
-        await projectKeyDAL.delete(
-          {
-            projectId: project.id,
-            $in: {
-              receiverId: groupMembers.map(({ user: { id } }) => id)
-            }
-          },
-          tx
-        );
-      }
+    if (groupMembers.length) {
+      await projectKeyDAL.delete({
+        projectId: project.id,
+        $in: {
+          receiverId: groupMembers.map(({ user: { id } }) => id)
+        }
+      });
+    }
 
-      const [projectGroup] = await groupProjectDAL.delete({ groupId: group.id, projectId: project.id }, tx);
-      return projectGroup;
-    });
+    const [deletedGroup] = await groupProjectDAL.delete({ groupId: group.id, projectId: project.id });
 
-    return deletedProjectGroup;
+    return deletedGroup;
   };
 
   const listGroupsInProject = async ({

backend/src/services/org/org-dal.ts

@@ -89,25 +89,6 @@ export const orgDALFactory = (db: TDbClient) => {
     }
   };
 
-  const countAllOrgMembers = async (orgId: string) => {
-    try {
-      interface CountResult {
-        count: string;
-      }
-
-      const count = await db(TableName.OrgMembership)
-        .where(`${TableName.OrgMembership}.orgId`, orgId)
-        .count("*")
-        .join(TableName.Users, `${TableName.OrgMembership}.userId`, `${TableName.Users}.id`)
-        .where({ isGhost: false })
-        .first();
-
-      return parseInt((count as unknown as CountResult).count || "0", 10);
-    } catch (error) {
-      throw new DatabaseError({ error, name: "Count all org members" });
-    }
-  };
-
   const findOrgMembersByUsername = async (orgId: string, usernames: string[]) => {
     try {
       const members = await db(TableName.OrgMembership)
@@ -288,7 +269,6 @@ export const orgDALFactory = (db: TDbClient) => {
     ...orgOrm,
     findOrgByProjectId,
     findAllOrgMembers,
-    countAllOrgMembers,
     findOrgById,
     findAllOrgsByUserId,
     ghostUserExists,

backend/src/services/org/org-service.ts

@@ -248,7 +248,7 @@ export const orgServiceFactory = ({
       ForbiddenError.from(permission).throwUnlessCan(OrgPermissionActions.Edit, OrgPermissionSubjects.Scim);
     }
 
-    if (authEnforced) {
+    if (authEnforced || scimEnabled) {
       const samlCfg = await samlConfigDAL.findEnforceableSamlCfg(orgId);
       if (!samlCfg)
         throw new BadRequestError({

backend/src/services/project/project-dal.ts

@@ -81,9 +81,9 @@ export const projectDALFactory = (db: TDbClient) => {
     }
   };
 
-  const findProjectGhostUser = async (projectId: string, tx?: Knex) => {
+  const findProjectGhostUser = async (projectId: string) => {
     try {
-      const ghostUser = await (tx || db)(TableName.ProjectMembership)
+      const ghostUser = await db(TableName.ProjectMembership)
         .where({ projectId })
         .join(TableName.Users, `${TableName.ProjectMembership}.userId`, `${TableName.Users}.id`)
         .select(selectAllTableCols(TableName.Users))

backend/src/services/secret/secret-fns.ts

@@ -575,11 +575,7 @@ export const createManySecretsRawFnFactory = ({
     await projectDAL.checkProjectUpgradeStatus(projectId);
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, secretPath);
-    if (!folder)
-      throw new BadRequestError({
-        message: "Folder not found for the given environment slug & secret path",
-        name: "Create secret"
-      });
+    if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "Create secret" });
     const folderId = folder.id;
 
     const blindIndexCfg = await secretBlindIndexDAL.findOne({ projectId });
@@ -684,11 +680,7 @@ export const updateManySecretsRawFnFactory = ({
     await projectDAL.checkProjectUpgradeStatus(projectId);
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, secretPath);
-    if (!folder)
-      throw new BadRequestError({
-        message: "Folder not found for the given environment slug & secret path",
-        name: "Update secret"
-      });
+    if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "Update secret" });
     const folderId = folder.id;
 
     const blindIndexCfg = await secretBlindIndexDAL.findOne({ projectId });

backend/src/services/secret/secret-service.ts

@@ -33,11 +33,9 @@ import { TSecretQueueFactory } from "./secret-queue";
 import {
   TAttachSecretTagsDTO,
   TCreateBulkSecretDTO,
-  TCreateManySecretRawDTO,
   TCreateSecretDTO,
   TCreateSecretRawDTO,
   TDeleteBulkSecretDTO,
-  TDeleteManySecretRawDTO,
   TDeleteSecretDTO,
   TDeleteSecretRawDTO,
   TFnSecretBlindIndexCheckV2,
@@ -48,7 +46,6 @@ import {
   TGetSecretsRawDTO,
   TGetSecretVersionsDTO,
   TUpdateBulkSecretDTO,
-  TUpdateManySecretRawDTO,
   TUpdateSecretDTO,
   TUpdateSecretRawDTO
 } from "./secret-types";
@@ -182,11 +179,7 @@ export const secretServiceFactory = ({
     await projectDAL.checkProjectUpgradeStatus(projectId);
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
-    if (!folder)
-      throw new BadRequestError({
-        message: "Folder not found for the given environment slug & secret path",
-        name: "Create secret"
-      });
+    if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "Create secret" });
     const folderId = folder.id;
 
     const blindIndexCfg = await secretBlindIndexDAL.findOne({ projectId });
@@ -282,11 +275,7 @@ export const secretServiceFactory = ({
     }
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
-    if (!folder)
-      throw new BadRequestError({
-        message: "Folder not found for the given environment slug & secret path",
-        name: "Create secret"
-      });
+    if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "Create secret" });
     const folderId = folder.id;
 
     const blindIndexCfg = await secretBlindIndexDAL.findOne({ projectId });
@@ -402,11 +391,7 @@ export const secretServiceFactory = ({
     await projectDAL.checkProjectUpgradeStatus(projectId);
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
-    if (!folder)
-      throw new BadRequestError({
-        message: "Folder not found for the given environment slug & secret path",
-        name: "Create secret"
-      });
+    if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "Create secret" });
     const folderId = folder.id;
 
     const blindIndexCfg = await secretBlindIndexDAL.findOne({ projectId });
@@ -574,11 +559,7 @@ export const secretServiceFactory = ({
       subject(ProjectPermissionSub.Secrets, { environment, secretPath: path })
     );
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
-    if (!folder)
-      throw new BadRequestError({
-        message: "Folder not found for the given environment slug & secret path",
-        name: "Create secret"
-      });
+    if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "Create secret" });
     const folderId = folder.id;
 
     const secretBlindIndex = await interalGenSecBlindIndexByName(projectId, secretName);
@@ -674,11 +655,7 @@ export const secretServiceFactory = ({
     await projectDAL.checkProjectUpgradeStatus(projectId);
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
-    if (!folder)
-      throw new BadRequestError({
-        message: "Folder not found for the given environment slug & secret path",
-        name: "Create secret"
-      });
+    if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "Create secret" });
     const folderId = folder.id;
 
     const blindIndexCfg = await secretBlindIndexDAL.findOne({ projectId });
@@ -747,11 +724,7 @@ export const secretServiceFactory = ({
     await projectDAL.checkProjectUpgradeStatus(projectId);
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
-    if (!folder)
-      throw new BadRequestError({
-        message: "Folder not found for the given environment slug & secret path",
-        name: "Update secret"
-      });
+    if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "Update secret" });
     const folderId = folder.id;
 
     const blindIndexCfg = await secretBlindIndexDAL.findOne({ projectId });
@@ -837,11 +810,7 @@ export const secretServiceFactory = ({
     await projectDAL.checkProjectUpgradeStatus(projectId);
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
-    if (!folder)
-      throw new BadRequestError({
-        message: "Folder not found for the given environment slug & secret path",
-        name: "Create secret"
-      });
+    if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "Create secret" });
     const folderId = folder.id;
 
     const blindIndexCfg = await secretBlindIndexDAL.findOne({ projectId });
@@ -1067,143 +1036,6 @@ export const secretServiceFactory = ({
     return decryptSecretRaw(secret, botKey);
   };
 
-  const createManySecretsRaw = async ({
-    actorId,
-    projectSlug,
-    environment,
-    actor,
-    actorOrgId,
-    actorAuthMethod,
-    secretPath,
-    secrets: inputSecrets = []
-  }: TCreateManySecretRawDTO) => {
-    const project = await projectDAL.findProjectBySlug(projectSlug, actorOrgId);
-    if (!project) throw new BadRequestError({ message: "Project not found" });
-    const projectId = project.id;
-
-    const botKey = await projectBotService.getBotKey(projectId);
-    if (!botKey) throw new BadRequestError({ message: "Project bot not found", name: "bot_not_found_error" });
-
-    const secrets = await createManySecret({
-      projectId,
-      environment,
-      path: secretPath,
-      actor,
-      actorId,
-      actorOrgId,
-      actorAuthMethod,
-      secrets: inputSecrets.map(({ secretComment, secretKey, secretValue, skipMultilineEncoding }) => {
-        const secretKeyEncrypted = encryptSymmetric128BitHexKeyUTF8(secretKey, botKey);
-        const secretValueEncrypted = encryptSymmetric128BitHexKeyUTF8(secretValue || "", botKey);
-        const secretCommentEncrypted = encryptSymmetric128BitHexKeyUTF8(secretComment || "", botKey);
-        return {
-          secretName: secretKey,
-          skipMultilineEncoding,
-          secretKeyCiphertext: secretKeyEncrypted.ciphertext,
-          secretKeyIV: secretKeyEncrypted.iv,
-          secretKeyTag: secretKeyEncrypted.tag,
-          secretValueCiphertext: secretValueEncrypted.ciphertext,
-          secretValueIV: secretValueEncrypted.iv,
-          secretValueTag: secretValueEncrypted.tag,
-          secretCommentCiphertext: secretCommentEncrypted.ciphertext,
-          secretCommentIV: secretCommentEncrypted.iv,
-          secretCommentTag: secretCommentEncrypted.tag
-        };
-      })
-    });
-
-    await snapshotService.performSnapshot(secrets[0].folderId);
-    await secretQueueService.syncSecrets({ secretPath, projectId, environment });
-
-    return secrets.map((secret) => decryptSecretRaw({ ...secret, workspace: projectId, environment }, botKey));
-  };
-
-  const updateManySecretsRaw = async ({
-    actorId,
-    projectSlug,
-    environment,
-    actor,
-    actorOrgId,
-    actorAuthMethod,
-    secretPath,
-    secrets: inputSecrets = []
-  }: TUpdateManySecretRawDTO) => {
-    const project = await projectDAL.findProjectBySlug(projectSlug, actorOrgId);
-    if (!project) throw new BadRequestError({ message: "Project not found" });
-    const projectId = project.id;
-
-    const botKey = await projectBotService.getBotKey(projectId);
-    if (!botKey) throw new BadRequestError({ message: "Project bot not found", name: "bot_not_found_error" });
-
-    const secrets = await updateManySecret({
-      projectId,
-      environment,
-      path: secretPath,
-      actor,
-      actorId,
-      actorOrgId,
-      actorAuthMethod,
-      secrets: inputSecrets.map(({ secretComment, secretKey, secretValue, skipMultilineEncoding }) => {
-        const secretKeyEncrypted = encryptSymmetric128BitHexKeyUTF8(secretKey, botKey);
-        const secretValueEncrypted = encryptSymmetric128BitHexKeyUTF8(secretValue || "", botKey);
-        const secretCommentEncrypted = encryptSymmetric128BitHexKeyUTF8(secretComment || "", botKey);
-        return {
-          secretName: secretKey,
-          type: SecretType.Shared,
-          skipMultilineEncoding,
-          secretKeyCiphertext: secretKeyEncrypted.ciphertext,
-          secretKeyIV: secretKeyEncrypted.iv,
-          secretKeyTag: secretKeyEncrypted.tag,
-          secretValueCiphertext: secretValueEncrypted.ciphertext,
-          secretValueIV: secretValueEncrypted.iv,
-          secretValueTag: secretValueEncrypted.tag,
-          secretCommentCiphertext: secretCommentEncrypted.ciphertext,
-          secretCommentIV: secretCommentEncrypted.iv,
-          secretCommentTag: secretCommentEncrypted.tag
-        };
-      })
-    });
-
-    await snapshotService.performSnapshot(secrets[0].folderId);
-    await secretQueueService.syncSecrets({ secretPath, projectId, environment });
-
-    return secrets.map((secret) => decryptSecretRaw({ ...secret, workspace: projectId, environment }, botKey));
-  };
-
-  const deleteManySecretsRaw = async ({
-    actorId,
-    projectSlug,
-    environment,
-    actor,
-    actorOrgId,
-    actorAuthMethod,
-    secretPath,
-    secrets: inputSecrets = []
-  }: TDeleteManySecretRawDTO) => {
-    const project = await projectDAL.findProjectBySlug(projectSlug, actorOrgId);
-    if (!project) throw new BadRequestError({ message: "Project not found" });
-    const projectId = project.id;
-
-    const botKey = await projectBotService.getBotKey(projectId);
-    if (!botKey) throw new BadRequestError({ message: "Project bot not found", name: "bot_not_found_error" });
-
-    const secrets = await deleteManySecret({
-      projectId,
-      environment,
-      path: secretPath,
-      actor,
-      actorId,
-      actorOrgId,
-      actorAuthMethod,
-      secrets: inputSecrets.map(({ secretKey }) => ({ secretName: secretKey, type: SecretType.Shared }))
-    });
-
-    await snapshotService.performSnapshot(secrets[0].folderId);
-    await secretQueueService.syncSecrets({ secretPath, projectId, environment });
-
-    return secrets.map((secret) => decryptSecretRaw({ ...secret, workspace: projectId, environment }, botKey));
-  };
-
   const getSecretVersions = async ({
     actorId,
     actor,
@@ -1448,9 +1280,6 @@ export const secretServiceFactory = ({
     createSecretRaw,
     updateSecretRaw,
     deleteSecretRaw,
-    createManySecretsRaw,
-    updateManySecretsRaw,
-    deleteManySecretsRaw,
     getSecretVersions,
     // external services function
     fnSecretBulkDelete,

backend/src/services/secret/secret-types.ts

@@ -181,39 +181,6 @@ export type TDeleteSecretRawDTO = TProjectPermission & {
   type: SecretType;
 };
 
-export type TCreateManySecretRawDTO = Omit<TProjectPermission, "projectId"> & {
-  secretPath: string;
-  projectSlug: string;
-  environment: string;
-  secrets: {
-    secretKey: string;
-    secretValue: string;
-    secretComment?: string;
-    skipMultilineEncoding?: boolean;
-  }[];
-};
-
-export type TUpdateManySecretRawDTO = Omit<TProjectPermission, "projectId"> & {
-  secretPath: string;
-  projectSlug: string;
-  environment: string;
-  secrets: {
-    secretKey: string;
-    secretValue: string;
-    secretComment?: string;
-    skipMultilineEncoding?: boolean;
-  }[];
-};
-
-export type TDeleteManySecretRawDTO = Omit<TProjectPermission, "projectId"> & {
-  secretPath: string;
-  projectSlug: string;
-  environment: string;
-  secrets: {
-    secretKey: string;
-  }[];
-};
-
 export type TGetSecretVersionsDTO = Omit<TProjectPermission, "projectId"> & {
   limit?: number;
   offset?: number;

backend/src/services/user/user-dal.ts

@@ -34,19 +34,6 @@ export const userDALFactory = (db: TDbClient) => {
     }
   };
 
-  const findUserEncKeyByUserIdsBatch = async ({ userIds }: { userIds: string[] }, tx?: Knex) => {
-    try {
-      return await (tx || db)(TableName.Users)
-        .where({
-          isGhost: false
-        })
-        .whereIn(`${TableName.Users}.id`, userIds)
-        .join(TableName.UserEncryptionKey, `${TableName.Users}.id`, `${TableName.UserEncryptionKey}.userId`);
-    } catch (error) {
-      throw new DatabaseError({ error, name: "Find user enc by user ids batch" });
-    }
-  };
-
   const findUserEncKeyByUserId = async (userId: string) => {
     try {
       const user = await db(TableName.Users)
@@ -136,7 +123,6 @@ export const userDALFactory = (db: TDbClient) => {
     ...userOrm,
     findUserByUsername,
     findUserEncKeyByUsername,
-    findUserEncKeyByUserIdsBatch,
     findUserEncKeyByUserId,
     updateUserEncryptionByUserId,
     findUserByProjectMembershipId,

cli/go.mod

@@ -29,7 +29,6 @@ require (
 require (
 	github.com/alessio/shellescape v1.4.1 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
-	github.com/bradleyjkemp/cupaloy/v2 v2.8.0 // indirect
 	github.com/chzyer/readline v1.5.1 // indirect
 	github.com/danieljoos/wincred v1.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect

cli/go.sum

@@ -51,8 +51,6 @@ github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef h1:46PFijGL
 github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
-github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M=
-github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/charmbracelet/lipgloss v0.5.0 h1:lulQHuVeodSgDez+3rGiuxlPVXSnhth442DATR2/8t8=
 github.com/charmbracelet/lipgloss v0.5.0/go.mod h1:EZLha/HbzEt7cYqdFPovlqy5FZPj0xFhg5SaqxScmgs=
@@ -326,7 +324,6 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44=
 github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=

cli/packages/api/api.go

@@ -512,23 +512,16 @@ func CallUniversalAuthRefreshAccessToken(httpClient *resty.Client, request Unive
 
 func CallGetRawSecretsV3(httpClient *resty.Client, request GetRawSecretsV3Request) (GetRawSecretsV3Response, error) {
 	var getRawSecretsV3Response GetRawSecretsV3Response
-	req := httpClient.
+	response, err := httpClient.
 		R().
 		SetResult(&getRawSecretsV3Response).
 		SetHeader("User-Agent", USER_AGENT).
 		SetBody(request).
 		SetQueryParam("workspaceId", request.WorkspaceId).
 		SetQueryParam("environment", request.Environment).
-		SetQueryParam("secretPath", request.SecretPath)
-
-	if request.IncludeImport {
-		req.SetQueryParam("include_imports", "true")
-	}
-	if request.Recursive {
-		req.SetQueryParam("recursive", "true")
-	}
-
-	response, err := req.Get(fmt.Sprintf("%v/v3/secrets/raw", config.INFISICAL_URL))
+		SetQueryParam("secretPath", request.SecretPath).
+		SetQueryParam("include_imports", "false").
+		Get(fmt.Sprintf("%v/v3/secrets/raw", config.INFISICAL_URL))
 
 	if err != nil {
 		return GetRawSecretsV3Response{}, fmt.Errorf("CallGetRawSecretsV3: Unable to complete api request [err=%w]", err)

cli/packages/api/model.go

@@ -371,22 +371,6 @@ type ImportedSecretV3 struct {
 	Secrets     []EncryptedSecretV3 `json:"secrets"`
 }
 
-type ImportedRawSecretV3 struct {
-	SecretPath  string `json:"secretPath"`
-	Environment string `json:"environment"`
-	FolderId    string `json:"folderId"`
-	Secrets     []struct {
-		ID            string `json:"id"`
-		Workspace     string `json:"workspace"`
-		Environment   string `json:"environment"`
-		Version       int    `json:"version"`
-		Type          string `json:"type"`
-		SecretKey     string `json:"secretKey"`
-		SecretValue   string `json:"secretValue"`
-		SecretComment string `json:"secretComment"`
-	} `json:"secrets"`
-}
-
 type GetEncryptedSecretsV3Response struct {
 	Secrets         []EncryptedSecretV3 `json:"secrets"`
 	ImportedSecrets []ImportedSecretV3  `json:"imports,omitempty"`
@@ -558,6 +542,6 @@ type GetRawSecretsV3Response struct {
 		SecretValue   string `json:"secretValue"`
 		SecretComment string `json:"secretComment"`
 	} `json:"secrets"`
-	Imports []ImportedRawSecretV3 `json:"imports"`
+	Imports []any `json:"imports"`
 	ETag    string
 }

cli/packages/cmd/export.go

@@ -149,8 +149,6 @@ var exportCmd = &cobra.Command{
 			secrets = util.ExpandSecrets(secrets, authParams, "")
 		}
 		secrets = util.FilterSecretsByTag(secrets, tagSlugs)
-		secrets = util.SortSecretsByKeys(secrets)
-
 		output, err = formatEnvs(secrets, format)
 		if err != nil {
 			util.HandleError(err)

cli/packages/cmd/folder.go

@@ -22,6 +22,10 @@ var folderCmd = &cobra.Command{
 var getCmd = &cobra.Command{
 	Use:   "get",
 	Short: "Get folders in a directory",
+	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		util.RequireLocalWorkspaceFile()
+		util.RequireLogin()
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 
 		environmentName, _ := cmd.Flags().GetString("env")

cli/packages/cmd/secrets.go

@@ -7,7 +7,6 @@ import (
 	"crypto/sha256"
 	"encoding/base64"
 	"fmt"
-	"os"
 	"regexp"
 	"sort"
 	"strings"
@@ -117,9 +116,6 @@ var secretsCmd = &cobra.Command{
 			secrets = util.ExpandSecrets(secrets, authParams, "")
 		}
 
-		// Sort the secrets by key so we can create a consistent output
-		secrets = util.SortSecretsByKeys(secrets)
-
 		visualize.PrintAllSecretDetails(secrets)
 		Telemetry.CaptureEvent("cli-command:secrets", posthog.NewProperties().Set("secretCount", len(secrets)).Set("version", util.CLI_VERSION))
 	},
@@ -205,10 +201,8 @@ var secretsSetCmd = &cobra.Command{
 		// decrypt workspace key
 		plainTextEncryptionKey := crypto.DecryptAsymmetric(encryptedWorkspaceKey, encryptedWorkspaceKeyNonce, encryptedWorkspaceKeySenderPublicKey, currentUsersPrivateKey)
 
-		infisicalTokenEnv := os.Getenv(util.INFISICAL_TOKEN_NAME)
-
 		// pull current secrets
-		secrets, err := util.GetAllEnvironmentVariables(models.GetAllSecretsParameters{Environment: environmentName, SecretsPath: secretsPath, InfisicalToken: infisicalTokenEnv}, "")
+		secrets, err := util.GetAllEnvironmentVariables(models.GetAllSecretsParameters{Environment: environmentName, SecretsPath: secretsPath}, "")
 		if err != nil {
 			util.HandleError(err, "unable to retrieve secrets")
 		}

cli/packages/util/folders.go

@@ -2,6 +2,7 @@ package util
 
 import (
 	"fmt"
+	"os"
 	"strings"
 
 	"github.com/Infisical/infisical-merge/packages/api"
@@ -12,11 +13,13 @@ import (
 
 func GetAllFolders(params models.GetAllFoldersParameters) ([]models.SingleFolder, error) {
 
+	if params.InfisicalToken == "" {
+		params.InfisicalToken = os.Getenv(INFISICAL_TOKEN_NAME)
+	}
+
 	var foldersToReturn []models.SingleFolder
 	var folderErr error
 	if params.InfisicalToken == "" && params.UniversalAuthAccessToken == "" {
-		RequireLogin()
-		RequireLocalWorkspaceFile()
 
 		log.Debug().Msg("GetAllFolders: Trying to fetch folders using logged in details")
 

cli/packages/util/helper.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"os/exec"
 	"path"
-	"sort"
 	"strings"
 	"time"
 
@@ -54,14 +53,6 @@ func GetBase64DecodedSymmetricEncryptionDetails(key string, cipher string, IV st
 	}, nil
 }
 
-// Helper function to sort the secrets by key so we can create a consistent output
-func SortSecretsByKeys(secrets []models.SingleEnvironmentVariable) []models.SingleEnvironmentVariable {
-	sort.Slice(secrets, func(i, j int) bool {
-		return secrets[i].Key < secrets[j].Key
-	})
-	return secrets
-}
-
 func IsSecretEnvironmentValid(env string) bool {
 	if env == "prod" || env == "dev" || env == "test" || env == "staging" {
 		return true

cli/packages/util/secrets.go

@@ -186,12 +186,12 @@ func GetPlainTextSecretsViaMachineIdentity(accessToken string, workspaceId strin
 		plainTextSecrets = append(plainTextSecrets, models.SingleEnvironmentVariable{Key: secret.SecretKey, Value: secret.SecretValue, Type: secret.Type, WorkspaceId: secret.Workspace})
 	}
 
-	if includeImports {
-		plainTextSecrets, err = InjectRawImportedSecret(plainTextSecrets, rawSecrets.Imports)
-		if err != nil {
-			return models.PlaintextSecretResult{}, err
-		}
-	}
+	// if includeImports {
+	// 	plainTextSecrets, err = InjectImportedSecret(plainTextWorkspaceKey, plainTextSecrets, encryptedSecrets.ImportedSecrets)
+	// 	if err != nil {
+	// 		return nil, err
+	// 	}
+	// }
 
 	return models.PlaintextSecretResult{
 		Secrets: plainTextSecrets,
@@ -252,36 +252,6 @@ func InjectImportedSecret(plainTextWorkspaceKey []byte, secrets []models.SingleE
 	return secrets, nil
 }
 
-func InjectRawImportedSecret(secrets []models.SingleEnvironmentVariable, importedSecrets []api.ImportedRawSecretV3) ([]models.SingleEnvironmentVariable, error) {
-	if importedSecrets == nil {
-		return secrets, nil
-	}
-
-	hasOverriden := make(map[string]bool)
-	for _, sec := range secrets {
-		hasOverriden[sec.Key] = true
-	}
-
-	for i := len(importedSecrets) - 1; i >= 0; i-- {
-		importSec := importedSecrets[i]
-		plainTextImportedSecrets := importSec.Secrets
-
-		for _, sec := range plainTextImportedSecrets {
-			if _, ok := hasOverriden[sec.SecretKey]; !ok {
-				secrets = append(secrets, models.SingleEnvironmentVariable{
-					Key:         sec.SecretKey,
-					WorkspaceId: sec.Workspace,
-					Value:       sec.SecretValue,
-					Type:        sec.Type,
-					ID:          sec.ID,
-				})
-				hasOverriden[sec.SecretKey] = true
-			}
-		}
-	}
-	return secrets, nil
-}
-
 func FilterSecretsByTag(plainTextSecrets []models.SingleEnvironmentVariable, tagSlugs string) []models.SingleEnvironmentVariable {
 	if tagSlugs == "" {
 		return plainTextSecrets
@@ -307,6 +277,10 @@ func FilterSecretsByTag(plainTextSecrets []models.SingleEnvironmentVariable, tag
 }
 
 func GetAllEnvironmentVariables(params models.GetAllSecretsParameters, projectConfigFilePath string) ([]models.SingleEnvironmentVariable, error) {
+	if params.InfisicalToken == "" {
+		params.InfisicalToken = os.Getenv(INFISICAL_TOKEN_NAME)
+	}
+
 	isConnected := CheckIsConnectedToInternet()
 	var secretsToReturn []models.SingleEnvironmentVariable
 	// var serviceTokenDetails api.GetServiceTokenDetailsResponse

cli/test/.snapshots/test-TestServiceToken_ExportSecretsWithImports

@@ -1,5 +0,0 @@
-STAGING-SECRET-1='staging-value-1'
-STAGING-SECRET-2='staging-value-2'
-TEST-SECRET-1='test-value-1'
-TEST-SECRET-2='test-value-2'
-TEST-SECRET-3='test-value-3'

cli/test/.snapshots/test-TestServiceToken_ExportSecretsWithoutImports

@@ -1,3 +0,0 @@
-TEST-SECRET-1='test-value-1'
-TEST-SECRET-2='test-value-2'
-TEST-SECRET-3='test-value-3'

cli/test/.snapshots/test-TestServiceToken_GetSecretsByNameRecursive

@@ -1,7 +0,0 @@
-┌─────────────────┬────────────────┬─────────────┐
-│ SECRET NAME     │ SECRET VALUE   │ SECRET TYPE │
-├─────────────────┼────────────────┼─────────────┤
-│ TEST-SECRET-1   │ test-value-1   │ shared      │
-│ TEST-SECRET-2   │ test-value-2   │ shared      │
-│ FOLDER-SECRET-1 │ folder-value-1 │ shared      │
-└─────────────────┴────────────────┴─────────────┘

cli/test/.snapshots/test-TestServiceToken_GetSecretsByNameWithImports

@@ -1,7 +0,0 @@
-┌──────────────────┬─────────────────┬─────────────┐
-│ SECRET NAME      │ SECRET VALUE    │ SECRET TYPE │
-├──────────────────┼─────────────────┼─────────────┤
-│ TEST-SECRET-1    │ test-value-1    │ shared      │
-│ STAGING-SECRET-2 │ staging-value-2 │ shared      │
-│ FOLDER-SECRET-1  │ folder-value-1  │ shared      │
-└──────────────────┴─────────────────┴─────────────┘

cli/test/.snapshots/test-TestServiceToken_GetSecretsByNameWithNotFoundSecret

@@ -1,8 +0,0 @@
-┌─────────────────┬────────────────┬─────────────┐
-│ SECRET NAME     │ SECRET VALUE   │ SECRET TYPE │
-├─────────────────┼────────────────┼─────────────┤
-│ TEST-SECRET-1   │ test-value-1   │ shared      │
-│ TEST-SECRET-2   │ test-value-2   │ shared      │
-│ FOLDER-SECRET-1 │ folder-value-1 │ shared      │
-│ DOES-NOT-EXIST  │ *not found*    │ *not found* │
-└─────────────────┴────────────────┴─────────────┘

cli/test/.snapshots/test-TestServiceToken_RunCmdRecursiveAndImports

@@ -1,2 +0,0 @@
- Injecting 6 Infisical secrets into your application process
-hello world

cli/test/.snapshots/test-TestServiceToken_RunCmdWithImports

@@ -1,2 +0,0 @@
- Injecting 5 Infisical secrets into your application process
-hello world

cli/test/.snapshots/test-TestServiceToken_RunCmdWithoutImports

@@ -1,2 +0,0 @@
- Injecting 3 Infisical secrets into your application process
-hello world

cli/test/.snapshots/test-TestServiceToken_SecretsGetWithImportsAndRecursiveCmd

@@ -1,10 +0,0 @@
-┌──────────────────┬─────────────────┬─────────────┐
-│ SECRET NAME      │ SECRET VALUE    │ SECRET TYPE │
-├──────────────────┼─────────────────┼─────────────┤
-│ FOLDER-SECRET-1  │ folder-value-1  │ shared      │
-│ STAGING-SECRET-1 │ staging-value-1 │ shared      │
-│ STAGING-SECRET-2 │ staging-value-2 │ shared      │
-│ TEST-SECRET-1    │ test-value-1    │ shared      │
-│ TEST-SECRET-2    │ test-value-2    │ shared      │
-│ TEST-SECRET-3    │ test-value-3    │ shared      │
-└──────────────────┴─────────────────┴─────────────┘

cli/test/.snapshots/test-TestServiceToken_SecretsGetWithoutImportsAndWithoutRecursiveCmd

@@ -1,7 +0,0 @@
-┌───────────────┬──────────────┬─────────────┐
-│ SECRET NAME   │ SECRET VALUE │ SECRET TYPE │
-├───────────────┼──────────────┼─────────────┤
-│ TEST-SECRET-1 │ test-value-1 │ shared      │
-│ TEST-SECRET-2 │ test-value-2 │ shared      │
-│ TEST-SECRET-3 │ test-value-3 │ shared      │
-└───────────────┴──────────────┴─────────────┘

cli/test/.snapshots/test-TestUniversalAuth_ExportSecretsWithImports

@@ -1,5 +0,0 @@
-STAGING-SECRET-1='staging-value-1'
-STAGING-SECRET-2='staging-value-2'
-TEST-SECRET-1='test-value-1'
-TEST-SECRET-2='test-value-2'
-TEST-SECRET-3='test-value-3'

cli/test/.snapshots/test-TestUniversalAuth_ExportSecretsWithoutImports

@@ -1,3 +0,0 @@
-TEST-SECRET-1='test-value-1'
-TEST-SECRET-2='test-value-2'
-TEST-SECRET-3='test-value-3'

cli/test/.snapshots/test-TestUniversalAuth_GetSecretsByNameRecursive

@@ -1,7 +0,0 @@
-┌─────────────────┬────────────────┬─────────────┐
-│ SECRET NAME     │ SECRET VALUE   │ SECRET TYPE │
-├─────────────────┼────────────────┼─────────────┤
-│ TEST-SECRET-1   │ test-value-1   │ shared      │
-│ TEST-SECRET-2   │ test-value-2   │ shared      │
-│ FOLDER-SECRET-1 │ folder-value-1 │ shared      │
-└─────────────────┴────────────────┴─────────────┘

cli/test/.snapshots/test-TestUniversalAuth_GetSecretsByNameWithImports

@@ -1,7 +0,0 @@
-┌──────────────────┬─────────────────┬─────────────┐
-│ SECRET NAME      │ SECRET VALUE    │ SECRET TYPE │
-├──────────────────┼─────────────────┼─────────────┤
-│ TEST-SECRET-1    │ test-value-1    │ shared      │
-│ STAGING-SECRET-2 │ staging-value-2 │ shared      │
-│ FOLDER-SECRET-1  │ folder-value-1  │ shared      │
-└──────────────────┴─────────────────┴─────────────┘

cli/test/.snapshots/test-TestUniversalAuth_GetSecretsByNameWithNotFoundSecret

@@ -1,8 +0,0 @@
-┌─────────────────┬────────────────┬─────────────┐
-│ SECRET NAME     │ SECRET VALUE   │ SECRET TYPE │
-├─────────────────┼────────────────┼─────────────┤
-│ TEST-SECRET-1   │ test-value-1   │ shared      │
-│ TEST-SECRET-2   │ test-value-2   │ shared      │
-│ FOLDER-SECRET-1 │ folder-value-1 │ shared      │
-│ DOES-NOT-EXIST  │ *not found*    │ *not found* │
-└─────────────────┴────────────────┴─────────────┘

cli/test/.snapshots/test-TestUniversalAuth_RunCmdRecursiveAndImports

@@ -1,2 +0,0 @@
- Injecting 6 Infisical secrets into your application process
-hello world

cli/test/.snapshots/test-TestUniversalAuth_RunCmdWithImports

@@ -1,2 +0,0 @@
- Injecting 5 Infisical secrets into your application process
-hello world

cli/test/.snapshots/test-TestUniversalAuth_RunCmdWithoutImports

@@ -1,2 +0,0 @@
- Injecting 3 Infisical secrets into your application process
-hello world

cli/test/.snapshots/test-TestUniversalAuth_SecretsGetWithImportsAndRecursiveCmd

@@ -1,10 +0,0 @@
-┌──────────────────┬─────────────────┬─────────────┐
-│ SECRET NAME      │ SECRET VALUE    │ SECRET TYPE │
-├──────────────────┼─────────────────┼─────────────┤
-│ FOLDER-SECRET-1  │ folder-value-1  │ shared      │
-│ STAGING-SECRET-1 │ staging-value-1 │ shared      │
-│ STAGING-SECRET-2 │ staging-value-2 │ shared      │
-│ TEST-SECRET-1    │ test-value-1    │ shared      │
-│ TEST-SECRET-2    │ test-value-2    │ shared      │
-│ TEST-SECRET-3    │ test-value-3    │ shared      │
-└──────────────────┴─────────────────┴─────────────┘

cli/test/.snapshots/test-TestUniversalAuth_SecretsGetWithoutImportsAndWithoutRecursiveCmd

@@ -1,7 +0,0 @@
-┌───────────────┬──────────────┬─────────────┐
-│ SECRET NAME   │ SECRET VALUE │ SECRET TYPE │
-├───────────────┼──────────────┼─────────────┤
-│ TEST-SECRET-1 │ test-value-1 │ shared      │
-│ TEST-SECRET-2 │ test-value-2 │ shared      │
-│ TEST-SECRET-3 │ test-value-3 │ shared      │
-└───────────────┴──────────────┴─────────────┘

cli/test/.snapshots/test-TestUniversalAuth_SecretsGetWrongEnvironment

@@ -1,4 +0,0 @@
-error: CallGetRawSecretsV3: Unsuccessful response [GET https://app.infisical.com/api/v3/secrets/raw?environment=invalid-env&include_imports=true&recursive=true&secretPath=%2F&workspaceId=bef697d4-849b-4a75-b284-0922f87f8ba2] [status-code=500] [response={"statusCode":500,"error":"Internal Server Error","message":"'invalid-env' environment not found in project with ID bef697d4-849b-4a75-b284-0922f87f8ba2"}]
-
-
-If this issue continues, get support at https://infisical.com/slack

cli/test/export_test.go

@@ -1,73 +0,0 @@
-package tests
-
-import (
-	"testing"
-
-	"github.com/bradleyjkemp/cupaloy/v2"
-)
-
-func TestUniversalAuth_ExportSecretsWithImports(t *testing.T) {
-	MachineIdentityLoginCmd(t)
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "export", "--token", creds.UAAccessToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--silent")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestServiceToken_ExportSecretsWithImports(t *testing.T) {
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "export", "--token", creds.ServiceToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--silent")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestUniversalAuth_ExportSecretsWithoutImports(t *testing.T) {
-	MachineIdentityLoginCmd(t)
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "export", "--token", creds.UAAccessToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--silent", "--include-imports=false")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestServiceToken_ExportSecretsWithoutImports(t *testing.T) {
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "export", "--token", creds.ServiceToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--silent", "--include-imports=false")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}

cli/test/helper.go

@@ -1,64 +0,0 @@
-package tests
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"strings"
-	"testing"
-)
-
-const (
-	CLI_NAME = "infisical-merge"
-)
-
-var (
-	FORMATTED_CLI_NAME = fmt.Sprintf("./%s", CLI_NAME)
-)
-
-type Credentials struct {
-	ClientID      string
-	ClientSecret  string
-	UAAccessToken string
-	ServiceToken  string
-	ProjectID     string
-	EnvSlug       string
-}
-
-var creds = Credentials{
-	UAAccessToken: "",
-	ClientID:      os.Getenv("CLI_TESTS_UA_CLIENT_ID"),
-	ClientSecret:  os.Getenv("CLI_TESTS_UA_CLIENT_SECRET"),
-	ServiceToken:  os.Getenv("CLI_TESTS_SERVICE_TOKEN"),
-	ProjectID:     os.Getenv("CLI_TESTS_PROJECT_ID"),
-	EnvSlug:       os.Getenv("CLI_TESTS_ENV_SLUG"),
-}
-
-func ExecuteCliCommand(command string, args ...string) (string, error) {
-	cmd := exec.Command(command, args...)
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		return strings.TrimSpace(string(output)), err
-	}
-	return strings.TrimSpace(string(output)), nil
-}
-
-func SetupCli(t *testing.T) {
-
-	if creds.ClientID == "" || creds.ClientSecret == "" || creds.ServiceToken == "" || creds.ProjectID == "" || creds.EnvSlug == "" {
-		panic("Missing required environment variables")
-	}
-
-	// check if the CLI is already built, if not build it
-	alreadyBuilt := false
-	if _, err := os.Stat(FORMATTED_CLI_NAME); err == nil {
-		alreadyBuilt = true
-	}
-
-	if !alreadyBuilt {
-		if err := exec.Command("go", "build", "../.").Run(); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-}

cli/test/login_test.go

@@ -1,29 +0,0 @@
-package tests
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func MachineIdentityLoginCmd(t *testing.T) {
-	SetupCli(t)
-
-	if creds.UAAccessToken != "" {
-		return
-	}
-
-	jwtPattern := `^[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]*$`
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "login", "--method=universal-auth", "--client-id", creds.ClientID, "--client-secret", creds.ClientSecret, "--plain", "--silent")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	assert.Regexp(t, jwtPattern, output)
-
-	creds.UAAccessToken = output
-
-	// We can't use snapshot testing here because the output will be different every time
-}

cli/test/run_test.go

@@ -1,120 +0,0 @@
-package tests
-
-import (
-	"bytes"
-	"testing"
-
-	"github.com/bradleyjkemp/cupaloy/v2"
-)
-
-func TestServiceToken_RunCmdRecursiveAndImports(t *testing.T) {
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "run", "--token", creds.ServiceToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--recursive", "--silent", "--", "echo", "hello world")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	output = string(bytes.Split([]byte(output), []byte("INF"))[1])
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-func TestServiceToken_RunCmdWithImports(t *testing.T) {
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "run", "--token", creds.ServiceToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--silent", "--", "echo", "hello world")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	output = string(bytes.Split([]byte(output), []byte("INF"))[1])
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestUniversalAuth_RunCmdRecursiveAndImports(t *testing.T) {
-	MachineIdentityLoginCmd(t)
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "run", "--token", creds.UAAccessToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--recursive", "--silent", "--", "echo", "hello world")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	output = string(bytes.Split([]byte(output), []byte("INF"))[1])
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestUniversalAuth_RunCmdWithImports(t *testing.T) {
-	MachineIdentityLoginCmd(t)
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "run", "--token", creds.UAAccessToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--silent", "--", "echo", "hello world")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// remove the first few characters from the output because we don't care about the time, and it will change every time
-	output = string(bytes.Split([]byte(output), []byte("INF"))[1])
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestUniversalAuth_RunCmdWithoutImports(t *testing.T) {
-	MachineIdentityLoginCmd(t)
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "run", "--token", creds.UAAccessToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--silent", "--include-imports=false", "--", "echo", "hello world")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	output = string(bytes.Split([]byte(output), []byte("INF"))[1])
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestServiceToken_RunCmdWithoutImports(t *testing.T) {
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "run", "--token", creds.ServiceToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--silent", "--include-imports=false", "--", "echo", "hello world")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// Remove everything before "INF" because it's not relevant to the test
-	output = string(bytes.Split([]byte(output), []byte("INF"))[1])
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}

cli/test/secrets_by_name_test.go

@@ -1,106 +0,0 @@
-package tests
-
-import (
-	"testing"
-
-	"github.com/bradleyjkemp/cupaloy/v2"
-)
-
-func TestServiceToken_GetSecretsByNameRecursive(t *testing.T) {
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "secrets", "get", "TEST-SECRET-1", "TEST-SECRET-2", "FOLDER-SECRET-1", "--token", creds.ServiceToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--recursive", "--silent")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestServiceToken_GetSecretsByNameWithNotFoundSecret(t *testing.T) {
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "secrets", "get", "TEST-SECRET-1", "TEST-SECRET-2", "FOLDER-SECRET-1", "DOES-NOT-EXIST", "--token", creds.ServiceToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--recursive", "--silent")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestServiceToken_GetSecretsByNameWithImports(t *testing.T) {
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "secrets", "get", "TEST-SECRET-1", "STAGING-SECRET-2", "FOLDER-SECRET-1", "--token", creds.ServiceToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--recursive", "--silent")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestUniversalAuth_GetSecretsByNameRecursive(t *testing.T) {
-	MachineIdentityLoginCmd(t)
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "secrets", "get", "TEST-SECRET-1", "TEST-SECRET-2", "FOLDER-SECRET-1", "--token", creds.UAAccessToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--recursive", "--silent")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestUniversalAuth_GetSecretsByNameWithNotFoundSecret(t *testing.T) {
-	MachineIdentityLoginCmd(t)
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "secrets", "get", "TEST-SECRET-1", "TEST-SECRET-2", "FOLDER-SECRET-1", "DOES-NOT-EXIST", "--token", creds.UAAccessToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--recursive", "--silent")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestUniversalAuth_GetSecretsByNameWithImports(t *testing.T) {
-	MachineIdentityLoginCmd(t)
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "secrets", "get", "TEST-SECRET-1", "STAGING-SECRET-2", "FOLDER-SECRET-1", "--token", creds.UAAccessToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--recursive", "--silent")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}

cli/test/secrets_test.go

@@ -1,87 +0,0 @@
-package tests
-
-import (
-	"testing"
-
-	"github.com/bradleyjkemp/cupaloy/v2"
-)
-
-func TestServiceToken_SecretsGetWithImportsAndRecursiveCmd(t *testing.T) {
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "secrets", "--token", creds.ServiceToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--recursive", "--silent")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestServiceToken_SecretsGetWithoutImportsAndWithoutRecursiveCmd(t *testing.T) {
-	SetupCli(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "secrets", "--token", creds.ServiceToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--include-imports=false", "--silent")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestUniversalAuth_SecretsGetWithImportsAndRecursiveCmd(t *testing.T) {
-	SetupCli(t)
-	MachineIdentityLoginCmd(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "secrets", "--token", creds.UAAccessToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--recursive", "--silent")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestUniversalAuth_SecretsGetWithoutImportsAndWithoutRecursiveCmd(t *testing.T) {
-	SetupCli(t)
-	MachineIdentityLoginCmd(t)
-
-	output, err := ExecuteCliCommand(FORMATTED_CLI_NAME, "secrets", "--token", creds.UAAccessToken, "--projectId", creds.ProjectID, "--env", creds.EnvSlug, "--include-imports=false", "--silent")
-
-	if err != nil {
-		t.Fatalf("error running CLI command: %v", err)
-	}
-
-	// Use cupaloy to snapshot test the output
-	err = cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-}
-
-func TestUniversalAuth_SecretsGetWrongEnvironment(t *testing.T) {
-	SetupCli(t)
-	MachineIdentityLoginCmd(t)
-
-	output, _ := ExecuteCliCommand(FORMATTED_CLI_NAME, "secrets", "--token", creds.UAAccessToken, "--projectId", creds.ProjectID, "--env", "invalid-env", "--recursive", "--silent")
-
-	// Use cupaloy to snapshot test the output
-	err := cupaloy.Snapshot(output)
-	if err != nil {
-		t.Fatalf("snapshot failed: %v", err)
-	}
-
-}

docs/api-reference/endpoints/secrets/create-many.mdx

@@ -1,8 +0,0 @@
----
-title: "Bulk Create"
-openapi: "POST /api/v3/secrets/batch/raw"
----
-
-<Tip>
-  This endpoint requires you to disable end-to-end encryption. For more information, you should consult this [note](https://infisical.com/docs/api-reference/overview/examples/note).
-</Tip>

docs/api-reference/endpoints/secrets/delete-many.mdx

@@ -1,8 +0,0 @@
----
-title: "Bulk Delete"
-openapi: "DELETE /api/v3/secrets/batch/raw"
----
-
-<Tip>
-  This endpoint requires you to disable end-to-end encryption. For more information, you should consult this [note](https://infisical.com/docs/api-reference/overview/examples/note).
-</Tip>

docs/api-reference/endpoints/secrets/update-many.mdx

@@ -1,8 +0,0 @@
----
-title: "Bulk Update"
-openapi: "PATCH /api/v3/secrets/batch/raw"
----
-
-<Tip>
-  This endpoint requires you to disable end-to-end encryption. For more information, you should consult this [note](https://infisical.com/docs/api-reference/overview/examples/note).
-</Tip>

docs/api-reference/endpoints/service-tokens/get.mdx

@@ -4,7 +4,7 @@ openapi: "GET /api/v2/service-token"
 ---
 
 <Warning>
-    This endpoint is deprecated and will be removed in the future.
+    This endpoint will be deprecated in the near future with the removal of service tokens in Q1/Q2 2024.
 
-    We recommend switching to using [Machine Identities](/documentation/platform/identities/machine-identities).
+    We recommend switching to using [identities](/documentation/platform/identities/overview) if your client supports it.
 </Warning>

docs/cli/commands/export.mdx

@@ -16,48 +16,36 @@ Export environment variables from the platform into a file format.
 <Accordion title="infisical export" defaultOpen="true">
   Use this command to export environment variables from the platform into a raw file formats
 
-```bash
-$ infisical export
+  ```bash
+  $ infisical export 
 
-# Export variables to a .env file
-infisical export > .env
+  # Export variables to a .env file
+  infisical export > .env
 
-# Export variables to a .env file (with export keyword)
-infisical export --format=dotenv-export > .env
+  # Export variables to a .env file (with export keyword)
+  infisical export --format=dotenv-export > .env
 
-# Export variables to a CSV file
-infisical export --format=csv > secrets.csv
+  # Export variables to a CSV file
+  infisical export --format=csv > secrets.csv
 
-# Export variables to a JSON file
-infisical export --format=json > secrets.json
+  # Export variables to a JSON file
+  infisical export --format=json > secrets.json
 
-# Export variables to a YAML file
-infisical export --format=yaml > secrets.yaml
+  # Export variables to a YAML file
+  infisical export --format=yaml > secrets.yaml
 
-# Render secrets using a custom template file
-infisical export --template=<path to template>
-```
-
-### Environment variables
+  # Render secrets using a custom template file
+  infisical export --template=<path to template>
+  ```
 
+  ### Environment variables
   <Accordion title="INFISICAL_TOKEN">
-    Used to fetch secrets via a [machine identities](/documentation/platform/identities/machine-identities) apposed to logged in credentials. Simply, export this variable in the terminal before running this command.
+    Used to fetch secrets via a [service token](/documentation/platform/token) apposed to logged in credentials. Simply, export this variable in the terminal before running this command.
 
     ```bash
-    # Example
-    export INFISICAL_TOKEN=$(infisical login --method=universal-auth --client-id=<identity-client-id> --client-secret=<identity-client-secret> --silent --plain) # --plain flag will output only the token, so it can be fed to an environment variable. --silent will disable any update messages.
+    # Example 
+    export INFISICAL_TOKEN=st.63e03c4a97cb4a747186c71e.ed5b46a34c078a8f94e8228f4ab0ff97.4f7f38034811995997d72badf44b42ec
     ```
-
-  <Info>
-    Alternatively, you may use service tokens.
-
-    Please note, however, that service tokens are being deprecated in favor of [machine identities](/documentation/platform/identities/machine-identities). They will be removed in the future in accordance with the deprecation notice and timeline stated [here](https://infisical.com/blog/deprecating-api-keys).
-    ```bash
-    # Example
-    export INFISICAL_TOKEN=<service-token>
-    ```
-
-  </Info>
   </Accordion>
 
   <Accordion title="INFISICAL_DISABLE_UPDATE_CHECK">
@@ -66,18 +54,16 @@ infisical export --template=<path to template>
     To use, simply export this variable in the terminal before running this command.
 
     ```bash
-    # Example
+    # Example 
     export INFISICAL_DISABLE_UPDATE_CHECK=true
     ```
-
   </Accordion>
 
-### flags
-
+  ### flags 
   <Accordion title="--template">
     The `--template` flag specifies the path to the template file used for rendering secrets. When using templates, you can omit the other format flags.
 
-    	```text my-template-file
+		```text my-template-file
     {{$secrets := secret "<infisical-project-id>" "<environment-slug>" "<folder-path>"}}
     {{$length := len $secrets}}
     {{- "{"}}
@@ -87,26 +73,24 @@ infisical export --template=<path to template>
       {{- end }}
     {{- end }}
     {{ "}" -}}
-    	```
+		```
 
     ```bash
     # Example
     infisical export --template="/path/to/template/file"
     ```
-
   </Accordion>
   <Accordion title="--env">
-    Used to set the environment that secrets are pulled from.
+    Used to set the environment that secrets are pulled from. 
 
     ```bash
-    # Example
-    infisical export --env=prod
+    # Example 
+    infisical export --env=prod 
     ```
 
     Note: this flag only accepts environment slug names not the fully qualified name. To view the slug name of an environment, visit the project settings page.
 
     default value: `dev`
-
   </Accordion>
 
   <Accordion title="--projectId">
@@ -114,32 +98,28 @@ infisical export --template=<path to template>
     This flag allows you to override this behavior by explicitly defining the project to fetch your secrets from.
 
     ```bash
-    # Example
-
+    # Example 
+    
     infisical export --projectId=XXXXXXXXXXXXXX
     ```
-
   </Accordion>
 
   <Accordion title="--expand">
     Parse shell parameter expansions in your secrets (e.g., `${DOMAIN}`)
 
     Default value: `true`
-
   </Accordion>
 
   <Accordion title="--format">
-    Format of the output file. Accepted values: `dotenv`, `dotenv-export`, `csv`, `json` and `yaml`
+    Format of the output file. Accepted values: `dotenv`, `dotenv-export`, `csv`, `json` and `yaml` 
 
     Default value: `dotenv`
-
   </Accordion>
 
   <Accordion title="--secret-overriding">
     Prioritizes personal secrets with the same name over shared secrets
 
     Default value: `true`
-
   </Accordion>
 
   <Accordion title="--path">
@@ -149,21 +129,19 @@ infisical export --template=<path to template>
     # Example
     infisical export --path="/path/to/folder" --env=dev
     ```
-
   </Accordion>
 
   <Accordion title="--tags">
     When working with tags, you can use this flag to filter and retrieve only secrets that are associated with a specific tag(s).
 
     ```bash
-    # Example
+    # Example 
     infisical run --tags=tag1,tag2,tag3 -- npm run dev
     ```
 
     Note: you must reference the tag by its slug name not its fully qualified name. Go to project settings to view all tag slugs.
 
     By default, all secrets are fetched
-
   </Accordion>
 
 </Accordion>

docs/cli/commands/run.mdx

@@ -11,7 +11,6 @@ description: "The command that injects your secrets into local environment"
     # Example
     infisical run [options] -- npm run dev
     ```
-
   </Tab>
 
   <Tab title="Chained commands">
@@ -21,7 +20,6 @@ description: "The command that injects your secrets into local environment"
     # Example
     infisical run [options] --command "npm run bootstrap && npm run dev start; other-bash-command"
     ```
-
   </Tab>
 </Tabs>
 
@@ -29,38 +27,27 @@ description: "The command that injects your secrets into local environment"
 
 Inject secrets from Infisical into your application process.
 
+
 ## Subcommands & flags
 
 <Accordion title="infisical run" defaultOpen="true">
   Use this command to inject secrets into your applications process
 
-```bash
-$ infisical run -- <your application command>
+  ```bash
+  $ infisical run -- <your application command>
 
-# Example
-$ infisical run -- npm run dev
-```
-
-### Environment variables
+  # Example 
+  $ infisical run -- npm run dev
+  ```
 
+  ### Environment variables
   <Accordion title="INFISICAL_TOKEN">
-    Used to fetch secrets via a [machine identity](/documentation/platform/identities/machine-identities) apposed to logged in credentials. Simply, export this variable in the terminal before running this command.
+    Used to fetch secrets via a [service token](/documentation/platform/token) apposed to logged in credentials. Simply, export this variable in the terminal before running this command.
 
     ```bash
-    # Example
-    export INFISICAL_TOKEN=$(infisical login --method=universal-auth --client-id=<identity-client-id> --client-secret=<identity-client-secret> --silent --plain) # --plain flag will output only the token, so it can be fed to an environment variable. --silent will disable any update messages.
+    # Example 
+    export INFISICAL_TOKEN=st.63e03c4a97cb4a747186c71e.ed5b46a34c078a8f94e8228f4ab0ff97.4f7f38034811995997d72badf44b42ec
     ```
-
-    <Info>
-      Alternatively, you may use service tokens.
-
-      Please note, however, that service tokens are being deprecated in favor of [machine identities](/documentation/platform/identities/machine-identities). They will be removed in the future in accordance with the deprecation notice and timeline stated [here](https://infisical.com/blog/deprecating-api-keys).
-      ```bash
-      # Example
-      export INFISICAL_TOKEN=<service-token>
-      ```
-
-  </Info>
   </Accordion>
 
   <Accordion title="INFISICAL_DISABLE_UPDATE_CHECK">
@@ -69,90 +56,71 @@ $ infisical run -- npm run dev
     To use, simply export this variable in the terminal before running this command.
 
     ```bash
-    # Example
+    # Example 
     export INFISICAL_DISABLE_UPDATE_CHECK=true
     ```
-
   </Accordion>
 
-### Flags
-
+  ### Flags 
+  
    <Accordion title="--project-config-dir">
-    Explicitly set the directory where the .infisical.json resides. This is useful for some monorepo setups.
+    Explicitly set the directory where the .infisical.json resides. This is useful for some monorepo setups. 
 
     ```bash
-    # Example
+    # Example 
     infisical run --project-config-dir=/some-dir -- printenv
     ```
-
   </Accordion>
 
   <Accordion title="--command">
     Pass secrets into multiple commands at once
 
     ```bash
-    # Example
+    # Example 
     infisical run --command="npm run build && npm run dev; more-commands..."
     ```
-
-  </Accordion>
-
-  <Accordion title="--projectId">
-    The project ID to fetch secrets from. This is required when using a machine identity to authenticate.
-
-    ```bash
-    # Example
-    infisical run --projectId=<project-id> -- npm run dev
-    ```
-
   </Accordion>
 
   <Accordion title="--token">
-    If you are using a [machine identity](/documentation/platform/identities/machine-identities) to authenticate, you can pass the token as a flag
+    If you are using a [service token](/documentation/platform/token) to authenticate, you can pass the token as a flag
 
     ```bash
-    # Example
-    infisical run --token="<universal-auth-access-token>" --projectId=<project-id> -- npm run start
+    # Example 
+    infisical run --token="st.63e03c4a97cb4a747186c71e.ed5b46a34c078a8f94e8228f4ab0ff97.4f7f38034811995997d72badf44b42ec" -- npm run start
     ```
 
-    You may also expose the token to the CLI by setting the environment variable `INFISICAL_TOKEN` before executing the run command. This will have the same effect as setting the token with `--token` flag
-
+    You may also expose the token to the CLI by setting the environment variable `INFISICAL_TOKEN` before executing the run command. This will have the same effect as setting the token with `--token` flag 
   </Accordion>
 
   <Accordion title="--expand">
     Turn on or off the shell parameter expansion in your secrets. If you have used shell parameters in your secret(s), activating this feature will populate them before injecting them into your application process.
 
     Default value: `true`
-
   </Accordion>
 
-{" "}
-
-<Accordion title="--env">
-  This is used to specify the environment from which secrets should be
-  retrieved. The accepted values are the environment slugs defined for your
-  project, such as `dev`, `staging`, `test`, and `prod`. Default value: `dev`
-</Accordion>
+  <Accordion title="--env">
+    This is used to specify the environment from which secrets should be retrieved. The accepted values are the environment slugs defined for your project, such as `dev`, `staging`, `test`, and `prod`.
+    
+    Default value: `dev`
+  </Accordion>
 
   <Accordion title="--secret-overriding">
     Prioritizes personal secrets with the same name over shared secrets
 
     Default value: `true`
-
   </Accordion>
 
   <Accordion title="--tags">
     When working with tags, you can use this flag to filter and retrieve only secrets that are associated with a specific tag(s).
 
     ```bash
-    # Example
+    # Example 
     infisical run --tags=tag1,tag2,tag3 -- npm run dev
     ```
 
     Note: you must reference the tag by its slug name not its fully qualified name. Go to project settings to view all tag slugs.
 
     By default, all secrets are fetched
-
   </Accordion>
 
   <Accordion title="--path">

docs/cli/commands/secrets.mdx

@@ -23,23 +23,13 @@ $ infisical secrets
 ### Environment variables
 
   <Accordion title="INFISICAL_TOKEN">
-    Used to fetch secrets via a [machine identity](/documentation/platform/identities/machine-identities) apposed to logged in credentials. Simply, export this variable in the terminal before running this command.
+    Used to fetch secrets via a [service token](/documentation/platform/token) apposed to logged in credentials. Simply, export this variable in the terminal before running this command.
 
     ```bash
     # Example
-    export INFISICAL_TOKEN=$(infisical login --method=universal-auth --client-id=<identity-client-id> --client-secret=<identity-client-secret> --silent --plain) # --plain flag will output only the token, so it can be fed to an environment variable. --silent will disable any update messages.
+    export INFISICAL_TOKEN=st.63e03c4a97cb4a747186c71e.ed5b46a34c078a8f94e8228f4ab0ff97.4f7f38034811995997d72badf44b42ec
     ```
 
-    <Info>
-      Alternatively, you may use service tokens.
-
-      Please note, however, that service tokens are being deprecated in favor of [machine identities](/documentation/platform/identities/machine-identities). They will be removed in the future in accordance with the deprecation notice and timeline stated [here](https://infisical.com/blog/deprecating-api-keys).
-      ```bash
-      # Example
-      export INFISICAL_TOKEN=<service-token>
-      ```
-    </Info>
-
   </Accordion>
 
   <Accordion title="INFISICAL_DISABLE_UPDATE_CHECK">
@@ -63,16 +53,6 @@ $ infisical secrets
 
   </Accordion>
 
-  <Accordion title="--projectId">
-   The project ID to fetch secrets from. This is required when using a machine identity to authenticate.
-
-    ```bash
-    # Example
-    infisical secrets --projectId=<project-id>
-    ```
-
-  </Accordion>
-
   <Accordion title="--env">
     Used to select the environment name on which actions should be taken on
 
@@ -206,7 +186,7 @@ $ infisical secrets folders
     </Accordion>
 
     <Accordion title="--token">
-      Fetch folders using a [machine identity](/documentation/platform/identities/machine-identities) access token.
+      Fetch folders using the Infisical service token
 
       Default value: ``
     </Accordion>

docs/cli/commands/service-token.mdx

@@ -3,47 +3,37 @@ title: "infisical service-token"
 description: "Manage Infisical service tokens"
 ---
 
-<Warning>
-  This command is deprecated and will be removed in the near future. Please
-  switch to using [Machine
-  Identities](/documentation/platform/identities/machine-identities) for
-  authenticating with Infisical.
-</Warning>
-
-```bash
+```bash 
 infisical service-token create --scope=dev:/global --scope=dev:/backend --access-level=read --access-level=write
 ```
 
 ## Description
-
-The Infisical `service-token` command allows you to manage service tokens for a given Infisical project.
+The Infisical `service-token` command allows you to manage service tokens for a given Infisical project. 
 With this command, you can create, view, and delete service tokens.
 
 <Accordion title="service-token create" defaultOpen="true">
   Use this command to create a service token
 
-```bash
-$ infisical service-token create --scope=dev:/backend/** --access-level=read --access-level=write
-```
-
-### Flags
+  ```bash
+  $ infisical service-token create --scope=dev:/backend/** --access-level=read --access-level=write
+  ```
 
+  ### Flags 
   <Accordion title="--scope">
     ```bash
     infisical service-token create --scope=dev:/global --scope=dev:/backend/** --access-level=read
     ```
 
     Use the scope flag to define which environments and paths your service token should be authorized to access.
-
-    The value of your scope flag should be in the following `<environment slug>:<path>`.
+    
+    The value of your scope flag should be in the following `<environment slug>:<path>`. 
     Here, `environment slug` refers to the slug name of the environment, and `path` indicates the folder path where your secrets are stored.
 
     For specifying multiple scopes, you can use multiple --scope flags.
-
+    
     <Info>
       The `path` can be a Glob pattern
     </Info>
-
   </Accordion>
 
   <Accordion title="--projectId">
@@ -51,9 +41,8 @@ $ infisical service-token create --scope=dev:/backend/** --access-level=read --a
     infisical service-token create --scope=dev:/global --access-level=read --projectId=63cefb15c8d3175601cfa989
     ```
 
-    The project ID you'd like to create the service token for.
+    The project ID you'd like to create the service token for. 
     By default, the CLI will attempt to use the linked Infisical project in `.infisical.json` generated by `infisical init` command.
-
   </Accordion>
   <Accordion title="--name">
     ```bash
@@ -63,7 +52,6 @@ $ infisical service-token create --scope=dev:/backend/** --access-level=read --a
     Service token name
 
     Default: `Service token generated via CLI`
-
   </Accordion>
   <Accordion title="--expiry-seconds">
     ```bash
@@ -73,7 +61,6 @@ $ infisical service-token create --scope=dev:/backend/** --access-level=read --a
     Set the service token's expiration time in seconds from now. To never expire set to zero.
 
     Default: `1 day`
-
   </Accordion>
   <Accordion title="--access-level">
     ```bash
@@ -81,7 +68,6 @@ $ infisical service-token create --scope=dev:/backend/** --access-level=read --a
     ```
 
     The type of access the service token should have. Can be `read` and or `write`
-
   </Accordion>
   <Accordion title="--token-only">
     ```bash
@@ -91,6 +77,5 @@ $ infisical service-token create --scope=dev:/backend/** --access-level=read --a
     When true, only the service token will be printed
 
     Default: `false`
-
   </Accordion>
 </Accordion>

docs/cli/token.mdx

@@ -0,0 +1,22 @@
+---
+title: "Infisical Token"
+description: "How to use Infisical service token within the CLI."
+---
+
+Prerequisite: [Infisical Token and How to Generate One](/documentation/platform/token).
+
+It's possible to use the CLI to sync environment variables without manually entering login credentials by using a service token in the prerequisite link above.
+
+## Feeding Infisical Token to the CLI
+
+The CLI looks out for an environment variable called the `INFISICAL_TOKEN` which you can set depending on where you run the CLI. If `INFISICAL_TOKEN` is detected by the CLI, it will authenticate and retrieve the environment variables which the token is authorized for.
+
+A common use-case is to use the Infisical Token to fetch environment variables with Docker. More specifically, a token can be passed to a container as an environment variable for the CLI to authenticate and pull its corresponding secrets. Check out the integration guides for that:
+
+- [Docker](../../integrations/platforms/docker)
+- [Docker Compose](../../integrations/platforms/docker-compose)
+
+<Info>
+  Once the token is expired, the CLI using it will no longer be able to make
+  requests with it.
+</Info>

docs/cli/usage.mdx

@@ -1,125 +1,141 @@
 ---
-title: "Quickstart"
+title: "Quick usage"
 description: "Manage secrets with Infisical CLI"
 ---
 
-The CLI is designed for a variety of secret management applications ranging from local development to CI/CD and production scenarios.
+The CLI is designed for a variety of applications, ranging from local secret management to CI/CD and production scenarios. 
+The distinguishing factor, however, is the authentication method used.
 
 <Tabs>
-  <Tab title="Local development">
-    In the following steps, we explore how to use the Infisical CLI to fetch back environment variables from Infisical
-    and inject them into your local development process.
-  
-    <Steps>
-      <Step title="Log in with the CLI">
-        Start by running the `infisical login` command to authenticate with Infisical.
-        
-        ```bash
-        infisical login
-        ```
-        <Note>
-          If you are in a containerized environment such as WSL 2 or Codespaces, run `infisical login -i` to avoid browser based login
-        </Note>
-      </Step>
-      <Step title="Initialize Infisical for your project">
-        Next, navigate to your project and initialize Infisical.
-        
-        ```bash
-        # navigate to your project
-        cd /path/to/project
+  <Tab title="Local development only">
+    To use the Infisical CLI in your local development environment, simply run the command below and follow the interactive guide. 
 
-        # initialize infisical
-        infisical init
-        ```
+    ```bash 
+    infisical login 
+    ```
 
-        The `infisical init` command creates a `.infisical.json` file, containing [local project settings](./project-config), at the location where the command is executed.
+    <Note>
+      If you are in a containerized environment such as WSL 2 or Codespaces, run `infisical login -i` to avoid browser based login 
+    </Note>
 
-        <Note>
-          The `.infisical.json` file does not contain any sensitive data, so you may commit it to your git repository.
-        </Note>
-      </Step>
-      <Step title="Inject environment variables">
-        Finally, pass environment variables from Infisical into your application.
+    ## Initialize Infisical for your project
 
-        <Tabs>
-          <Tab title="Feed secrets to your application">
-            ```bash
-            infisical run --env=dev --path=/apps/firefly -- [your application start command] # e.g. npm run dev
+    ```bash
+    # navigate to your project
+    cd /path/to/project
 
-            # example with node (nodemon)
-            infisical run --env=staging --path=/apps/spotify -- nodemon index.js
-
-            # example with flask
-            infisical run --env=prod --path=/apps/backend -- flask run
-
-            # example with spring boot - maven
-            infisical run --env=dev --path=/apps/ -- ./mvnw spring-boot:run --quiet
-            ```
-
-          </Tab>
-          <Tab title="Feed secrets via custom aliases (advanced)">
-            Custom aliases can utilize secrets from Infisical. Suppose there is a custom alias `yd` in `custom.sh` that runs `yarn dev` and needs the secrets provided by Infisical.
-            ```bash
-            #!/bin/sh
-
-            yd() {
-              yarn dev
-            }
-            ```
-
-            To make the secrets available from Infisical to `yd`, you can run the following command:
-
-            ```bash
-            infisical run --env=prod --path=/apps/reddit --command="source custom.sh && yd"
-            ```
-          </Tab>
-        </Tabs>
-
-        View all available options for `run` command [here](./commands/run)
-      </Step>
-    </Steps>
+    # initialize infisical
+    infisical init
+    ```
 
+    This will create `.infisical.json` file at the location the command was executed. This file contains your [local project settings](./project-config). It does not contain any sensitive data. 
+    
   </Tab>
 
-  <Tab title="Staging, production & all other use cases">
-    In the following steps, we explore how to use the Infisical CLI in a non-local development scenario
-    to fetch back environment variables and export them to a file.
-    <Steps>
-      <Step title="Create a machine identity and obtain credentials for it">
-        Follow the steps listed [here](/documentation/platform/identities/universal-auth) to create a machine identity and obtain a **client ID** and **client secret** for it.
-      </Step>
-      <Step title="Obtain a machine identity access token">
-        Run the following command to authenticate with Infisical using the **client ID** and **client secret** credentials from step 1 and set the `INFISICAL_TOKEN` environment variable to the retrieved access token.
-        
-        ```bash
-        export INFISICAL_TOKEN=$(infisical login --method=universal-auth --client-id=<identity-client-id> --client-secret=<identity-client-secret> --silent --plain) # --plain flag will output only the token, so it can be fed to an environment variable. --silent will disable any update messages.
-        ```
+  <Tab title="Staging, production & all other use case">
+    To use Infisical for non local development scenarios, please create a [service token](../documentation/platform/token). The service token will allow you to authenticate and interact with Infisical. 
+    Once you have created a service token with the required permissions, you'll need to feed the token to the CLI. 
 
-        The CLI is configured to look out for the `INFISICAL_TOKEN` environment variable, so going forward any command used will be authenticated.
+    #### Pass as flag
+    You may use the --token flag to set the token 
 
-        Alternatively, assuming you have an access token on hand, you can also pass it directly to the CLI using the `--token` flag in conjunction with other CLI commands.
+    ```
+    infisical export --token=<>
+    infisical secrets --token=<>
+    infisical run --token=<> -- npm run dev
+    ```
 
-        <Info>
-        Keep in mind that the machine identity access token has a limited lifetime. It is recommended to use it only for the duration of the task at hand.
-        You can [refresh the token](./commands/token) if needed.
-        </Info>
-      </Step>
-      <Step title="Export environment variables back into a file">
-        Finally, export the environment variables from Infisical to a file of choice.
+    #### Pass via shell environment variable
+    The CLI is configured to look for an environment variable named `INFISICAL_TOKEN`. If set, it'll attempt to use it for authentication.
 
-        ```bash
-        # export variables to a .env file (with export keyword)
-        infisical export --format=dotenv-export > .env
-
-        # export variables to a YAML file
-        infisical export --format=yaml > secrets.yaml
-        ```
-      </Step>
-    </Steps>
+    ```
+    export INFISICAL_TOKEN=<>
+    ```
+    
 
   </Tab>
 </Tabs>
 
+
+## Inject environment variables
+<Tabs>
+  <Tab title="Feed secrets to your application">
+    ```bash
+    infisical run --env=dev --path=/apps/firefly -- [your application start command]
+
+    # example with node (nodemon)
+    infisical run --env=staging --path=/apps/spotify -- nodemon index.js
+
+    # example with flask
+    infisical run --env=prod --path=/apps/backend -- flask run
+
+    # example with spring boot - maven
+    infisical run --env=dev --path=/apps/ -- ./mvnw spring-boot:run --quiet
+    ```
+  </Tab>
+  <Tab title="Feed secrets via custom aliases (advanced)">
+    Custom aliases can utilize secrets from Infisical. Suppose there is a custom alias `yd` in `custom.sh` that runs `yarn dev` and needs the secrets provided by Infisical.
+    ```bash
+    #!/bin/sh
+
+    yd() {
+      yarn dev
+    }
+    ```
+
+    To make the secrets available from Infisical to `yd`, you can run the following command:
+
+    ```bash
+    infisical run --env=prod --path=/apps/reddit --command="source custom.sh && yd"
+    ```
+  </Tab>
+</Tabs>
+
+View all available options for `run` command [here](./commands/run)
+
+## Connect CLI to self hosted Infisical 
+
+<Accordion title="Optional: point CLI to self-hosted">
+The CLI is set to connect to Infisical Cloud by default, but if you're running your own instance of Infisical, you can direct the CLI to it using one of the methods provided below.
+
+#### Method 1: Use the updated CLI
+Beginning with CLI version V0.4.0, it is now possible to choose between logging in through the Infisical cloud or your own self-hosted instance. Simply execute the `infisical login` command and follow the on-screen instructions.
+
+#### Method 2: Export environment variable 
+You can point the CLI to the self hosted Infisical instance by exporting the environment variable `INFISICAL_API_URL` in your terminal.
+
+<Tabs>
+  <Tab title="Linux/MacOs">
+		```bash
+		# Set backend host 
+		export INFISICAL_API_URL="https://your-self-hosted-infisical.com/api"
+
+		# Remove backend host 
+		unset INFISICAL_API_URL
+		```
+  </Tab>
+  <Tab title="Windows Powershell">
+		```bash
+		# Set backend host 
+		setx INFISICAL_API_URL "https://your-self-hosted-infisical.com/api"
+
+		# Remove backend host 
+		setx INFISICAL_API_URL ""
+
+		# NOTE: Once set or removed, please restart powershell for the change to take effect
+		```
+  </Tab>
+</Tabs>
+
+#### Method 3: Set manually on every command
+Another option to point the CLI to your self hosted Infisical instance is to set it via a flag on every command you run.
+
+```bash 
+# Example
+infisical <any-command> --domain="https://your-self-hosted-infisical.com/api"
+```
+</Accordion>
+
 ## History
 
 Your terminal keeps a history with the commands you run. When you create Infisical secrets directly from your terminal, they'll stay there for a while.
@@ -127,101 +143,30 @@ Your terminal keeps a history with the commands you run. When you create Infisic
 For security and privacy concerns, we recommend you to configure your terminal to ignore those specific Infisical commands.
 
 <Accordion title="Ignore commands">
-  <Tabs>
-    <Tab title="Unix/Linux">
-        <Tip>
-          `$HOME/.profile` is pretty common but, you could place it under `$HOME/.profile.d/infisical.sh` or any profile file run at login 
-        </Tip>
 
-        ```bash
-        cat <<EOF >> $HOME/.profile && source $HOME/.profile
+<Tabs>
+   <Tab title="Unix/Linux">
+      <Tip>
+        `$HOME/.profile` is pretty common but, you could place it under `$HOME/.profile.d/infisical.sh` or any profile file run at login 
+      </Tip>
 
-        # Ignoring specific Infisical CLI commands
-        DEFAULT_HISTIGNORE=$HISTIGNORE
-        export HISTIGNORE="*infisical secrets set*:$DEFAULT_HISTIGNORE"
-        EOF
-        ```
-
-    </Tab>
-    <Tab title="Windows">
-        If you're on WSL, then you can use the Unix/Linux method.
-
-        <Tip>
-          Here's some [documentation](https://superuser.com/a/1658331) about how to clear the terminal history, in PowerShell and CMD
-        </Tip>
-
-    </Tab>
-
-  </Tabs>
-</Accordion>
-
-## FAQ
-
-<AccordionGroup>
-  <Accordion title="Can I connect the CLI to my self-hosted Infisical instance?">
-    Yes. The CLI is set to connect to Infisical Cloud by default, but if you're running your own instance of Infisical, you can direct the CLI to it using one of the methods provided below.
-
-    #### Method 1: Use the updated CLI
-
-    Beginning with CLI version V0.4.0, it is now possible to choose between logging in through the Infisical cloud or your own self-hosted instance. Simply execute the `infisical login` command and follow the on-screen instructions.
-
-    #### Method 2: Export environment variable
-
-    You can point the CLI to the self hosted Infisical instance by exporting the environment variable `INFISICAL_API_URL` in your terminal.
-
-    <Tabs>
-    <Tab title="Linux/MacOs">
       ```bash
-      # set backend host
-      export INFISICAL_API_URL="https://your-self-hosted-infisical.com/api"
+      cat <<EOF >> $HOME/.profile && source $HOME/.profile
 
-      # remove backend host
-      unset INFISICAL_API_URL
+      # Ignoring specific Infisical CLI commands
+      DEFAULT_HISTIGNORE=$HISTIGNORE
+      export HISTIGNORE="*infisical secrets set*:$DEFAULT_HISTIGNORE"
+      EOF
       ```
 
-    </Tab>
-    <Tab title="Windows Powershell">
-      ```bash
-      # set backend host
-      setx INFISICAL_API_URL "https://your-self-hosted-infisical.com/api"
+   </Tab>
+   <Tab title="Windows">
+      If you're on WSL, then you can use the Unix/Linux method.
 
-      # remove backend host
-      setx INFISICAL_API_URL ""
+      <Tip>
+        Here's some [documentation](https://superuser.com/a/1658331) about how to clear the terminal history, in PowerShell and CMD
+      </Tip>
 
-      # NOTE: Once set or removed, please restart powershell for the change to take effect
-      ```
-
-    </Tab>
-
-  </Tabs>
-
-#### Method 3: Set manually on every command
-
-Another option to point the CLI to your self hosted Infisical instance is to set it via a flag on every command you run.
-
-```bash
-# Example
-infisical <any-command> --domain="https://your-self-hosted-infisical.com/api"
-```
-
-  </Accordion>
-  <Accordion title="Can I use the CLI with service tokens?">
-    Yes. Please note, however, that service tokens are being deprecated in favor of [machine identities](/documentation/platform/identities/machine-identities). They will be removed in the future in accordance with the deprecation notice and timeline stated [here](https://infisical.com/blog/deprecating-api-keys).
-
-    To use Infisical for non local development scenarios, please create a service token. The service token will allow you to authenticate and interact with Infisical. Once you have created a service token with the required permissions, you’ll need to feed the token to the CLI.
-
-    ```bash
-      infisical export --token=<service-token>
-      infisical secrets --token=<service-token>
-      infisical run --token=<service-token> -- npm run dev
-    ```
-
-    #### Pass via shell environment variable
-    The CLI is configured to look for an environment variable named `INFISICAL_TOKEN`. If set, it’ll attempt to use it for authentication.
-
-    ```bash
-      export INFISICAL_TOKEN=<service-token>
-    ```
-
-  </Accordion>
-</AccordionGroup>
+   </Tab>
+</Tabs>
+</Accordion>

docs/documentation/getting-started/kubernetes.mdx

@@ -0,0 +1,87 @@
+---
+title: "Kubernetes"
+---
+
+The Infisical Secrets Operator fetches secrets from Infisical and saves them as Kubernetes secrets using the custom `InfisicalSecret` resource to define authentication and storage methods.
+The operator updates secrets continuously and can reload dependent deployments automatically on secret changes.
+
+Prerequisites:
+
+- Connected to your cluster via kubectl
+- Have a project with secrets ready in [Infisical Cloud](https://app.infisical.com).
+- Create an [Infisical Token](/documentation/platform/token) scoped to an environment in your project in Infisical.
+
+## Installation
+
+Follow the instructions for either [Helm](https://helm.sh/) or [kubectl](https://github.com/kubernetes/kubectl) to install the Infisical Secrets Operator.
+
+<Tabs>
+    <Tab title="Helm">
+        Install the Infisical Helm repository
+        
+        ```console
+        helm repo add infisical-helm-charts 'https://dl.cloudsmith.io/public/infisical/helm-charts/helm/charts/' 
+  
+        helm repo update
+        ```
+        
+        Install the Helm chart
+        ```console
+        helm install --generate-name infisical-helm-charts/secrets-operator
+        ```
+        
+    </Tab>
+    <Tab title="Kubectl">
+    The operator will be installed in `infisical-operator-system` namespace
+    ```
+    kubectl apply -f https://raw.githubusercontent.com/Infisical/infisical/main/k8-operator/kubectl-install/install-secrets-operator.yaml
+    ```
+    </Tab>
+</Tabs>
+
+
+## Usage
+
+**Step 1: Create Kubernetes secret containing service token** 
+
+Once you have generated the service token, create a Kubernetes secret containing the service token you generated by running the command below.
+
+``` bash
+kubectl create secret generic service-token --from-literal=infisicalToken=<your-service-token-here> 
+```
+
+**Step 2: Fill out the InfisicalSecrets CRD and apply it to your cluster**
+
+```yaml infisical-secrets-config.yaml
+apiVersion: secrets.infisical.com/v1alpha1
+kind: InfisicalSecret
+metadata:
+  # Name of of this InfisicalSecret resource
+  name: infisicalsecret-sample
+spec:
+  # The host that should be used to pull secrets from. If left empty, the value specified in Global configuration will be used
+  hostAPI: https://app.infisical.com/api
+  resyncInterval:
+  authentication:
+    serviceToken:
+      serviceTokenSecretReference:
+        secretName: service-token
+        secretNamespace: option
+      secretsScope:
+        envSlug: dev
+        secretsPath: "/"
+  managedSecretReference:
+    secretName: managed-secret # <-- the name of kubernetes secret that will be created
+    secretNamespace: default # <-- where the kubernetes secret should be created
+```
+
+```
+kubectl apply -f infisical-secrets-config.yaml
+```
+
+You should now see a new kubernetes secret automatically created in the namespace you defined in the `managedSecretReference` property above. 
+
+See also:
+
+- [Documentation for the Infisical Kubernetes Operator](../../integrations/platforms/kubernetes)
+

docs/documentation/platform/dynamic-secrets/cassandra.mdx

@@ -1,6 +1,6 @@
 ---
 title: "Cassandra"
-description: "How to dynamically generate Cassandra database users."
+description: "How to dynamically generate Cassandra database users"
 ---
 
 The Infisical Cassandra dynamic secret allows you to generate Cassandra database credentials on demand based on configured role.

docs/documentation/platform/dynamic-secrets/overview.mdx

@@ -23,7 +23,7 @@ This approach offers several advantages in terms of security and management:
 
 - **Scalability**: Dynamic secret management systems can scale more effectively to handle a large number of services and applications, as they automate much of the overhead associated with manual secret management.
 
-Dynamic secrets are particularly useful in environments with stringent security requirements, such as cloud environments, distributed systems, and microservices architectures, where they help to manage database credentials, API keys, tokens, and other types of secrets.
+Dynamic secrets are particularly useful in environments with stringent security requirements, such as cloud environments, distributed systems, and microservices architectures, where they help to manage database credentials, API keys, service tokens, and other types of secrets.
 
 ## Infisical Dynamic Secret Templates
 

docs/documentation/platform/dynamic-secrets/postgresql.mdx

@@ -1,6 +1,6 @@
 ---
 title: "PostgreSQL"
-description: "How to dynamically generate PostgreSQL database users."
+description: "How to dynamically generate PostgreSQL database users"
 ---
 
 The Infisical PostgreSQL dynamic secret allows you to generate PostgreSQL database credentials on demand based on configured role.
@@ -115,4 +115,4 @@ To extend the life of the generated dynamic secret leases past its initial time
 
 <Warning>
 	Lease renewals cannot exceed the maximum TTL set when configuring the dynamic secret
-</Warning>
+</Warning>

docs/documentation/platform/identities/machine-identities.mdx

@@ -1,5 +1,5 @@
 ---
-title: Machine Identities
+title:  Machine Identities
 description: "Learn how to use Machine Identities to programmatically interact with Infisical."
 ---
 
@@ -21,18 +21,19 @@ Key Features:
 A typical workflow for using identities consists of four steps:
 
 1. Creating the identity with a name and [role](/documentation/platform/role-based-access-controls) in Organization Access Control > Machine Identities.
-   This step also involves configuring an authentication method for it such as [Universal Auth](/documentation/platform/identities/universal-auth).
+This step also involves configuring an authentication method for it such as [Universal Auth](/documentation/platform/identities/universal-auth).
 2. Adding the identity to the project(s) you want it to have access to.
 3. Authenticating the identity with the Infisical API based on the configured authentication method on it and receiving a short-lived access token back.
 4. Authenticating subsequent requests with the Infisical API using the short-lived access token.
 
+
 <Note>
   Currently, identities can only be used to make authenticated requests to the Infisical API, SDKs, Terraform, Kubernetes Operator, and Infisical Agent. They do not work with clients such as CLI, Ansible look up plugin, etc.
 
-Machine Identity support for the rest of the clients is planned to be released in the current quarter.
-
+  Machine Identity support for the rest of the clients is planned to be released in the current quarter.
 </Note>
 
+
 ## Authentication Methods
 
 To interact with various resources in Infisical, Machine Identities are able to authenticate using:
@@ -42,16 +43,8 @@ To interact with various resources in Infisical, Machine Identities are able to
 ## FAQ
 
 <AccordionGroup>
-<Accordion title="Can I use machine identities with the CLI?">
-
-Yes - Identities can be used with the CLI.
-
-You can learn more about how to do this in the CLI quickstart [here](/cli/usage).
-
-</Accordion>
-
 <Accordion title="What is the difference between an identity and service token?">
-  A service token is a project-level authentication method that is being deprecated in favor of identities. The service token method will be removed in the future in accordance with the deprecation notice and timeline stated [here](https://infisical.com/blog/deprecating-api-keys).
+  A service token is a project-level authentication method that is being phased out in favor of identities.
   
   Amongst many differences, identities provide broader access over the Infisical API, utilizes the same
   permission system as user identities, and come with a significantly larger number of configurable authentication and security features.

docs/documentation/platform/identities/user-identities.mdx

@@ -17,6 +17,7 @@ Upon being added to an organization and projects, users assume a certain set of
 
 To interact with various resources in Infisical, users are able to utilize a number of authentication methods: 
 - **Email & Password**: the most common authentication method that is used for authentication into Web Dashboard and Infisical CLI. It is recommended to utilize [Multi-factor Authentication](/documentation/platform/mfa) in addition to it.  
+- **Service Tokens**: Service tokens allow users authenticate into CLI and other clients under their own identity. For the majority of use cases, it is not a recommended approach. Instead, it is often a good idea to utilize [Machine Identities](./machine-identities) with [Universal Authentication](/documentation/platform/identities/universal-auth). 
 - **SSO**: Infisical natively integrates with a number of SSO identity providers like [Google](/documentation/platform/sso/google), [GitHub](/documentation/platform/sso/github), and [GitLab](/documentation/platform/sso/gitlab). 
 - **SAML SSO**: It is also possible to set up SAML SSO integration with identity providers like [Okta](/documentation/platform/sso/okta), [Microsoft Entra ID](/documentation/platform/sso/azure) (formerly known as Azure AD), [JumpCloud](/documentation/platform/sso/jumpcloud), [Google](/documentation/platform/sso/google-saml), and more. 
 - **LDAP**: For organizations with more advanced needs, Infisical also provides user authentication with [LDAP](/documentation/platform/ldap/overview) that includes a number of LDAP providers.

docs/documentation/platform/ip-allowlisting.mdx

@@ -0,0 +1,38 @@
+---
+title: "IP Allowlisting"
+description: "Restrict access to your secrets in Infisical using trusted IPs"
+---
+
+<Warning>
+  IP allowlisting at the project-level is being replaced with IP allowlisting at the token-level now available with the Service Token V3 authentication method.
+  
+  Instead of providing trusted IPs (specific IPs and CIDR ranges) to be applied across all service tokens, 
+  you can now specify trusted IPs at the token-level.
+  
+</Warning>
+<Info>
+  Note that IP Allowlisting is a paid feature.
+
+  If you're using Infisical Cloud, then it is available under the **Pro Tier**. If you're self-hosting Infisical,
+  then you should contact sales@infisical.com to purchase an enterprise license to use it.
+</Info>
+
+Projects in Infisical can be configured to restrict client access to specific IP addresses or CIDR ranges. This applies to any client using service tokens and
+can be useful, for example, for limiting access to traffic coming from corporate networks.
+
+By default, each project is initialized with the `0.0.0.0/0` entry, representing all possible IPv4 addresses.
+For enhanced security, we strongly recommend replacing the default entry with your client IPs to tighten access to your secrets.
+
+<Note>
+  You must be a project `admin` to manage your project's IP whitelist.
+</Note>
+
+![IP whitelist](../../images/platform/ip-allowlisting/ip-allowlisting-table.png)
+
+## Creating a trusted IP entry
+
+To create a trusted IP entry, head over to the **IP Whitelist** tab in your project. When creating an entry,
+you can specify either a specific IP address like `192.0.2.1` or a CIDR range like `2001:db8::/32`; both IPv4 and IPv6
+formats are accepted.
+
+![IP whitelist add](../../images/platform/ip-allowlisting/ip-allowlisting-modal.png)

docs/documentation/platform/secret-reference.mdx

@@ -19,7 +19,7 @@ This means that updating the value of a base secret propagates directly to other
 
 ![secret referencing](../../images/platform/secret-references-imports/secret-reference.png)
 
-Since secret referencing works by reconstructing values back on the client side, the client, be it a user, service token, or a machine identity, fetching back secrets 
+Since secret referencing works by reconstructing values back on the client side, the client, be it a user or service token, fetching back secrets 
 must be permissioned access to all base and dependent secrets.
 
 For example, to access some secret `A` whose values depend on secrets `B` and `C` from different scopes, a client must have `read` access to the scopes of secrets `A`, `B`, and `C`.

docs/documentation/platform/token.mdx

@@ -3,13 +3,6 @@ title: "Service Token"
 description: "Infisical service tokens allow users to programmatically interact with Infisical."
 ---
 
-<Warning>
-  Service tokens are being deprecated in favor of [machine identities](/documentation/platform/identities/machine-identities).
-
-They will be removed in the future in accordance with the deprecation notice and timeline stated [here](https://infisical.com/blog/deprecating-api-keys).
-
-</Warning>
-
 Service tokens are authentication credentials that services can use to access designated endpoints in the Infisical API to manage project resources like secrets.
 Each service token can be provisioned scoped access to select environment(s) and path(s) within them.
 
@@ -24,8 +17,8 @@ Service Token (ST) is the current widely-used authentication method for managing
 Here's a few pointers to get you acquainted with it:
 
 - When you create a ST, you get a token prefixed with `st`. The part after the last `.` delimiter is a symmetric key; everything
-  before it is an access token. When authenticating with the Infisical API, it is important to send in only the access token portion
-  of the token.
+before it is an access token. When authenticating with the Infisical API, it is important to send in only the access token portion
+of the token.
 - ST supports expiration; it gets deleted automatically upon expiration.
 - ST supports provisioning `read` and/or `write` permissions broadly applied to all accessible environment(s) and path(s).
 - ST is not editable.
@@ -42,7 +35,7 @@ the token access to. Here's some guidance for each field:
 - Name: A friendly name for the token.
 - Scopes: The environment(s) and path(s) the token should have access to.
 - Permissions: You can indicate whether or not the token should have `read/write` access to the paths.
-  Also, note that Infisical supports [glob patterns](https://www.malikbrowne.com/blog/a-beginners-guide-glob-patterns/) when defining access scopes to path(s).
+Also, note that Infisical supports [glob patterns](https://www.malikbrowne.com/blog/a-beginners-guide-glob-patterns/) when defining access scopes to path(s).
 - Expiration: The time when this token should be rendered inactive.
 
 ![token add](../../images/project-token-old-permissions.png)
@@ -51,31 +44,28 @@ In the above screenshot, you can see that we are creating a token token with `re
 of the `/common` path within the development environment of the project; the token expires in 6 months and can be used from any IP address.
 
 <Note>
-  For a deeper understanding of service tokens, it is recommended to read [this
-  guide](https://infisical.com/docs/internals/service-tokens).
+For a deeper understanding of service tokens, it is recommended to read [this guide](https://infisical.com/docs/internals/service-tokens). 
 </Note>
 
 **FAQ**
 
 <AccordionGroup>
-  <Accordion title="Why is the Infisical API rejecting my service token?">
-      There are a few reasons for why this might happen:
+<Accordion title="Why is the Infisical API rejecting my service token?">
+  There are a few reasons for why this might happen:
 
-    - The service token has expired.
-    - The service token is insufficiently permissioned to interact with the secrets in the given environment and path.
-    - You are attempting to access a `/raw` secrets endpoint that requires your project to disable E2EE.
-    - (If using ST V3) The service token has not been activated yet.
-    - (If using ST V3) The service token is being used from an untrusted IP.
+  - The service token has expired.
+  - The service token is insufficiently permissioned to interact with the secrets in the given environment and path.
+  - You are attempting to access a `/raw` secrets endpoint that requires your project to disable E2EE.
+  - (If using ST V3) The service token has not been activated yet.
+  - (If using ST V3) The service token is being used from an untrusted IP.
+</Accordion>
+<Accordion title="Can you provide examples for using glob patterns?">
+  1. `/**`: This pattern matches all folders at any depth in the directory structure. For example, it would match folders like `/folder1/`, `/folder1/subfolder/`, and so on.
 
-  </Accordion>
-  <Accordion title="Can you provide examples for using glob patterns?">
-    1. `/**`: This pattern matches all folders at any depth in the directory structure. For example, it would match folders like `/folder1/`, `/folder1/subfolder/`, and so on.
+  2. `/*`: This pattern matches all immediate subfolders in the current directory. It does not match any folders at a deeper level. For example, it would match folders like `/folder1/`, `/folder2/`, but not `/folder1/subfolder/`.
 
-    2. `/*`: This pattern matches all immediate subfolders in the current directory. It does not match any folders at a deeper level. For example, it would match folders like `/folder1/`, `/folder2/`, but not `/folder1/subfolder/`.
+  3. `/*/*`: This pattern matches all subfolders at a depth of two levels in the current directory. It does not match any folders at a shallower or deeper level. For example, it would match folders like `/folder1/subfolder/`, `/folder2/subfolder/`, but not `/folder1/` or `/folder1/subfolder/subsubfolder/`.
 
-    3. `/*/*`: This pattern matches all subfolders at a depth of two levels in the current directory. It does not match any folders at a shallower or deeper level. For example, it would match folders like `/folder1/subfolder/`, `/folder2/subfolder/`, but not `/folder1/` or `/folder1/subfolder/subsubfolder/`.
-
-    4. `/folder1/*`: This pattern matches all immediate subfolders within the `/folder1/` directory. It does not match any folders outside of `/folder1/`, nor does it match any subfolders within those immediate subfolders. For example, it would match folders like `/folder1/subfolder1/`, `/folder1/subfolder2/`, but not `/folder2/subfolder/`.
-
-  </Accordion>
+  4. `/folder1/*`: This pattern matches all immediate subfolders within the `/folder1/` directory. It does not match any folders outside of `/folder1/`, nor does it match any subfolders within those immediate subfolders. For example, it would match folders like `/folder1/subfolder1/`, `/folder1/subfolder2/`, but not `/folder2/subfolder/`.
+</Accordion>
 </AccordionGroup>

docs/integrations/cicd/jenkins.mdx

@@ -6,277 +6,134 @@ description: "How to effectively and securely manage secrets in Jenkins using In
 **Objective**: Fetch secrets from Infisical to Jenkins pipelines
 
 In this guide, we'll outline the steps to deliver secrets from Infisical to Jenkins via the Infisical CLI.
-At a high level, the Infisical CLI will be executed within your build environment and use a machine identity to authenticate with Infisical.
+At a high level, the Infisical CLI will be executed within your build environment and use a service token to authenticate with Infisical. 
 This token must be added as a Jenkins Credential and then passed to the Infisical CLI as an environment variable, enabling it to access and retrieve secrets within your workflows.
 
 Prerequisites:
 
 - Set up and add secrets to [Infisical](https://app.infisical.com).
-- Create a [machine identity](/documentation/platform/identities/machine-identities) (Recommended), or a service token in Infisical.
 - You have a working Jenkins installation with the [credentials plugin](https://plugins.jenkins.io/credentials/) installed.
 - You have the [Infisical CLI](/cli/overview) installed on your Jenkins executor nodes or container images.
 
-<Tabs>
 
-  <Tab title="Machine Identity (Recommended)">
-      ## Add Infisical Machine Identity to Jenkins
+## Add Infisical Service Token to Jenkins
 
-      After setting up your project in Infisical and installing the Infisical CLI to the environment where your Jenkins builds will run, you will need to add the Infisical Machine Identity to Jenkins.
+After setting up your project in Infisical and installing the Infisical CLI to the environment where your Jenkins builds will run, you will need to add the Infisical Service Token to Jenkins.
 
-      To generate a Infisical machine identity, follow the guide [here](/documentation/platform/identities/machine-identities).
-      Once you have generated the token, navigate to **Manage Jenkins > Manage Credentials** in your Jenkins instance.
+To generate a Infisical service token, follow the guide [here](/documentation/platform/token). 
+Once you have generated the token, navigate to **Manage Jenkins > Manage Credentials** in your Jenkins instance.
 
-      ![Jenkins step 1](../../images/integrations/jenkins/jenkins_1.png)
+![Jenkins step 1](../../images/integrations/jenkins/jenkins_1.png)
 
-      Click on the credential store you want to store the Infisical Machine Identity in. In this case, we're using the default Jenkins global store.
+Click on the credential store you want to store the Infisical Service Token in. In this case, we're using the default Jenkins global store.
 
-      <Info>
-        Each of your projects will have a different `INFISICAL_TOKEN`.
-        As a result, it may make sense to spread these out into separate credential domains depending on your use case.
-      </Info>
+<Info>
+  Each of your projects will have a different `INFISICAL_TOKEN`.
+  As a result, it may make sense to spread these out into separate credential domains depending on your use case.
+</Info>
 
-      ![Jenkins step 2](../../images/integrations/jenkins/jenkins_2.png)
+![Jenkins step 2](../../images/integrations/jenkins/jenkins_2.png)
 
-      Now, click Add Credentials.
+Now, click Add Credentials.
 
-      ![Jenkins step 3](../../images/integrations/jenkins/jenkins_3.png)
+![Jenkins step 3](../../images/integrations/jenkins/jenkins_3.png)
 
-      Choose **Secret text** for the **Kind** option from the dropdown list and enter the Infisical Service Token in the **Secret** field.
-      Although the **ID** can be any value, we'll set it to `infisical-machine-identity-client-id` and `infisical-machine-identity-client-secret` for the sake of this guide.
-      The description is optional and can be any text you prefer.
+Choose **Secret text** for the **Kind** option from the dropdown list and enter the Infisical Service Token in the **Secret** field.
+Although the **ID** can be any value, we'll set it to `infisical-service-token` for the sake of this guide.
+The description is optional and can be any text you prefer.
 
 
-      ![Jenkins step 4](../../images/integrations/jenkins/jenkins_4_identity_id.png)
-      ![Jenkins step 5](../../images/integrations/jenkins/jenkins_4_identity_secret.png)
+![Jenkins step 4](../../images/integrations/jenkins/jenkins_4.png)
 
-      When you're done, you should see two credentials similar to the one below:
+When you're done, you should see a credential similar to the one below:
 
-      ![Jenkins step 6](../../images/integrations/jenkins/jenkins_5_identity.png)
+![Jenkins step 5](../../images/integrations/jenkins/jenkins_5.png)
 
 
-      ## Use Infisical in a Freestyle Project
+## Use Infisical in a Freestyle Project
 
-      To fetch secrets with Infisical in a Freestyle Project job, you'll need to expose the credential you created above as an environment variable to the Infisical CLI.
-      To do so, first click **New Item** from the dashboard navigation sidebar:
+To fetch secrets with Infisical in a Freestyle Project job, you'll need to expose the credential you created above as an environment variable to the Infisical CLI. 
+To do so, first click **New Item** from the dashboard navigation sidebar:
 
-      ![Jenkins step 6](../../images/integrations/jenkins/jenkins_6.png)
+![Jenkins step 6](../../images/integrations/jenkins/jenkins_6.png)
 
-      Enter the name of the job, choose the **Freestyle Project** option, and click **OK**.
+Enter the name of the job, choose the **Freestyle Project** option, and click **OK**.
 
-      ![Jenkins step 7](../../images/integrations/jenkins/jenkins_7.png)
+![Jenkins step 7](../../images/integrations/jenkins/jenkins_7.png)
 
-      Scroll down to the **Build Environment** section and enable the **Use secret text(s) or file(s)** option. Then click **Add** under the **Bindings** section and choose **Secret text** from the dropdown menu.
+Scroll down to the **Build Environment** section and enable the **Use secret text(s) or file(s)** option. Then click **Add** under the **Bindings** section and choose **Secret text** from the dropdown menu.
 
-      ![Jenkins step 8](../../images/integrations/jenkins/jenkins_8.png)
+![Jenkins step 8](../../images/integrations/jenkins/jenkins_8.png)
 
-      Enter `INFISICAL_MACHINE_IDENTITY_CLIENT_ID` in the **Variable** field for the client ID, and `INFISICAL_MACHINE_IDENTITY_CLIENT_SECRET` for the client secret. Then click the **Specific credentials** option from the Credentials section and select the credentials you created earlier.
-      In this case, we saved it as `Infisical Machine Identity Client ID` and `Infisical Machine Identity Client Secret` so we'll choose those from the dropdown menu.
+Enter `INFISICAL_TOKEN` in the **Variable** field then click the **Specific credentials** option from the Credentials section and select the credential you created earlier. 
+In this case, we saved it as `Infisical service token` so we'll choose that from the dropdown menu.
 
-      Make sure to add bindings for both the client ID and the client secret.
+![Jenkins step 9](../../images/integrations/jenkins/jenkins_9.png)
 
-      ![Jenkins step 9](../../images/integrations/jenkins/jenkins_9_identity.png)
+Scroll down to the **Build** section and choose **Execute shell** from the **Add build step** menu.
 
-      Scroll down to the **Build** section and choose **Execute shell** from the **Add build step** menu.
+![Jenkins step 10](../../images/integrations/jenkins/jenkins_10.png)
 
-      ![Jenkins step 10](../../images/integrations/jenkins/jenkins_10_identity.png)
+In the command field, you can now use the Infisical CLI to fetch secrets. 
+The example command below will print the secrets using the service token passed as a credential. When done, click  **Save**.
 
-      In the command field, you can now use the Infisical CLI to fetch secrets.
-      The example command below will print the secrets using the service token passed as a credential. When done, click  **Save**.
+```
+infisical secrets --env=dev --path=/
+```
 
-      ```bash
-        export INFISICAL_TOKEN=$(infisical login --method=universal-auth --client-id=$INFISICAL_MACHINE_IDENTITY_CLIENT_ID --client-secret=$INFISICAL_MACHINE_IDENTITY_CLIENT_SECRET --silent --plain)
-        infisical secrets --env dev --projectId=<your-project-id>
-      ```
+![Jenkins step 11](../../images/integrations/jenkins/jenkins_11.png)
 
-      ![Jenkins step 11](../../images/integrations/jenkins/jenkins_11_identity.png)
+Finally, click **Build Now** from the navigation sidebar to run your new job.
 
-      Finally, click **Build Now** from the navigation sidebar to run your new job.
+<Info>
+  Running into issues? Join Infisical's [community Slack](https://infisical.com/slack) for quick support.
+</Info>
 
-      <Info>
-        Running into issues? Join Infisical's [community Slack](https://infisical.com/slack) for quick support.
-      </Info>
 
 
+## Use Infisical in a Jenkins Pipeline
 
-      ## Use Infisical in a Jenkins Pipeline
+To fetch secrets using Infisical in a Pipeline job, you'll need to expose the Jenkins credential you created above as an environment variable.
+To do so, click **New Item** from the dashboard navigation sidebar:
 
-      To fetch secrets using Infisical in a Pipeline job, you'll need to expose the Jenkins credential you created above as an environment variable.
-      To do so, click **New Item** from the dashboard navigation sidebar:
+![Jenkins step 6](../../images/integrations/jenkins/jenkins_6.png)
 
-      ![Jenkins step 6](../../images/integrations/jenkins/jenkins_6.png)
+Enter the name of the job, choose the **Pipeline** option, and click OK.
 
-      Enter the name of the job, choose the **Pipeline** option, and click OK.
+![Jenkins step 12](../../images/integrations/jenkins/jenkins_12.png)
 
-      ![Jenkins step 12](../../images/integrations/jenkins/jenkins_12.png)
+Scroll down to the **Pipeline** section, paste the following into the **Script** field, and click **Save**.
 
-      Scroll down to the **Pipeline** section, paste the following into the **Script** field, and click **Save**.
+```
+pipeline {
+    agent any
 
-      ```
-      pipeline {
-          agent any
+    environment {
+        INFISICAL_TOKEN = credentials('infisical-service-token')
+    }
 
-          environment {
-              MACHINE_IDENTITY_CLIENT_ID = credentials('infisical-machine-identity-client-id')
-              MACHINE_IDENTITY_CLIENT_SECRET = credentials('infisical-machine-identity-client-secret')
+    stages {
+        stage('Run Infisical') {
+            steps {
+                sh("infisical secrets --env=dev --path=/")
 
-          }
+                // doesn't work
+                // sh("docker run --rm test-container infisical secrets")
 
-          stages {
-              stage('Run Infisical') {
-                  steps {
-                      sh("export INFISICAL_TOKEN=$(infisical login --method=universal-auth --client-id=${MACHINE_IDENTITY_CLIENT_ID} --client-secret=${MACHINE_IDENTITY_CLIENT_SECRET} --silent --plain)")
-                      sh("infisical secrets --env=dev --path=/ --projectId=<your-project-id>")
+                // works
+                // sh("docker run -e INFISICAL_TOKEN=${INFISICAL_TOKEN} --rm test-container infisical secrets --env=dev --path=/")
 
-                      // doesn't work
-                      // sh("docker run --rm test-container infisical secrets --projectId=<your-project-id>")
+                // doesn't work
+                // sh("docker-compose up -d")
 
-                      // works
-                      // sh("docker run -e INFISICAL_TOKEN=${INFISICAL_TOKEN} --rm test-container infisical secrets --env=dev --path=/ --projectId=<your-project-id>")
-
-                      // doesn't work
-                      // sh("docker-compose up -d")
-
-                      // works
-                      // sh("INFISICAL_TOKEN=${INFISICAL_TOKEN} docker-compose up -d")
-                  }
-              }
-          }
-      }
-      ```
-
-  </Tab>
-
-  <Tab title="Service Token (Deprecated)">
-    ## Add Infisical Service Token to Jenkins
-
-    <Warning>
-
-Service tokens are being deprecated in favor of [machine identities](/documentation/platform/identities/machine-identities).
-
-They will be removed in the future in accordance with the deprecation notice and timeline stated [here](https://infisical.com/blog/deprecating-api-keys).
-
-</Warning>
-
-    After setting up your project in Infisical and installing the Infisical CLI to the environment where your Jenkins builds will run, you will need to add the Infisical Service Token to Jenkins.
-
-    To generate a Infisical service token, follow the guide [here](/documentation/platform/token).
-    Once you have generated the token, navigate to **Manage Jenkins > Manage Credentials** in your Jenkins instance.
-
-    ![Jenkins step 1](../../images/integrations/jenkins/jenkins_1.png)
-
-    Click on the credential store you want to store the Infisical Service Token in. In this case, we're using the default Jenkins global store.
-
-    <Info>
-      Each of your projects will have a different `INFISICAL_TOKEN`.
-      As a result, it may make sense to spread these out into separate credential domains depending on your use case.
-    </Info>
-
-    ![Jenkins step 2](../../images/integrations/jenkins/jenkins_2.png)
-
-    Now, click Add Credentials.
-
-    ![Jenkins step 3](../../images/integrations/jenkins/jenkins_3.png)
-
-    Choose **Secret text** for the **Kind** option from the dropdown list and enter the Infisical Service Token in the **Secret** field.
-    Although the **ID** can be any value, we'll set it to `infisical-service-token` for the sake of this guide.
-    The description is optional and can be any text you prefer.
-
-
-    ![Jenkins step 4](../../images/integrations/jenkins/jenkins_4.png)
-
-    When you're done, you should see a credential similar to the one below:
-
-    ![Jenkins step 5](../../images/integrations/jenkins/jenkins_5.png)
-
-
-    ## Use Infisical in a Freestyle Project
-
-    To fetch secrets with Infisical in a Freestyle Project job, you'll need to expose the credential you created above as an environment variable to the Infisical CLI.
-    To do so, first click **New Item** from the dashboard navigation sidebar:
-
-    ![Jenkins step 6](../../images/integrations/jenkins/jenkins_6.png)
-
-    Enter the name of the job, choose the **Freestyle Project** option, and click **OK**.
-
-    ![Jenkins step 7](../../images/integrations/jenkins/jenkins_7.png)
-
-    Scroll down to the **Build Environment** section and enable the **Use secret text(s) or file(s)** option. Then click **Add** under the **Bindings** section and choose **Secret text** from the dropdown menu.
-
-    ![Jenkins step 8](../../images/integrations/jenkins/jenkins_8.png)
-
-    Enter `INFISICAL_TOKEN` in the **Variable** field then click the **Specific credentials** option from the Credentials section and select the credential you created earlier.
-    In this case, we saved it as `Infisical service token` so we'll choose that from the dropdown menu.
-
-    ![Jenkins step 9](../../images/integrations/jenkins/jenkins_9.png)
-
-    Scroll down to the **Build** section and choose **Execute shell** from the **Add build step** menu.
-
-    ![Jenkins step 10](../../images/integrations/jenkins/jenkins_10.png)
-
-    In the command field, you can now use the Infisical CLI to fetch secrets.
-    The example command below will print the secrets using the service token passed as a credential. When done, click  **Save**.
-
-    ```
-    infisical secrets --env=dev --path=/
-    ```
-
-    ![Jenkins step 11](../../images/integrations/jenkins/jenkins_11.png)
-
-    Finally, click **Build Now** from the navigation sidebar to run your new job.
-
-    <Info>
-      Running into issues? Join Infisical's [community Slack](https://infisical.com/slack) for quick support.
-    </Info>
-
-
-
-    ## Use Infisical in a Jenkins Pipeline
-
-    To fetch secrets using Infisical in a Pipeline job, you'll need to expose the Jenkins credential you created above as an environment variable.
-    To do so, click **New Item** from the dashboard navigation sidebar:
-
-    ![Jenkins step 6](../../images/integrations/jenkins/jenkins_6.png)
-
-    Enter the name of the job, choose the **Pipeline** option, and click OK.
-
-    ![Jenkins step 12](../../images/integrations/jenkins/jenkins_12.png)
-
-    Scroll down to the **Pipeline** section, paste the following into the **Script** field, and click **Save**.
-
-    ```
-    pipeline {
-        agent any
-
-        environment {
-            INFISICAL_TOKEN = credentials('infisical-service-token')
-        }
-
-        stages {
-            stage('Run Infisical') {
-                steps {
-                    sh("infisical secrets --env=dev --path=/")
-
-                    // doesn't work
-                    // sh("docker run --rm test-container infisical secrets")
-
-                    // works
-                    // sh("docker run -e INFISICAL_TOKEN=${INFISICAL_TOKEN} --rm test-container infisical secrets --env=dev --path=/")
-
-                    // doesn't work
-                    // sh("docker-compose up -d")
-
-                    // works
-                    // sh("INFISICAL_TOKEN=${INFISICAL_TOKEN} docker-compose up -d")
-                }
+                // works
+                // sh("INFISICAL_TOKEN=${INFISICAL_TOKEN} docker-compose up -d")
             }
         }
     }
-    ```
-
-  </Tab>
-
-</Tabs>
+}
+```
 
 The example provided above serves as an initial guide. It shows how Jenkins adds the `INFISICAL_TOKEN` environment variable, which is configured in the pipeline, into the shell for executing commands.
-There may be instances where this doesn't work as expected in the context of running Docker commands.
+There may be instances where this doesn't work as expected in the context of running Docker commands. 
 However, the list of working examples should provide some insight into how this can be handled properly.

docs/integrations/cloud/aws-amplify.mdx

@@ -4,134 +4,73 @@ description: "Learn how to sync secrets from Infisical to AWS Amplify."
 ---
 
 Prerequisites:
-
 - Infisical Cloud account
 - Add the secrets you wish to sync to Amplify to [Infisical Cloud](https://app.infisical.com)
 
-There are many approaches to sync secrets stored within Infisical to AWS Amplify. This guide describes two such approaches below.
+There are many approaches to sync secrets stored within Infisical to AWS Amplify. This guide describes two such approaches below. 
 
 ## Access Infisical secrets at Amplify build time
 
-This approach enables you to fetch secrets from Infisical during Amplify build time.
+This approach enables you to fetch secrets from Infisical during Amplify build time. 
 
-<Tabs>
+<Steps>
+  <Step title="Generate a service token">
+    Go to your project settings in the Infisical dashboard to generate a [service token](/documentation/platform/token). This service token will allow you to authenticate and fetch secrets from Infisical. Once you have created a service token with the required permissions, you’ll need to provide the token to the CLI installed in your Docker container.
+  </Step>
+  <Step title="Set the service token as an Amplify environment variable">
+    ![aws amplify env console](../../images/integrations/aws/integrations-amplify-env-console.png)
+    1. In the Amplify console, choose App Settings, and then select Environment variables.
+    2. In the Environment variables section, select Manage variables.
+    3. Under Variable, enter the key **INFISICAL_TOKEN**. For the value, enter the generated service token from the previous step.
+    4. Click save.
+  </Step>
+  <Step title="Install Infisical CLI to the Amplify build step">
+    In the prebuild phase, add the command in AWS Amplify to install the Infisical CLI.
 
-  <Tab title="Machine Identity (Recommended)">
-    <Steps>
-      <Step title="Create a machine identity">
-          Create a machine identtiy and connect it to your Infisical project. You can read more about how to use machine identities [here](/documentation/platform/identities/machine-identities). The machine identity will allow you to authenticate and fetch secrets from Infisical.
-      </Step>
+    ```yaml
+    build:
+      phases:
+        preBuild:
+          commands:
+		- sudo curl -1sLf 'https://dl.cloudsmith.io/public/infisical/infisical-cli/setup.rpm.sh' | sudo -E bash
+		- sudo yum install infisical
+    ```
+  </Step>
+  <Step title="Modify the build command">
+    You can now pull secrets from Infisical using the CLI and save them as a `.env` file. To do this, modify the build commands.
 
-      <Step title="Set the machine identity client ID and client secret as Amplify environment variables">
-        ![aws amplify env console](../../images/integrations/aws/integrations-amplify-env-console-identity.png)
-        1. In the Amplify console, choose App Settings, and then select Environment variables.
-        2. In the Environment variables section, select Manage variables.
-        3. Under the first Variable enter `INFISICAL_MACHINE_IDENTITY_CLIENT_ID`, and for the value, enter the client ID of the machine identity you created in the previous step.
-        4. Under the second Variable enter `INFISICAL_MACHINE_IDENTITY_CLIENT_SECRET`, and for the value, enter the client secret of the machine identity you created in the previous step.
-        5. Click save.
-      </Step>
-
-      <Step title="Install Infisical CLI to the Amplify build step">
-        In the prebuild phase, add the command in AWS Amplify to install the Infisical CLI.
-
-        ```yaml
+    ```yaml
+    build:
+      phases:
         build:
-          phases:
-            preBuild:
-              commands:
-        - sudo curl -1sLf 'https://dl.cloudsmith.io/public/infisical/infisical-cli/setup.rpm.sh' | sudo -E bash
-        - sudo yum -y install infisical
-        ```
-      </Step>
+          commands:
+		- INFISICAL_TOKEN=${INFISICAL_TOKEN}
+	    	- infisical export --format=dotenv > .env
+	    	- <rest of the commands>
+    ```
+  </Step>
+</Steps>
 
-      <Step title="Modify the build command">
-        You can now pull secrets from Infisical using the CLI and save them as a `.env` file. To do this, modify the build commands.
+## Sync Secrets Using AWS SSM Parameter Store 
 
-        ```yaml
-        build:
-          phases:
-            build:
-              commands:
-        - INFISICAL_TOKEN=$(infisical login --method=universal-auth --client-id=${INFISICAL_MACHINE_IDENTITY_CLIENT_ID} --client-secret=${INFISICAL_MACHINE_IDENTITY_CLIENT_SECRET} --silent --plain)
-            - infisical export --format=dotenv > .env
-            - <rest of the commands>
-        ```
-      </Step>
-    </Steps>
+Another approach to use secrets from Infisical in AWS Amplify is to utilize AWS Parameter Store. 
+At high level, you begin by using Infisical's AWS SSM Parameter Store integration to sync secrets from Infisical to AWS SSM Parameter Store. You then instruct AWS Amplify to consume those secrets from AWS SSM Parameter Store as [environment secrets](https://docs.aws.amazon.com/amplify/latest/userguide/environment-variables.html#environment-secrets).
 
-  </Tab>
-
-  <Tab title="Service Token (Deprecated)">
-    
-    <Warning>
-      Service tokens are being deprecated in favor of [machine identities](/documentation/platform/identities/machine-identities).
-
-      They will be removed in the future in accordance with the deprecation notice and timeline stated [here](https://infisical.com/blog/deprecating-api-keys).
-    </Warning>
-
-    <Steps>
-      <Step title="Generate a service token">
-        Go to your project settings in the Infisical dashboard to generate a [service token](/documentation/platform/token). This service token will allow you to authenticate and fetch secrets from Infisical. Once you have created a service token with the required permissions, you’ll need to provide the token to the CLI installed in your Docker container.
-      </Step>
-      <Step title="Set the service token as an Amplify environment variable">
-        ![aws amplify env console](../../images/integrations/aws/integrations-amplify-env-console.png)
-        1. In the Amplify console, choose App Settings, and then select Environment variables.
-        2. In the Environment variables section, select Manage variables.
-        3. Under Variable, enter the key **INFISICAL_TOKEN**. For the value, enter the generated service token from the previous step.
-        4. Click save.
-      </Step>
-      <Step title="Install Infisical CLI to the Amplify build step">
-        In the prebuild phase, add the command in AWS Amplify to install the Infisical CLI.
-
-        ```yaml
-        build:
-          phases:
-            preBuild:
-              commands:
-        - sudo curl -1sLf 'https://dl.cloudsmith.io/public/infisical/infisical-cli/setup.rpm.sh' | sudo -E bash
-        - sudo yum -y install infisical
-        ```
-      </Step>
-      <Step title="Modify the build command">
-        You can now pull secrets from Infisical using the CLI and save them as a `.env` file. To do this, modify the build commands.
-
-        ```yaml
-        build:
-          phases:
-            build:
-              commands:
-        - INFISICAL_TOKEN=${INFISICAL_TOKEN}
-            - infisical export --format=dotenv > .env
-            - <rest of the commands>
-        ```
-      </Step>
-    </Steps>
-
-    ## Sync Secrets Using AWS SSM Parameter Store
-
-    Another approach to use secrets from Infisical in AWS Amplify is to utilize AWS Parameter Store.
-    At high level, you begin by using Infisical's AWS SSM Parameter Store integration to sync secrets from Infisical to AWS SSM Parameter Store. You then instruct AWS Amplify to consume those secrets from AWS SSM Parameter Store as [environment secrets](https://docs.aws.amazon.com/amplify/latest/userguide/environment-variables.html#environment-secrets).
-
-    <Steps>
-      <Step title="Follow the AWS SSM Parameter Store Integration guide">
-        Follow the [Infisical AWS SSM Parameter Store Integration Guide](./aws-parameter-store) to set up the integration. Pause once you reach the step where it asks you to select the path you would like to sync.
-      </Step>
-      <Step title="Find your Amplify App ID">
-        ![amplify app id](../../images/integrations/aws/integrations-amplify-app-id.png)
-        1. Open your AWS Amplify App console.
-        2. Go to **Actions >> View App Settings**
-        3. The App ID will be the last part of the App ARN field after the slash.
-      </Step>
-      <Step title="Set AWS SSM Parameter Store path">
-        You need to set the path in the format `/amplify/[amplify_app_id]/[your-amplify-environment-name]` as the path option in AWS SSM Parameter Infisical Integration.
-      </Step>
-    </Steps>
-
-  </Tab>
-</Tabs>
+<Steps>
+  <Step title="Follow the AWS SSM Parameter Store Integration guide">
+    Follow the [Infisical AWS SSM Parameter Store Integration Guide](./aws-parameter-store) to set up the integration. Pause once you reach the step where it asks you to select the path you would like to sync. 
+  </Step>
+  <Step title="Find your Amplify App ID">
+    ![amplify app id](../../images/integrations/aws/integrations-amplify-app-id.png)
+    1. Open your AWS Amplify App console.
+    2. Go to **Actions >> View App Settings**
+    3. The App ID will be the last part of the App ARN field after the slash.
+  </Step>
+  <Step title="Set AWS SSM Parameter Store path">
+    You need to set the path in the format `/amplify/[amplify_app_id]/[your-amplify-environment-name]` as the path option in AWS SSM Parameter Infisical Integration.
+  </Step>
+</Steps>
 
 <Info>
-  Accessing an environment secret during a build is similar to accessing
-  environment variables, except that environment secrets are stored in
-  `process.env.secrets` as a JSON string.
+  Accessing an environment secret during a build is similar to accessing environment variables, except that environment secrets are stored in `process.env.secrets` as a JSON string.
 </Info>

docs/integrations/frameworks/terraform.mdx

@@ -34,9 +34,7 @@ Set up the Infisical provider by specifying the `host` and `service_token`. Repl
 ```hcl main.tf
 provider "infisical" {
   host          = "https://app.infisical.com" # Only required if using self hosted instance of Infisical, default is https://app.infisical.com
-  client_id     = "<>"
-  client_secret = "<>"
-  service_token = "<>" # DEPRECATED, USE MACHINE IDENTITY AUTH INSTEAD
+  service_token = "<>" # Get token https://infisical.com/docs/documentation/platform/token
 }
 ```
 
@@ -56,7 +54,6 @@ Use the `infisical_secrets` data source to fetch your secrets. In this block, yo
 data "infisical_secrets" "my-secrets" {
   env_slug    = "dev"
   folder_path = "/some-folder/another-folder"
-  workspace_id = "your-project-id"
 }
 ```
 

docs/integrations/platforms/docker-compose.mdx

@@ -11,109 +11,46 @@ Prerequisites:
 
 Follow this [guide](./docker) to configure the Infisical CLI for each service that you wish to inject environment variables into; you'll have to update the Dockerfile of each service.
 
-<Tabs>
-  <Tab title="Machine Identity (Recommended)">
-    ### Generate and configure machine identity
-    Generate a machine identity for each service you want to inject secrets into. You can do this by following the steps in the [Machine Identity](/documentation/platform/identities/machine-identities) guide.
+## Generate service token 
 
-    ### Set the machine identity client ID and client secret as environment variables
-    For each service you want to inject secrets into, set two environment variable called `INFISICAL_MACHINE_IDENTITY_CLIENT_ID`, and `INFISICAL_MACHINE_IDENTITY_CLIENT_SECRET` equal to the client ID and client secret of the machine identity(s) you created in the previous step.
+Generate a unique [Infisical Token](/documentation/platform/token) for each service.
 
-    In the example below, we set two sets of client ID and client secret for the services.
+## Feed service token to your Docker Compose file
 
-    For the web service we set `INFISICAL_MACHINE_IDENTITY_CLIENT_ID_FOR_WEB` and `INFISICAL_MACHINE_IDENTITY_CLIENT_SECRET_FOR_WEB` as the client ID and client secret respectively.
+For each service you want to inject secrets into, set an environment variable called `INFISICAL_TOKEN` equal to a unique identifier variable.
 
-    For the API service we set `INFISICAL_MACHINE_IDENTITY_CLIENT_ID_FOR_API` and `INFISICAL_MACHINE_IDENTITY_CLIENT_SECRET_FOR_API` as the client ID and client secret respectively.
+In the example below, we set `INFISICAL_TOKEN_FOR_WEB` and `INFISICAL_TOKEN_FOR_API` as the `INFISICAL_TOKEN` for the services.
 
-    ```yaml
-    # Example Docker Compose file
-    services:
-      web:
-        build: .
-        image: example-service-1
-        environment:
-          - INFISICAL_MACHINE_IDENTITY_CLIENT_ID=${INFISICAL_MACHINE_IDENTITY_CLIENT_ID_FOR_WEB}
-          - INFISICAL_MACHINE_IDENTITY_CLIENT_SECRET=${INFISICAL_MACHINE_IDENTITY_CLIENT_SECRET_FOR_WEB}
+```yaml
+# Example Docker Compose file
+services:
+  web:
+    build: .
+    image: example-service-1
+    environment:
+      - INFISICAL_TOKEN=${INFISICAL_TOKEN_FOR_WEB}
 
-      api:
-        build: .
-        image: example-service-2
-        environment:
-          - INFISICAL_MACHINE_IDENTITY_CLIENT_ID=${INFISICAL_MACHINE_IDENTITY_CLIENT_ID_FOR_API}
-          - INFISICAL_MACHINE_IDENTITY_CLIENT_SECRET=${INFISICAL_MACHINE_IDENTITY_CLIENT_SECRET_FOR_API}
+  api:
+    build: .
+    image: example-service-2
+    environment:
+      - INFISICAL_TOKEN=${INFISICAL_TOKEN_FOR_API}
+```
 
-    ```
+## Export shell variables
 
-    ### Export shell variables
-    Next, set the shell variables you defined in your compose file. This can be done manually or via your CI/CD environment. Once done, it will be used to populate the corresponding `INFISICAL_MACHINE_IDENTITY_CLIENT_ID` and `INFISICAL_MACHINE_IDENTITY_CLIENT_SECRET` in your Docker Compose file.
+Next, set the shell variables you defined in your compose file. This can be done manually or via your CI/CD environment. Once done, it will be used to populate the corresponding `INFISICAL_TOKEN`
+in your Docker Compose file.
 
-    ```bash
-    #Example
+```bash
+#Example
 
-    # Token refers to the token we generated in step 2 for this service
-    export INFISICAL_MACHINE_IDENTITY_CLIENT_ID_FOR_WEB=<client_id>
-    export INFISICAL_MACHINE_IDENTITY_CLIENT_SECRET_FOR_WEB=<client_secret>
+# Token refers to the token we generated in step 2 for this service
+export INFISICAL_TOKEN_FOR_WEB=<token>
 
-    # Token refers to the token we generated in step 2 for this service
-    export INFISICAL_MACHINE_IDENTITY_CLIENT_ID_FOR_API=<client_id>
-    export INFISICAL_MACHINE_IDENTITY_CLIENT_SECRET_FOR_API=<client_secret>
+# Token refers to the token we generated in step 2 for this service
+export INFISICAL_TOKEN_FOR_API=<token>
 
-    # Then run your compose file in the same terminal.
-    docker-compose ...
-    ```
-
-  </Tab>
-  <Tab title="Service Token (Deprecated)">
-
-  <Warning>
-  Service tokens are being deprecated in favor of [machine identities](/documentation/platform/identities/machine-identities).
-
-They will be removed in the future in accordance with the deprecation notice and timeline stated [here](https://infisical.com/blog/deprecating-api-keys).
-
-  </Warning>
-
-    ## Generate service token
-    Generate a unique [Service Token](/documentation/platform/token) for each service.
-
-    ## Feed service token to your Docker Compose file
-
-    For each service you want to inject secrets into, set an environment variable called `INFISICAL_TOKEN` equal to a unique identifier variable.
-
-    In the example below, we set `INFISICAL_TOKEN_FOR_WEB` and `INFISICAL_TOKEN_FOR_API` as the `INFISICAL_TOKEN` for the services.
-
-    ```yaml
-    # Example Docker Compose file
-    services:
-      web:
-        build: .
-        image: example-service-1
-        environment:
-          - INFISICAL_TOKEN=${INFISICAL_TOKEN_FOR_WEB}
-
-      api:
-        build: .
-        image: example-service-2
-        environment:
-          - INFISICAL_TOKEN=${INFISICAL_TOKEN_FOR_API}
-    ```
-
-    ## Export shell variables
-
-    Next, set the shell variables you defined in your compose file. This can be done manually or via your CI/CD environment. Once done, it will be used to populate the corresponding `INFISICAL_TOKEN`
-    in your Docker Compose file.
-
-    ```bash
-    #Example
-
-    # Token refers to the token we generated in step 2 for this service
-    export INFISICAL_TOKEN_FOR_WEB=<token>
-
-    # Token refers to the token we generated in step 2 for this service
-    export INFISICAL_TOKEN_FOR_API=<token>
-
-    # Then run your compose file in the same terminal.
-    docker-compose ...
-    ```
-
-  </Tab>
-</Tabs>
+# Then run your compose file in the same terminal.
+docker-compose ...
+```

docs/integrations/platforms/docker-pass-envs.mdx

@@ -10,11 +10,8 @@ For this method to function as expected, you must have a bash shell (for process
 
 ## 1. Authentication
 
-If you are already logged in via the CLI you can skip this step. Otherwise, head to your organization settings in Infisical Cloud to create a [Machine Identity](../../documentation/platform/identities/machine-identities). The machine identity will allow you to authenticate and fetch secrets from Infisical. 
-Once you have created a machine identity with the required permissions, you'll need to feed the token to the CLI.
-<Info> 
-  Please note that we highly recommend using `infisical login` for local development.
-</Info>
+If you are already logged in via the CLI you can skip this step. Otherwise, head to your project settings in Infisical Cloud to generate an [Infisical Token](/documentation/platform/token). The service token will allow you to authenticate and fetch secrets from Infisical. 
+Once you have created a service token with the required permissions, you'll need to feed the token to the CLI. 
 
 #### Pass as flag
 You may use the --token flag to set the token 
@@ -30,14 +27,8 @@ The CLI is configured to look for an environment variable named `INFISICAL_TOKEN
 export INFISICAL_TOKEN=<>
 ```
 
-You can use the `infisical login --method=universal-auth` command to directly obtain a universal auth access token and set it as an environment variable.
-
-```bash
-  export INFISICAL_TOKEN=$(infisical login --method=universal-auth --client-id=<your-client-id> --client-secret=<your-client-secret> --silent --plain)
-```
-
 <Warning>
-  In production scenarios, please to avoid using the `infisical login` command and instead use a [machine identity](../../documentation/platform/identities/machine-identities).
+  In production scenarios, please to avoid using the `infisical login` command and instead use a [service token](/documentation/platform/token).
 </Warning>
 
 ## 2. Run your docker command with Infisical