Merge branch 'develop' into feature/be-6106-upload

Author: fuatguzel

docs/build/variable/download.md

@@ -0,0 +1,28 @@
+# `appcircle build variable download`
+
+Download environment variables as JSON
+
+```plaintext
+appcircle build variable download [options]
+```
+
+## Examples
+
+```plaintext
+$ appcircle build variable download --variableGroupId "Variable Group ID"
+
+$ appcircle build variable download --variableGroupId "Variable Group ID" --path "/path/to/save"
+```
+         
+## Options
+
+```plaintext
+      --variableGroupId <uuid>  Variable Groups ID
+      --path <string>           [OPTIONAL] The path for JSON file to be downloaded (Defaults to the current directory)
+```                       
+
+## Options inherited from parent commands
+
+```plaintext
+      --help   Show help for command
+``` 

docs/build/variable/index.md

@@ -17,4 +17,5 @@ appcircle build variable [command] [options]
 - [`group`](group/index.md)
 - [`create`](create.md)
 - [`view`](view.md)
+- [`download`](download.md)
 

docs/organization/create-sub.md

@@ -0,0 +1,18 @@
+# `appcircle organization create-sub`
+
+Create a new sub-organization under the current organization.
+
+```plaintext
+appcircle organization create-sub [options]
+```
+
+## Options
+
+```plaintext
+      --name <string>          Name of the sub-organization
+```
+## Options inherited from parent commands
+
+```plaintext
+      --help   Show help for command
+``` 

docs/organization/index.md

@@ -15,6 +15,7 @@ appcircle organization [command] [options]
 ## Subcommands
 
 - [`view`](view.md)
+- [`create-sub`](create-sub.md)
 - [`user`](user/index.md)
 - [`role`](role/index.md)
 

docs/publish/variable/group/download.md

@@ -0,0 +1,28 @@
+# `appcircle publish variable group download`
+
+Download publish environment variables as JSON
+
+```plaintext
+appcircle publish variable group download [options]
+```
+
+## Examples
+
+```plaintext
+$ appcircle publish variable group download --publishVariableGroupId "Variable Group ID"
+
+$ appcircle publish variable group download --publishVariableGroupId "Variable Group ID" --path "/path/to/save"
+```
+         
+## Options
+
+```plaintext
+      --publishVariableGroupId <uuid>  Variable Group ID
+      --path <string>                  [OPTIONAL] The path for JSON file to be downloaded (Defaults to the current directory)
+```                       
+
+## Options inherited from parent commands
+
+```plaintext
+      --help   Show help for command
+``` 

docs/publish/variable/group/index.md

@@ -17,4 +17,5 @@ appcircle publish profile variable group [command] [options]
 - [`list`](list.md)
 - [`view`](view.md)
 - [`upload`](upload.md)
+- [`download`](download.md)
 

src/core/command-runner.ts

@@ -114,6 +114,7 @@ import {
   commitEnterpriseFileUpload,
   updateTestingDistributionReleaseNotes,
   getLatestAppVersionId,
+  createSubOrganization
 } from '../services';
 import { commandWriter, configWriter } from './writer';
 import { trustAppcircleCertificate } from '../security/trust-url-certificate';
@@ -261,6 +262,16 @@ const handleOrganizationCommand = async (command: ProgramCommand, params: any) =
       fullCommandName: command.fullCommandName,
       data: userInfo.roles,
     });
