diff --git a/docs/documentation/platform/identities/aws-auth.mdx b/docs/documentation/platform/identities/aws-auth.mdx
index 3eb094cc46..5c82a3807c 100644
--- a/docs/documentation/platform/identities/aws-auth.mdx
+++ b/docs/documentation/platform/identities/aws-auth.mdx
@@ -75,7 +75,14 @@ access the Infisical API using the AWS Auth authentication method.
- Name (required): A friendly name for the identity.
- Role (required): A role from the **Organization Roles** tab for the identity to assume. The organization role assigned will determine what organization level resources this identity can have access to.
- Once you've created an identity, you'll be prompted to configure the authentication method for it. Here, select **AWS Auth**.
+ Once you've created an identity, you'll be redirected to a page where you can manage the identity.
+
+ 
+
+ Since the identity has been configured with Universal Auth by default, you should re-configure it to use AWS Auth instead. To do this, press to edit the **Authentication** section,
+ remove the existing Universal Auth configuration, and add a new AWS Auth configuration onto the identity.
+
+ 
diff --git a/docs/documentation/platform/identities/azure-auth.mdx b/docs/documentation/platform/identities/azure-auth.mdx
index 3ac9577525..910ca10145 100644
--- a/docs/documentation/platform/identities/azure-auth.mdx
+++ b/docs/documentation/platform/identities/azure-auth.mdx
@@ -75,7 +75,14 @@ access the Infisical API using the Azure Auth authentication method.
- Name (required): A friendly name for the identity.
- Role (required): A role from the **Organization Roles** tab for the identity to assume. The organization role assigned will determine what organization level resources this identity can have access to.
- Once you've created an identity, you'll be prompted to configure the authentication method for it. Here, select **Azure Auth**.
+ Once you've created an identity, you'll be redirected to a page where you can manage the identity.
+
+ 
+
+ Since the identity has been configured with Universal Auth by default, you should re-configure it to use Azure Auth instead. To do this, press to edit the **Authentication** section,
+ remove the existing Universal Auth configuration, and add a new Azure Auth configuration onto the identity.
+
+ 
diff --git a/docs/documentation/platform/identities/gcp-auth.mdx b/docs/documentation/platform/identities/gcp-auth.mdx
index c836a946d2..09b41852d0 100644
--- a/docs/documentation/platform/identities/gcp-auth.mdx
+++ b/docs/documentation/platform/identities/gcp-auth.mdx
@@ -81,7 +81,14 @@ access the Infisical API using the GCP ID Token authentication method.
- Name (required): A friendly name for the identity.
- Role (required): A role from the **Organization Roles** tab for the identity to assume. The organization role assigned will determine what organization level resources this identity can have access to.
- Once you've created an identity, you'll be prompted to configure the authentication method for it. Here, select **GCP Auth** and set the **Type** to **GCP ID Token Auth**.
+ Once you've created an identity, you'll be redirected to a page where you can manage the identity.
+
+ 
+
+ Since the identity has been configured with Universal Auth by default, you should re-configure it to use GCP Auth instead. To do this, press to edit the **Authentication** section,
+ remove the existing Universal Auth configuration, and add a new GCP Auth configuration onto the identity; set the **Type** field to **GCP ID Token Auth**.
+
+ 
@@ -243,9 +250,16 @@ access the Infisical API using the GCP IAM authentication method.
- Name (required): A friendly name for the identity.
- Role (required): A role from the **Organization Roles** tab for the identity to assume. The organization role assigned will determine what organization level resources this identity can have access to.
- Once you've created an identity, you'll be prompted to configure the authentication method for it. Here, select **GCP IAM Auth** and set the **Type** to **GCP IAM Auth**.
+ Once you've created an identity, you'll be redirected to a page where you can manage the identity.
- 
+ 
+
+ Since the identity has been configured with Universal Auth by default, you should re-configure it to use GCP Auth instead. To do this, press to edit the **Authentication** section,
+ remove the existing Universal Auth configuration, and add a new GCP Auth configuration onto the identity; set the **Type** field to **GCP IAM Auth**.
+
+ 
+
+ 
Here's some more guidance on each field:
diff --git a/docs/documentation/platform/identities/kubernetes-auth.mdx b/docs/documentation/platform/identities/kubernetes-auth.mdx
index b154f36f6b..153b0f4a35 100644
--- a/docs/documentation/platform/identities/kubernetes-auth.mdx
+++ b/docs/documentation/platform/identities/kubernetes-auth.mdx
@@ -42,9 +42,9 @@ To be more specific:
4. If all is well, Infisical returns a short-lived access token that the application can use to make authenticated requests to the Infisical API.
-We recommend using one of Infisical's clients like SDKs or the Infisical Agent
-to authenticate with Infisical using Kubernetes Auth as they handle the
-authentication process including service account credential retrieval for you.
+ We recommend using one of Infisical's clients like SDKs or the Infisical Agent
+ to authenticate with Infisical using Kubernetes Auth as they handle the
+ authentication process including service account credential retrieval for you.
## Guide
@@ -137,9 +137,16 @@ In the following steps, we explore how to create and use identities for your app
- Name (required): A friendly name for the identity.
- Role (required): A role from the **Organization Roles** tab for the identity to assume. The organization role assigned will determine what organization level resources this identity can have access to.
- Once you've created an identity, you'll be prompted to configure the authentication method for it. Here, select **Kubernetes Auth**.
+ Once you've created an identity, you'll be redirected to a page where you can manage the identity.
- 
+ 
+
+ Since the identity has been configured with Universal Auth by default, you should re-configure it to use Kubernetes Auth instead. To do this, press to edit the **Authentication** section,
+ remove the existing Universal Auth configuration, and add a new Kubernetes Auth configuration onto the identity.
+
+ 
+
+ 
Here's some more guidance on each field:
@@ -240,8 +247,8 @@ In the following steps, we explore how to create and use identities for your app
In certain cases, you may want to extend the lifespan of an access token; to do so, you must set a max TTL parameter.
-A token can be renewed any number of time and each call to renew it will extend the toke life by increments of access token TTL.
-Regardless of how frequently an access token is renewed, its lifespan remains bound to the maximum TTL determined at its creation
+A token can be renewed any number of times where each call to renew it can extend the token's lifetime by increments of the access token's TTL.
+Regardless of how frequently an access token is renewed, its lifespan remains bound to the maximum TTL determined at its creation.
diff --git a/docs/documentation/platform/identities/machine-identities.mdx b/docs/documentation/platform/identities/machine-identities.mdx
index 2db1834c47..f92439c867 100644
--- a/docs/documentation/platform/identities/machine-identities.mdx
+++ b/docs/documentation/platform/identities/machine-identities.mdx
@@ -7,7 +7,7 @@ description: "Learn how to use Machine Identities to programmatically interact w
An Infisical machine identity is an entity that represents a workload or application that require access to various resources in Infisical. This is conceptually similar to an IAM user in AWS or service account in Google Cloud Platform (GCP).
-Each identity must authenticate with the Infisical API using a supported authentication method like [Universal Auth](/documentation/platform/identities/universal-auth), [Kubernetes Auth](/documentation/platform/identities/kubernetes-auth), [AWS Auth](/documentation/platform/identities/aws-auth), [Azure Auth](/documentation/platform/identities/azure-auth), or [GCP Auth](/documentation/platform/identities/gcp-auth) to get back a short-lived access token to be used in subsequent requests.
+Each identity must authenticate with the Infisical API using a supported authentication method like [Token Auth](/documentation/platform/identities/token-auth), [Universal Auth](/documentation/platform/identities/universal-auth), [Kubernetes Auth](/documentation/platform/identities/kubernetes-auth), [AWS Auth](/documentation/platform/identities/aws-auth), [Azure Auth](/documentation/platform/identities/azure-auth), or [GCP Auth](/documentation/platform/identities/gcp-auth) to get back a short-lived access token to be used in subsequent requests.
@@ -28,13 +28,14 @@ A typical workflow for using identities consists of four steps:
## Authentication Methods
-To interact with various resources in Infisical, Machine Identities are able to authenticate using:
+To interact with various resources in Infisical, Machine Identities can authenticate with the Infisical API using:
-- [Universal Auth](/documentation/platform/identities/universal-auth): A platform-agnostic authentication method that can be configured on an identity suitable to authenticate from any platform/environment.
-- [Kubernetes Auth](/documentation/platform/identities/kubernetes-auth): A Kubernetes-native authentication method for applications (e.g. pods) to authenticate with Infisical.
-- [AWS Auth](/documentation/platform/identities/aws-auth): An AWS-native authentication method for AWS services (e.g. EC2, Lambda functions, etc.) to authenticate with Infisical.
-- [Azure Auth](/documentation/platform/identities/azure-auth): An Azure-native authentication method for Azure resources (e.g. Azure VMs, Azure App Services, Azure Functions, Azure Kubernetes Service, etc.) to authenticate with Infisical.
-- [GCP Auth](/documentation/platform/identities/gcp-auth): A GCP-native authentication method for GCP resources (e.g. Compute Engine, App Engine, Cloud Run, Google Kubernetes Engine, IAM service accounts, etc.) to authenticate with Infisical.
+- [Token Auth](/documentation/platform/identities/token-auth): A platform-agnostic, simple authentication method suitable to authenticate with Infisical using a token.
+- [Universal Auth](/documentation/platform/identities/universal-auth): A platform-agnostic authentication method suitable to authenticate with Infisical using a Client ID and Client Secret.
+- [Kubernetes Auth](/documentation/platform/identities/kubernetes-auth): A Kubernetes-native authentication method for applications (e.g. pods).
+- [AWS Auth](/documentation/platform/identities/aws-auth): An AWS-native authentication method for AWS services (e.g. EC2, Lambda functions, etc.).
+- [Azure Auth](/documentation/platform/identities/azure-auth): An Azure-native authentication method for Azure resources (e.g. Azure VMs, Azure App Services, Azure Functions, Azure Kubernetes Service, etc.).
+- [GCP Auth](/documentation/platform/identities/gcp-auth): A GCP-native authentication method for GCP resources (e.g. Compute Engine, App Engine, Cloud Run, Google Kubernetes Engine, IAM service accounts, etc.).
## FAQ
@@ -52,6 +53,8 @@ You can learn more about how to do this in the CLI quickstart [here](/cli/usage)
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.
+
+ If you're looking for a simple authentication method, similar to service tokens, that can be bound onto an identity, we recommend checking out [Token Auth](/documentation/platform/identities/token-auth).
There are a few reasons for why this might happen:
diff --git a/docs/documentation/platform/identities/token-auth.mdx b/docs/documentation/platform/identities/token-auth.mdx
new file mode 100644
index 0000000000..61906542fd
--- /dev/null
+++ b/docs/documentation/platform/identities/token-auth.mdx
@@ -0,0 +1,138 @@
+---
+title: Token Auth
+description: "Learn how to authenticate to Infisical from any platform or environment using an access token."
+---
+
+**Token Auth** is a platform-agnostic, simple authentication method that can be configured for a [machine identity](/documentation/platform/identities/machine-identities) to authenticate from any platform/environment using a token.
+
+## Diagram
+
+The following sequence digram illustrates the Token Auth workflow for authenticating clients with Infisical.
+
+```mermaid
+sequenceDiagram
+ participant Client as Client
+ participant Infis as Infisical
+
+ Note over Client,Infis: Access Infisical API with Token
+ Client->>Infis: Make authenticated requests using the token
+
+```
+
+## Concept
+
+Token Auth is the simplest authentication method that a client can use to authenticate with Infisical.
+
+Unlike other authentication methods where a client must exchange credential(s) for a short-lived access token to access the Infisical API,
+Token Auth allows a client to make authenticated requests to the Infisical API directly using a token. Conceptually, this is similar to using an API Key.
+
+To be more specific:
+
+1. An operator creates an access token in the Infisical UI.
+2. The operator shares the access token with the client which it can then use to make authenticated requests to the Infisical API.
+
+## Guide
+
+In the following steps, we explore how to create and use identities for your workloads and applications to access the Infisical API
+using the Token Auth authentication method.
+
+
+
+ To create an identity, head to your Organization Settings > Access Control > Machine Identities and press **Create identity**.
+
+ 
+
+ When creating an identity, you specify an organization level [role](/documentation/platform/role-based-access-controls) for it to assume; you can configure roles in Organization Settings > Access Control > Organization Roles.
+
+ 
+
+ Now input a few details for your new identity. Here's some guidance for each field:
+
+ - Name (required): A friendly name for the identity.
+ - Role (required): A role from the **Organization Roles** tab for the identity to assume. The organization role assigned will determine what organization level resources this identity can have access to.
+
+ Once you've created an identity, you'll be redirected to a page where you can manage the identity.
+
+ 
+
+ Since the identity has been configured with Universal Auth by default, you should re-configure it to use Token Auth instead. To do this, press to edit the **Authentication** section,
+ remove the existing Universal Auth configuration, and add a new Token Auth configuration onto the identity.
+
+ 
+
+ 
+
+ Here's some more guidance on each field:
+
+ - Access Token TTL (default is `2592000` equivalent to 30 days): The lifetime for an acccess token in seconds. This value will be referenced at renewal time.
+ - Access Token Max TTL (default is `2592000` equivalent to 30 days): The maximum lifetime for an acccess token in seconds. This value will be referenced at renewal time.
+ - Access Token Max Number of Uses (default is `0`): The maximum number of times that an access token can be used; a value of `0` implies infinite number of uses.
+ - Access Token Trusted IPs: The IPs or CIDR ranges that access tokens can be used from. By default, each token is given the `0.0.0.0/0`, allowing usage from any network address.
+
+
+ Restricting access token usage to specific trusted IPs 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.
+
+
+
+
+ In order to use the identity with Token Auth, you'll need to create an (access) token; you can think of this token akin
+ to an API Key used to authenticate with the Infisical API. With that, press **Create Token**.
+
+ 
+
+ 
+
+ 
+
+ Copy the token and keep it handy as you'll need it to authenticate with the Infisical API.
+
+
+
+ To enable the identity to access project-level resources such as secrets within a specific project, you should add it to that project.
+
+ To do this, head over to the project you want to add the identity to and go to Project Settings > Access Control > Machine Identities and press **Add identity**.
+
+ Next, select the identity you want to add to the project and the project level role you want to allow it to assume. The project role assigned will determine what project level resources this identity can have access to.
+
+ 
+
+ 
+
+
+
+ To access the Infisical API as the identity, you can use the generated access token from step 2
+ to authenticate with the [Infisical API](/api-reference/overview/introduction).
+
+
+ Each identity access token has a time-to-live (TLL) which you can infer from the response of the login operation;
+ the default TTL is `7200` seconds which can be adjusted in the Token Auth configuration.
+
+ If an identity access token expires, it can no longer authenticate with the Infisical API. In this case,
+ a new access token should be obtained.
+
+
+
+
+
+**FAQ**
+
+
+
+ There are a few reasons for why this might happen:
+
+ - The access token has expired. If this is the case, you should obtain a new access token or consider extending the token's TTL.
+ - The identity is insufficently permissioned to interact with the resources you wish to access.
+ - The access token is being used from an untrusted IP.
+
+
+ A identity access token can have a time-to-live (TTL) or incremental lifetime after which it expires.
+
+ In certain cases, you may want to extend the lifespan of an access token; to do so, you must set a max TTL parameter.
+
+A token can be renewed any number of times where each call to renew it can extend the token's lifetime by increments of the access token's TTL.
+Regardless of how frequently an access token is renewed, its lifespan remains bound to the maximum TTL determined at its creation.
+
+
+
diff --git a/docs/documentation/platform/identities/universal-auth.mdx b/docs/documentation/platform/identities/universal-auth.mdx
index 09ed1cb7b1..32e916631c 100644
--- a/docs/documentation/platform/identities/universal-auth.mdx
+++ b/docs/documentation/platform/identities/universal-auth.mdx
@@ -3,7 +3,7 @@ title: Universal Auth
description: "Learn how to authenticate to Infisical from any platform or environment."
---
-**Universal Auth** is a platform-agnostic authentication method that can be configured for a [machine identity](/documentation/platform/identities/machine-identities) suitable to authenticate from any platform/environment.
+**Universal Auth** is a platform-agnostic authentication method that can be configured for a [machine identity](/documentation/platform/identities/machine-identities) to authenticate from any platform/environment using a Client ID and Client Secret.
## Diagram
@@ -55,9 +55,16 @@ using the Universal Auth authentication method.
- Name (required): A friendly name for the identity.
- Role (required): A role from the **Organization Roles** tab for the identity to assume. The organization role assigned will determine what organization level resources this identity can have access to.
+ Once you've created an identity, you'll be redirected to a page where you can manage the identity.
+
+ 
+
Once you've created an identity, you'll be prompted to configure the **Universal Auth** authentication method for it.
- 
+ By default, the identity has been configured with Universal Auth. If you wish, you can edit the Universal Auth configuration
+ details by pressing to edit the **Authentication** section.
+
+ 
Here's some more guidance on each field:
@@ -77,12 +84,12 @@ using the Universal Auth authentication method.
In order to use the identity, you'll need the non-sensitive **Client ID**
of the identity and a **Client Secret** for it; you can think of these credentials akin to a username
- and password used to authenticate with the Infisical API. With that, press on the key icon on the identity to generate a **Client Secret**
- for it.
+ and password used to authenticate with the Infisical API.
+ With that, press **Create Client Secret**.
- 
- 
- 
+ 
+ 
+ 
Feel free to input any (optional) details for the **Client Secret** configuration:
@@ -131,7 +138,7 @@ using the Universal Auth authentication method.
Each identity access token has a time-to-live (TLL) which you can infer from the response of the login operation;
- the default TTL is `7200` seconds which can be adjusted.
+ the default TTL is `7200` seconds which can be adjusted in the Universal Auth configuration.
If an identity access token expires, it can no longer authenticate with the Infisical API. In this case,
a new access token should be obtained by performing another login operation.
@@ -148,7 +155,6 @@ using the Universal Auth authentication method.
- The client secret or access token has expired.
- The identity is insufficently permissioned to interact with the resources you wish to access.
- - You are attempting to access a `/raw` secrets endpoint that requires your project to disable E2EE.
- The client secret/access token is being used from an untrusted IP.
@@ -156,8 +162,8 @@ using the Universal Auth authentication method.
In certain cases, you may want to extend the lifespan of an access token; to do so, you must set a max TTL parameter.
-A token can be renewed any number of time and each call to renew it will extend the toke life by increments of access token TTL.
-Regardless of how frequently an access token is renewed, its lifespan remains bound to the maximum TTL determined at its creation
+A token can be renewed any number of times where each call to renew it can extend the token's lifetime by increments of the access token's TTL.
+Regardless of how frequently an access token is renewed, its lifespan remains bound to the maximum TTL determined at its creation.
diff --git a/docs/images/platform/identities/identities-org-create-aws-auth-method.png b/docs/images/platform/identities/identities-org-create-aws-auth-method.png
index 4b902c048a..c2bb447e17 100644
Binary files a/docs/images/platform/identities/identities-org-create-aws-auth-method.png and b/docs/images/platform/identities/identities-org-create-aws-auth-method.png differ
diff --git a/docs/images/platform/identities/identities-org-create-azure-auth-method.png b/docs/images/platform/identities/identities-org-create-azure-auth-method.png
index fc0fd16657..fe57021bb9 100644
Binary files a/docs/images/platform/identities/identities-org-create-azure-auth-method.png and b/docs/images/platform/identities/identities-org-create-azure-auth-method.png differ
diff --git a/docs/images/platform/identities/identities-org-create-gcp-gce-auth-method.png b/docs/images/platform/identities/identities-org-create-gcp-gce-auth-method.png
index 899130c428..6a7100d300 100644
Binary files a/docs/images/platform/identities/identities-org-create-gcp-gce-auth-method.png and b/docs/images/platform/identities/identities-org-create-gcp-gce-auth-method.png differ
diff --git a/docs/images/platform/identities/identities-org-create-gcp-iam-auth-method.png b/docs/images/platform/identities/identities-org-create-gcp-iam-auth-method.png
index 9dacf9f89f..f871b4ba48 100644
Binary files a/docs/images/platform/identities/identities-org-create-gcp-iam-auth-method.png and b/docs/images/platform/identities/identities-org-create-gcp-iam-auth-method.png differ
diff --git a/docs/images/platform/identities/identities-org-create-kubernetes-auth-method.png b/docs/images/platform/identities/identities-org-create-kubernetes-auth-method.png
index 0c2fe072d2..c79e71ba37 100644
Binary files a/docs/images/platform/identities/identities-org-create-kubernetes-auth-method.png and b/docs/images/platform/identities/identities-org-create-kubernetes-auth-method.png differ
diff --git a/docs/images/platform/identities/identities-org-create-token-auth-method.png b/docs/images/platform/identities/identities-org-create-token-auth-method.png
new file mode 100644
index 0000000000..a897aac58a
Binary files /dev/null and b/docs/images/platform/identities/identities-org-create-token-auth-method.png differ
diff --git a/docs/images/platform/identities/identities-org-create-universal-auth-method.png b/docs/images/platform/identities/identities-org-create-universal-auth-method.png
new file mode 100644
index 0000000000..a3a0a8d9cd
Binary files /dev/null and b/docs/images/platform/identities/identities-org-create-universal-auth-method.png differ
diff --git a/docs/images/platform/identities/identities-page-remove-default-auth.png b/docs/images/platform/identities/identities-page-remove-default-auth.png
new file mode 100644
index 0000000000..5b8f22fa2c
Binary files /dev/null and b/docs/images/platform/identities/identities-page-remove-default-auth.png differ
diff --git a/docs/images/platform/identities/identities-page.png b/docs/images/platform/identities/identities-page.png
new file mode 100644
index 0000000000..35b8af658d
Binary files /dev/null and b/docs/images/platform/identities/identities-page.png differ
diff --git a/docs/images/platform/identities/identities-token-auth-create-1.png b/docs/images/platform/identities/identities-token-auth-create-1.png
new file mode 100644
index 0000000000..c4d689fb8e
Binary files /dev/null and b/docs/images/platform/identities/identities-token-auth-create-1.png differ
diff --git a/docs/images/platform/identities/identities-token-auth-create-2.png b/docs/images/platform/identities/identities-token-auth-create-2.png
new file mode 100644
index 0000000000..b812cb1c03
Binary files /dev/null and b/docs/images/platform/identities/identities-token-auth-create-2.png differ
diff --git a/docs/images/platform/identities/identities-token-auth-create-3.png b/docs/images/platform/identities/identities-token-auth-create-3.png
new file mode 100644
index 0000000000..8a18973cca
Binary files /dev/null and b/docs/images/platform/identities/identities-token-auth-create-3.png differ
diff --git a/docs/images/platform/identities/identities-universal-auth-create-1.png b/docs/images/platform/identities/identities-universal-auth-create-1.png
new file mode 100644
index 0000000000..f12789a3c6
Binary files /dev/null and b/docs/images/platform/identities/identities-universal-auth-create-1.png differ
diff --git a/docs/images/platform/identities/identities-universal-auth-create-2.png b/docs/images/platform/identities/identities-universal-auth-create-2.png
new file mode 100644
index 0000000000..4706c21b8c
Binary files /dev/null and b/docs/images/platform/identities/identities-universal-auth-create-2.png differ
diff --git a/docs/images/platform/identities/identities-universal-auth-create-3.png b/docs/images/platform/identities/identities-universal-auth-create-3.png
new file mode 100644
index 0000000000..ddb9483357
Binary files /dev/null and b/docs/images/platform/identities/identities-universal-auth-create-3.png differ
diff --git a/docs/images/platform/organization/organization-machine-identities.png b/docs/images/platform/organization/organization-machine-identities.png
index 17bea6e9bf..4400b9f62f 100644
Binary files a/docs/images/platform/organization/organization-machine-identities.png and b/docs/images/platform/organization/organization-machine-identities.png differ
diff --git a/docs/mint.json b/docs/mint.json
index cb08aab32f..aac76b99b1 100644
--- a/docs/mint.json
+++ b/docs/mint.json
@@ -162,6 +162,7 @@
"pages": [
"documentation/platform/auth-methods/email-password",
"documentation/platform/token",
+ "documentation/platform/identities/token-auth",
"documentation/platform/identities/universal-auth",
"documentation/platform/identities/kubernetes-auth",
"documentation/platform/identities/gcp-auth",