Merge pull request #60 from Infisical/daniel/pg-fix

Fix PG

infisical/api/create_secret.py

@@ -18,5 +18,12 @@ def create_secret_req(api_request: Session, options: CreateSecretDTO) -> SecretR
             "secretPath": options.path,
         },
     )
+
+    json_object = response.json()
+
+    json_object["secret"]["workspace"] = options.workspace_id
+    json_object["secret"]["environment"] = options.environment
+
+
 
-    return SecretResponse.parse_obj(response.json())
+    return SecretResponse.parse_obj(json_object)

infisical/api/delete_secret.py

@@ -13,4 +13,9 @@ def delete_secret_req(api_request: Session, options: DeleteSecretDTO) -> SecretR
         },
     )
 
-    return SecretResponse.parse_obj(response.json())
+    json_object = response.json()
+
+    json_object["secret"]["workspace"] = options.workspace_id
+    json_object["secret"]["environment"] = options.environment
+
+    return SecretResponse.parse_obj(json_object)

infisical/api/get_secret.py

@@ -13,4 +13,9 @@ def get_secret_req(api_request: Session, options: GetSecretDTO) -> SecretRespons
         },
     )
 
-    return SecretResponse.parse_obj(response.json())
+    json_object = response.json()
+
+    json_object["secret"]["workspace"] = options.workspace_id
+    json_object["secret"]["environment"] = options.environment
+
+    return SecretResponse.parse_obj(json_object)

infisical/api/get_secrets.py

@@ -21,7 +21,19 @@ def get_secrets_req(api_request: Session, options: GetSecretsDTO) -> SecretsResp
             "include_imports": str(options.include_imports).lower()
         },
     )
-    data = SecretsResponse.parse_obj(response.json())
+
+    json_object = response.json()
+
+    for obj in json_object['secrets']:
+        obj["workspace"] = options.workspace_id
+        obj["environment"] = options.environment
+
+    for obj in json_object['imports']:
+        for obj in obj['secrets']:
+            obj["workspace"] = options.workspace_id
+            obj["environment"] = options.environment
+
+    data = SecretsResponse.parse_obj(json_object)
 
     return (data.secrets if data.secrets else [], data.imports if data.imports else [])
 

infisical/api/models.py

@@ -1,34 +1,23 @@
 from datetime import datetime
-from typing import List, Optional
+from typing import Optional
 
 from pydantic import BaseModel, Field
 
 
-class GetServiceTokenDetailsUserResponse(BaseModel):
-    id: str = Field(..., alias="_id")
-    email: str
-    created_at: datetime = Field(..., alias="createdAt")
-    updated_at: datetime = Field(..., alias="updatedAt")
-    v: int = Field(..., alias="__v")
-    first_name: str = Field(..., alias="firstName")
-    last_name: str = Field(..., alias="lastName")
-
-
 class GetServiceTokenDetailsResponse(BaseModel):
-    id: str = Field(..., alias="_id")
+    id: str = Field(..., alias="id")
     name: str
-    workspace: str
-    user: GetServiceTokenDetailsUserResponse
+    workspace: str = Field(..., alias="projectId")
     expires_at: Optional[datetime] = Field(None, alias="expiresAt")
     encrypted_key: str = Field(..., alias="encryptedKey")
     iv: str
     tag: str
     created_at: datetime = Field(..., alias="createdAt")
     updated_at: datetime = Field(..., alias="updatedAt")
-    v: int = Field(..., alias="__v")
+    #v: int = Field(..., alias="__v")
 
 class KeyData(BaseModel):
-    id: str = Field(..., alias="_id")
+    id: str = Field(..., alias="id")
     workspace: str
     encrypted_key: str = Field(..., alias="encryptedKey")
     public_key: str = Field(..., alias="publicKey")

infisical/api/update_secret.py

@@ -16,4 +16,9 @@ def update_secret_req(api_request: Session, options: UpdateSecretDTO) -> SecretR
         },
     )
 
-    return SecretResponse.parse_obj(response.json())
+    json_object = response.json()
+
+    json_object["secret"]["workspace"] = options.workspace_id
+    json_object["secret"]["environment"] = options.environment
+
+    return SecretResponse.parse_obj(json_object)

infisical/constants.py

@@ -4,4 +4,4 @@
 AUTH_MODE_SERVICE_TOKEN = "service_token"
 AUTH_MODE_SERVICE_TOKEN_V3 = "service_token_v3"
 
-SERVICE_TOKEN_REGEX = re.compile(r"(st\.[a-f0-9]+\.[a-f0-9]+)\.([a-f0-9]+)")
+SERVICE_TOKEN_REGEX = re.compile(r"(st\.[a-f0-9-]+\.[a-f0-9]+)\.([a-f0-9]+)")

infisical/models/models.py

@@ -6,7 +6,7 @@
 
 
 class Secret(BaseModel):
-    id: str = Field(..., alias="_id")
+    id: str = Field(..., alias="id")
     version: int
     workspace: str
     user: Optional[str]
@@ -26,8 +26,8 @@ class SecretBundle(BaseModel):
     secret_name: str
     secret_value: Optional[str]
     version: Optional[int]
-    workspace: Optional[str]
-    environment: Optional[str]
+    # workspace: Optional[str]
+    # environment: Optional[str]
     type: Optional[Literal["shared", "personal"]]
     created_at: Optional[datetime] = Field(None, alias="createdAt")
     updated_at: Optional[datetime] = Field(None, alias="updatedAt")
@@ -36,7 +36,7 @@ class SecretBundle(BaseModel):
 
 
 class ServiceTokenData(BaseModel):
-    id: str = Field(..., alias="_id")
+    id: str = Field(..., alias="id")
     name: str
     workspace: str
     environment: str