+  } else if (command.fullCommandName === `${PROGRAM_NAME}-organization-create-sub`) {
+    const spinner = createOra('Creating sub-organization...').start();
+    try {
+      const response = await createSubOrganization({ name: params.name });
+      const successMessage = `${params.name} sub organization created successfully!`;
+      spinner.succeed(successMessage);
+    } catch (error: any) {
+      const errorMessage = error.response?.data?.message || error.message || 'Failed to create sub-organization';
+      spinner.fail(`Error: ${errorMessage}`);
+    }
   } else {
     const beutufiyCommandName = command.fullCommandName.split('-').join(' ');
     console.error(`"${beutufiyCommandName} ..." command not found \nRun "${beutufiyCommandName} --help" for more information`);
@@ -477,6 +488,59 @@ const handlePublishCommand = async (command: ProgramCommand, params: any) => {
         spinner.fail('Failed to upload environment variables');
         throw e;
       }
+    } else if (command.fullCommandName === `${PROGRAM_NAME}-publish-variable-group-download`) {
+      const spinner = createOra('Downloading publish environment variables...').start();
+      try {
+        const variableGroups = await getPublishVariableGroups();
+        const variableGroup = variableGroups.find((group: any) => group.id === params.publishVariableGroupId);
+        
+        if (!variableGroup) {
+          spinner.fail(`Variable group with ID ${params.publishVariableGroupId} not found`);
+          throw new Error(`Variable group not found`);
+        }
+        
+        const variables = await getPublishVariableListByGroupId(params);
+        
+        let formattedVariables = variables.variables.map((variable: any) => ({
+          key: variable.key,
+          value: variable.value,
+          isSecret: variable.isSecret,
+          isFile: variable.isFile || false,
+          id: variable.key
+        }));
+        
+        formattedVariables.sort((a: any, b: any) => {
+          const aKey = a.key;
+          const bKey = b.key;
+          return bKey.localeCompare(aKey);
+        });
+        
+        const timestamp = Date.now();
+        const fileName = `${variableGroup.name}_${timestamp}.json`;
+        
+        let filePath = params.path || process.cwd();
+        
+        if (filePath.includes('~')) {
+          filePath = filePath.replace(/~/g, os.homedir());
+        }
+        
+        filePath = path.resolve(filePath);
+        
+        if (!fs.existsSync(filePath)) {
+          fs.mkdirSync(filePath, { recursive: true });
+        }
+        
+        if (fs.statSync(filePath).isDirectory()) {
+          filePath = path.join(filePath, fileName);
+        }
+        
+        fs.writeFileSync(filePath, JSON.stringify(formattedVariables));
+        
+        spinner.succeed(`Publish environment variables downloaded successfully to ${filePath}`);
+      } catch (e) {
+        spinner.fail('Failed to download publish environment variables');
+        throw e;
+      }
     } else if(command.fullCommandName === `${PROGRAM_NAME}-publish-profile-version-list`){
       const spinner = createOra('Fetching...').start();
       const appVersions = await getAppVersions(params);
@@ -556,7 +620,7 @@ const handleBuildCommand = async (command: ProgramCommand, params:any) => {
       fullCommandName: command.fullCommandName,
       data: responseData,
     });
-  }else if(command.fullCommandName === `${PROGRAM_NAME}-build-profile-branch-list`) {
+  }else if(command.fullCommandName === `${PROGRAM_NAME}-build-profile-branch-list`){
     const spinner = createOra('Fetching...').start();
     const responseData = await getBranches(params);
     spinner.succeed();
@@ -683,6 +747,57 @@ const handleBuildCommand = async (command: ProgramCommand, params:any) => {
       fullCommandName: command.fullCommandName,
       data: responseData,
     });
+  } else if(command.fullCommandName === `${PROGRAM_NAME}-build-variable-download`){
+    const spinner = createOra('Downloading environment variables...').start();
+    try {
+      const variableGroups = await getEnvironmentVariableGroups();
+      const variableGroup = variableGroups.find((group: any) => group.id === params.variableGroupId);
+      
+      if (!variableGroup) {
+        spinner.fail(`Variable group with ID ${params.variableGroupId} not found`);
+        throw new Error(`Variable group not found`);
+      }
+      
+      const responseData = await getEnvironmentVariables(params);
+      
+      let formattedVariables = responseData.map((variable: any) => ({
+        key: variable.key,
+        value: variable.value,
+        isSecret: variable.isSecret,
+        isFile: variable.isFile || false,
+        id: variable.key
+      }));
+      
+      formattedVariables.sort((a: any, b: any) => {
+        const aKey = a.key;
+        const bKey = b.key;
+        return bKey.localeCompare(aKey);
+      });
+      
+      const timestamp = Date.now();
+      const fileName = `${variableGroup.name}_${timestamp}.json`;
+      let filePath = params.path || process.cwd();
+      
+      if (filePath.includes('~')) {
+        filePath = filePath.replace(/~/g, os.homedir());
+      }
+      
+      filePath = path.resolve(filePath);
+
+      if (!fs.existsSync(filePath)) {
+        fs.mkdirSync(filePath, { recursive: true });
+      }
+
+      if (fs.statSync(filePath).isDirectory()) {
+        filePath = path.join(filePath, fileName);
+      }
+      
+      fs.writeFileSync(filePath, JSON.stringify(formattedVariables));
+      spinner.succeed(`Environment variables downloaded successfully to ${filePath}`);
+    } catch (e) {
+      spinner.fail('Failed to download environment variables');
+      throw e;
+    }
   } else if(command.fullCommandName === `${PROGRAM_NAME}-build-variable-create`){
     const spinner = createOra('Creating environment variable').start();
     try {

src/core/commands.ts

@@ -568,6 +568,26 @@ export const Commands: CommandType[] = [
                 valueType: 'uuid',
               },
             ],
+          },
+          {
+            command: "download",
+            description: 'Download environment variables as JSON',
+            params: [
+              {
+                name: 'variableGroupId',
+                description: 'Variable Groups ID',
+                type: CommandParameterTypes.SELECT,
+                valueType: 'uuid',
+              },
+              {
+                name: 'path',
+                description: '[OPTIONAL] The path for JSON file to be downloaded',
+                longDescription:'[OPTIONAL] The path for JSON file to be downloaded (Defaults to the current directory)',
+                type: CommandParameterTypes.STRING,
+                valueType: 'string',
+                required: false,
+              }
+            ],
           }
         ],
         params: []
@@ -1503,7 +1523,27 @@ export const Commands: CommandType[] = [
                     required: true
                   }
                 ],
+              },
+              {
+            command: "download",
+            description: 'Download environment variables as JSON',
+            params: [
+              {
+                name: 'variableGroupId',
+                description: 'Variable Groups ID',
+                type: CommandParameterTypes.SELECT,
+                valueType: 'uuid',
+              },
+              {
+                name: 'path',
+                description: '[OPTIONAL] The path for JSON file to be downloaded',
+                longDescription:'[OPTIONAL] The path for JSON file to be downloaded (Defaults to the current directory)',
+                type: CommandParameterTypes.STRING,
+                valueType: 'string',
+                required: false,
               }
+            ],
+            },
             ]
           }
         ]
@@ -1755,6 +1795,18 @@ export const Commands: CommandType[] = [
           required: false,
         }],
       },
+      {
+        command: 'create-sub',
+        description: 'Create a sub-organization',
+        longDescription: 'Create a new sub-organization under the current organization.',
+        params: [{
+          name: 'name',
+          description: 'Name of the sub-organization',
+          type: CommandParameterTypes.STRING,
+          valueType: 'string',
+          required: true,
+        }],
+      },
       {
         command: 'user',
         description: 'User management',

src/services/organization.ts

@@ -208,4 +208,23 @@ export const getOrganizationUserinfo = async (options: OptionsType<{ organizatio
   }
 
   return user;
+};
+
+/**
+ * Creates a sub-organization under the current organization.
+ * 
+ * @param {OptionsType<{ name: string }>} options - Object containing name of the sub-organization to be created.
+ * @return {Promise<any>} The data returned from the creation response.
+ */
+export const createSubOrganization = async (options: OptionsType<{ name: string }>) => {
+  const response = await appcircleApi.post(
+    `identity/v1/organizations/current/sub-organizations`,
+    {
+      name: options.name
+    },
+    {
+      headers: getHeaders(),
+    }
+  );
+  return response.data;
 };