proca 1.4.0 → 1.5.0

package/README.md

@@ -8,17 +8,17 @@ Proca is an open-source campaign toolkit designed to empower activists and organ
 
 One of Proca's standout features is its robust support for coalition campaigns, allowing multiple organisations to collaborate seamlessly on shared initiatives. This coalition functionality enables partners to pool resources, amplify their collective voice, and reach a broader audience whilst maintaining individual branding and supporter relationships. By facilitating data sharing and joint campaign management, Proca helps coalitions to maximise their impact, streamline operations, and present a united front on critical issues, all whilst ensuring compliance with data protection regulations.
 
-
 ## usage
 
 ### global installation
+
   <!-- usage -->
 ```sh-session
 $ npm install -g proca
 $ proca COMMAND
 running command...
 $ proca (--version)
-proca/1.4.0 linux-x64 node-v20.12.2
+proca/1.5.0 linux-x64 node-v20.12.2
 $ proca --help [COMMAND]
 USAGE
   $ proca COMMAND
@@ -28,33 +28,50 @@ USAGE
 
 ### local development
 
-```sh-session
+````sh-session
    $ git clone https://github.com/fixthestatusquo/proca-cli.git
-   $ git install
    $ cd proca-cli
-   $./proca-cli --help
+   $ npm install
+   $ npm link # let the proca widget and other use the local version
+   $./proca-cli config add --env=local  --url=http://localhost:4000/api
+   $./proca-cli config server --env=local #check if the config is working
+   $./proca-cli config user #check if the config is working
 ...
-```
+
+you should also use the local proca-api in your [widget generator](https://github.com/fixthestatusquo/proca)
+
+```sh-session
+   $ cd /your/path/to/proca
+   $ npm link proca-api
+   $ npm link proca # use the local proca-cli repo
+...
+
+
+````
 
 ### TOPICS
--  campaign  Handle campaigns
+
+- campaign Handle campaigns
 - org
--  config    create setting to access the server authentication
+- config create setting to access the server authentication
 - widget
 - supporters (counter)
 
 # Commands
+
 <!-- commands -->
 * [`proca action add`](#proca-action-add)
 * [`proca action count`](#proca-action-count)
 * [`proca action list [TITLE]`](#proca-action-list-title)
 * [`proca action replay`](#proca-action-replay)
 * [`proca campaign add [TITLE]`](#proca-campaign-add-title)
-* [`proca campaign close [TITLE]`](#proca-campaign-close-title)
+* [`proca campaign close`](#proca-campaign-close)
 * [`proca campaign delete`](#proca-campaign-delete)
 * [`proca campaign get`](#proca-campaign-get)
 * [`proca campaign list [TITLE]`](#proca-campaign-list-title)
+* [`proca campaign status`](#proca-campaign-status)
 * [`proca config add [ENV] [HUMAN] [JSON] [CSV] [SIMPLIFY]`](#proca-config-add-env-human-json-csv-simplify)
+* [`proca config folder`](#proca-config-folder)
 * [`proca config init [ENV] [HUMAN] [JSON] [CSV] [SIMPLIFY]`](#proca-config-init-env-human-json-csv-simplify)
 * [`proca config server`](#proca-config-server)
 * [`proca config set [KEY] [VALUE]`](#proca-config-set-key-value)
@@ -81,6 +98,8 @@ USAGE
 * [`proca user get`](#proca-user-get)
 * [`proca user leave`](#proca-user-leave)
 * [`proca user list`](#proca-user-list)
+* [`proca user reset [USER]`](#proca-user-reset-user)
+* [`proca user whoami`](#proca-user-whoami)
 * [`proca widget add`](#proca-widget-add)
 * [`proca widget get`](#proca-widget-get)
 * [`proca widget list`](#proca-widget-list)
@@ -234,22 +253,17 @@ EXAMPLES
   $ proca campaign add -n <new_campaign> the full name of the campaign
 ```
 
-## `proca campaign close [TITLE]`
+## `proca campaign close`
 
 ```
 USAGE
-  $ proca campaign close [TITLE] -n <campaign name> -o <org name> --status
-    closed|ignored|live [--json | --human | --csv] [--env <value>] [--simplify]
-
-ARGUMENTS
-  TITLE  title of the campaign
+  $ proca campaign close [ID_NAME_DXID] --status draft|live|closed|ignored [--json |
+    --human | --csv] [--env <value>] [--simplify]
 
 FLAGS
-  -n, --name=<campaign name>  (required) name of the campaign
-  -o, --org=<org name>        (required) name of the coordinator
-      --env=<value>           [default: default] allow to switch between configurations (server or users)
-      --status=<option>       (required) [default: closed] status
-                              <options: closed|ignored|live>
+  --env=<value>      [default: default] allow to switch between configurations (server or users)
+  --status=<option>  (required) Status to set
+                     <options: draft|live|closed|ignored>
 
 OUTPUT FLAGS
   --csv            Format output as csv
@@ -257,8 +271,13 @@ OUTPUT FLAGS
   --json           Format output as json
   --[no-]simplify  flatten and filter to output only the most important attributes, mostly relevant for json
 
+ALIASES
+  $ proca campaign close
+
 EXAMPLES
   $ proca campaign close -name <campaign>
+
+  $ proca campaign close -i <campaign_id>
 ```
 
 ## `proca campaign delete`
@@ -350,14 +369,41 @@ EXAMPLES
   $ proca campaign list %pizza%
 ```
 
+## `proca campaign status`
+
+```
+USAGE
+  $ proca campaign status [ID_NAME_DXID] --status draft|live|closed|ignored [--json |
+    --human | --csv] [--env <value>] [--simplify]
+
+FLAGS
+  --env=<value>      [default: default] allow to switch between configurations (server or users)
+  --status=<option>  (required) Status to set
+                     <options: draft|live|closed|ignored>
+
+OUTPUT FLAGS
+  --csv            Format output as csv
+  --human          Format output to be read on screen by a human [default]
+  --json           Format output as json
+  --[no-]simplify  flatten and filter to output only the most important attributes, mostly relevant for json
+
+ALIASES
+  $ proca campaign close
+
+EXAMPLES
+  $ proca campaign status -name <campaign>
+
+  $ proca campaign status -i <campaign_id>
+```
+
 ## `proca config add [ENV] [HUMAN] [JSON] [CSV] [SIMPLIFY]`
 
-create setting to access the server authentication
+create setting to access to a server
 
 ```
 USAGE
-  $ proca config add [ENV] [HUMAN] [JSON] [CSV] [SIMPLIFY] --token <API-token> [--json
-    | --human | --csv] [--env <value>] [--simplify] [--force] [--url <url>]
+  $ proca config add [ENV] [HUMAN] [JSON] [CSV] [SIMPLIFY] [--json | --human | --csv]
+    [--env <value>] [--simplify] [--url <url>] [--token <API-token>] [--folder /var/www/proca]
 
 ARGUMENTS
   ENV       [default: default] allow to switch between configurations (server or users)
@@ -367,10 +413,10 @@ ARGUMENTS
   SIMPLIFY  flatten and filter to output only the most important attributes, mostly relevant for json
 
 FLAGS
-  --env=<value>        [default: default] allow to switch between configurations (server or users)
-  --force              write over an existing configuration
-  --token=<API-token>  (required) user token on proca server
-  --url=<url>          [default: https://api.proca.app/api] url of the proca server api
+  --env=<value>            [default: default] allow to switch between configurations (server or users)
+  --folder=/var/www/proca  config folder (in the proca widget generator)
+  --token=<API-token>      user token on proca server
+  --url=<url>              [default: https://api.proca.app/api] url of the proca server api
 
 OUTPUT FLAGS
   --csv            Format output as csv
@@ -379,7 +425,7 @@ OUTPUT FLAGS
   --[no-]simplify  flatten and filter to output only the most important attributes, mostly relevant for json
 
 DESCRIPTION
-  create setting to access the server authentication
+  create setting to access to a server
 
 ALIASES
   $ proca config setup
@@ -389,14 +435,37 @@ EXAMPLES
   $ proca config add --user=xavier@example.org --token=API-12345789
 ```
 
+## `proca config folder`
+
+Check and create config folders
+
+```
+USAGE
+  $ proca config folder [--json | --human | --csv] [--env <value>] [--simplify]
+
+FLAGS
+  --env=<value>  [default: default] allow to switch between configurations (server or users)
+
+OUTPUT FLAGS
+  --csv            Format output as csv
+  --human          Format output to be read on screen by a human [default]
+  --json           Format output as json
+  --[no-]simplify  flatten and filter to output only the most important attributes, mostly relevant for json
+
+DESCRIPTION
+  Check and create config folders
+
+  Check if the PROCA_CONFIG_FOLDER is set up, if it is, check if the required subfolders exists and create if not
+```
+
 ## `proca config init [ENV] [HUMAN] [JSON] [CSV] [SIMPLIFY]`
 
-create setting to access the server authentication
+create setting to access to a server
 
 ```
 USAGE
-  $ proca config init [ENV] [HUMAN] [JSON] [CSV] [SIMPLIFY] --token <API-token> [--json
-    | --human | --csv] [--env <value>] [--simplify] [--force] [--url <url>]
+  $ proca config init [ENV] [HUMAN] [JSON] [CSV] [SIMPLIFY] [--json | --human | --csv]
+    [--env <value>] [--simplify] [--url <url>] [--token <API-token>] [--folder /var/www/proca]
 
 ARGUMENTS
   ENV       [default: default] allow to switch between configurations (server or users)
@@ -406,10 +475,10 @@ ARGUMENTS
   SIMPLIFY  flatten and filter to output only the most important attributes, mostly relevant for json
 
 FLAGS
-  --env=<value>        [default: default] allow to switch between configurations (server or users)
-  --force              write over an existing configuration
-  --token=<API-token>  (required) user token on proca server
-  --url=<url>          [default: https://api.proca.app/api] url of the proca server api
+  --env=<value>            [default: default] allow to switch between configurations (server or users)
+  --folder=/var/www/proca  config folder (in the proca widget generator)
+  --token=<API-token>      user token on proca server
+  --url=<url>              [default: https://api.proca.app/api] url of the proca server api
 
 OUTPUT FLAGS
   --csv            Format output as csv
@@ -418,7 +487,7 @@ OUTPUT FLAGS
   --[no-]simplify  flatten and filter to output only the most important attributes, mostly relevant for json
 
 DESCRIPTION
-  create setting to access the server authentication
+  create setting to access to a server
 
 ALIASES
   $ proca config setup
@@ -488,12 +557,12 @@ EXAMPLES
 
 ## `proca config setup [ENV] [HUMAN] [JSON] [CSV] [SIMPLIFY]`
 
-create setting to access the server authentication
+create setting to access to a server
 
 ```
 USAGE
-  $ proca config setup [ENV] [HUMAN] [JSON] [CSV] [SIMPLIFY] --token <API-token> [--json
-    | --human | --csv] [--env <value>] [--simplify] [--force] [--url <url>]
+  $ proca config setup [ENV] [HUMAN] [JSON] [CSV] [SIMPLIFY] [--json | --human | --csv]
+    [--env <value>] [--simplify] [--url <url>] [--token <API-token>] [--folder /var/www/proca]
 
 ARGUMENTS
   ENV       [default: default] allow to switch between configurations (server or users)
@@ -503,10 +572,10 @@ ARGUMENTS
   SIMPLIFY  flatten and filter to output only the most important attributes, mostly relevant for json
 
 FLAGS
-  --env=<value>        [default: default] allow to switch between configurations (server or users)
-  --force              write over an existing configuration
-  --token=<API-token>  (required) user token on proca server
-  --url=<url>          [default: https://api.proca.app/api] url of the proca server api
+  --env=<value>            [default: default] allow to switch between configurations (server or users)
+  --folder=/var/www/proca  config folder (in the proca widget generator)
+  --token=<API-token>      user token on proca server
+  --url=<url>              [default: https://api.proca.app/api] url of the proca server api
 
 OUTPUT FLAGS
   --csv            Format output as csv
@@ -515,7 +584,7 @@ OUTPUT FLAGS
   --[no-]simplify  flatten and filter to output only the most important attributes, mostly relevant for json
 
 DESCRIPTION
-  create setting to access the server authentication
+  create setting to access to a server
 
 ALIASES
   $ proca config setup
@@ -545,6 +614,9 @@ OUTPUT FLAGS
 DESCRIPTION
   fetch the information about the current user (based on the token)
 
+ALIASES
+  $ proca user whoami
+
 EXAMPLES
   $ proca config user
 ```
@@ -638,12 +710,13 @@ _See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v6.2.2
 ```
 USAGE
   $ proca org add [--json | --human | --csv] [--env <value>] [--simplify] [--twitter
-    <screen name>] [-n <org name>]
+    <screen name>] [-n <org acronym/name>] [-t <org full name>]
 
 FLAGS
-  -n, --name=<org name>        name of the org
-      --env=<value>            [default: default] allow to switch between configurations (server or users)
-      --twitter=<screen name>  twitter account
+  -n, --name=<org acronym/name>  short name of the org
+  -t, --title=<org full name>    title/full name of the org
+      --env=<value>              [default: default] allow to switch between configurations (server or users)
+      --twitter=<screen name>    twitter account
 
 OUTPUT FLAGS
   --csv            Format output as csv
@@ -652,6 +725,8 @@ OUTPUT FLAGS
   --[no-]simplify  flatten and filter to output only the most important attributes, mostly relevant for json
 
 EXAMPLES
+  $ proca org add --name <twitter of the organisation> --title='this is an organisation'
+
   $ proca org add --twitter <twitter of the organisation>
 ```
 
@@ -709,7 +784,7 @@ view a org
 ```
 USAGE
   $ proca org get [ID_NAME_DXID] [--json | --human | --csv] [--env <value>]
-    [--simplify] [-n <org name>] [--config] [--keys] [--campaigns] [--widgets] [--users]
+    [--simplify] [-n <org name>] [--config] [--keys] [--campaigns] [--users]
 
 FLAGS
   -n, --name=<org name>  name of the org
@@ -718,7 +793,6 @@ FLAGS
       --env=<value>      [default: default] allow to switch between configurations (server or users)
   --[no-]keys
   --[no-]users
-  --[no-]widgets
 
 OUTPUT FLAGS
   --csv            Format output as csv
@@ -1133,6 +1207,60 @@ EXAMPLES
   $ proca user list %pizza%
 ```
 
+## `proca user reset [USER]`
+
+Reset user API token
+
+```
+USAGE
+  $ proca user reset [USER] [--json | --human | --csv] [--env <value>] [--simplify]
+    [--password <value>] [--url <value>]
+
+ARGUMENTS
+  USER  Username (email)
+
+FLAGS
+  --env=<value>       [default: default] allow to switch between configurations (server or users)
+  --password=<value>  Password
+  --url=<value>       URL of the Proca server API
+
+OUTPUT FLAGS
+  --csv            Format output as csv
+  --human          Format output to be read on screen by a human [default]
+  --json           Format output as json
+  --[no-]simplify  flatten and filter to output only the most important attributes, mostly relevant for json
+
+DESCRIPTION
+  Reset user API token
+```
+
+## `proca user whoami`
+
+fetch the information about the current user (based on the token)
+
+```
+USAGE
+  $ proca user whoami [--json | --human | --csv] [--env <value>] [--simplify]
+
+FLAGS
+  --env=<value>  [default: default] allow to switch between configurations (server or users)
+
+OUTPUT FLAGS
+  --csv            Format output as csv
+  --human          Format output to be read on screen by a human [default]
+  --json           Format output as json
+  --[no-]simplify  flatten and filter to output only the most important attributes, mostly relevant for json
+
+DESCRIPTION
+  fetch the information about the current user (based on the token)
+
+ALIASES
+  $ proca user whoami
+
+EXAMPLES
+  $ proca user whoami
+```
+
 ## `proca widget add`
 
 ```

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "proca",
 	"description": "Access the proca api",
-	"version": "1.4.0",
+	"version": "1.5.0",
 	"author": "Xavier",
 	"bin": {
 		"proca": "proca-cli"
@@ -19,7 +19,8 @@
 		"fast-csv": "^5.0.1",
 		"graphql": "^16.10.0",
 		"typescript": "^5.7.3",
-		"urql": "^4.1.0"
+		"urql": "^4.1.0",
+		"prompts": "^2.4.2"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "^1.9.3",

package/src/commands/campaign/status.mjs

@@ -0,0 +1,63 @@
+import { Args, Flags } from "@oclif/core";
+import { error, stdout, ux } from "@oclif/core/ux";
+import Command from "#src/procaCommand.mjs";
+import { gql, mutation } from "#src/urql.mjs";
+
+export default class CampaignStatus extends Command {
+	static args = this.multiid();
+	static aliases = ["campaign:close"];
+
+	static examples = [
+		"<%= config.bin %> <%= command.id %> -name <campaign>",
+		"<%= config.bin %> <%= command.id %> -i <campaign_id>",
+	];
+
+	static isCloseCommand =
+		process.argv.includes("close") ||
+		this.commandPath?.includes("close") ||
+		this.id?.includes("close");
+
+	static flags = {
+		status: Flags.string({
+			...this.flagify({ multiid: true }),
+			description: "Status to set",
+			required: true,
+			default: this.isCloseCommand ? "close" : undefined,
+			options: ["draft", "live", "closed", "ignored"],
+		}),
+	};
+
+	updateStatus = async (props) => {
+		const Query = gql`
+mutation (
+$id: Int,
+$name: String
+$status: String!
+) {
+  updateCampaign (id:$id, input: { name: $name,status: $status }) {
+    name
+    org {name}
+    status
+    title
+  }
+}
+    `;
+
+		const result = await mutation(Query, {
+			//			org: props.org,
+			id: props.id,
+			name: props.name,
+			status: props.status.toUpperCase(),
+		});
+
+		console.log("result", result);
+		return result.updateCampaign;
+	};
+
+	async run() {
+		const { args, flags } = await this.parse();
+
+		const data = await this.updateStatus(flags);
+		return this.output(data);
+	}
+}

package/src/commands/config/add.mjs

@@ -1,18 +1,19 @@
 import { Args, Flags } from "@oclif/core";
-import { error, stdout, ux } from "@oclif/core/ux";
-import { get as getConfig, getFilename, write } from "#src/config.mjs";
+import { error, stdout } from "@oclif/core/ux";
+import prompts from "prompts";
+import { format, get as getConfig, getFilename, write } from "#src/config.mjs";
 import Command from "#src/procaCommand.mjs";
 
-export default class CampaignList extends Command {
+export default class ConfigAdd extends Command {
 	static enableJsonFlag = true;
 	static aliases = ["config:setup", "config:init"];
-	static deprecateAliases = true;
+	//	static deprecateAliases = true;
 
 	static args = {
 		...this.flagify({ multiid: false }),
 	};
 
-	static description = "create setting to access the server authentication";
+	static description = "create setting to access to a server";
 
 	static examples = [
 		"<%= config.bin %> <%= command.id %> --user=xavier@example.org --token=API-12345789",
@@ -21,11 +22,6 @@ export default class CampaignList extends Command {
 	static flags = {
 		// flag with no value (-f, --force)
 		...super.globalFlags,
-		force: Flags.boolean({
-			description: "write over an existing configuration",
-			default: false,
-			helpValue: "(default false)",
-		}),
 		url: Flags.string({
 			description: "url of the proca server api",
 			default: "https://api.proca.app/api",
@@ -34,7 +30,10 @@ export default class CampaignList extends Command {
 		token: Flags.string({
 			description: "user token on proca server",
 			helpValue: "<API-token>",
-			required: true,
+		}),
+		folder: Flags.string({
+			description: "config folder (in the proca widget generator)",
+			helpValue: "/var/www/proca",
 		}),
 		//		n8n: Flags.string({			description: "api access on the n8n server",			helpValue: "<n8n api>",		}),
 		//		supabase: Flags.string({description: "url of the supabase",helpValue: "<url>"}),
@@ -42,46 +41,53 @@ export default class CampaignList extends Command {
 		//		"supabase-secrey-key": Flags.string({			description: "secret service key",		}),
 	};
 
-	format = (obj) => {
-		const content = ["# generated by proca-cli"];
-		for (const [key, value] of Object.entries(obj)) {
-			if (value) {
-				content.push(`${key}='${value.replace(/'/g, "''")}'`);
-			} else {
-				content.push(`#${key}= `);
-			}
-		}
-		return content.join("\n");
-	};
-
-	generate = function () {
+	generate = (flags) => {
 		const mapping = {
 			REACT_APP_NAME: "proca",
-			REACT_APP_API_URL: this.flags.url,
-			PROCA_TOKEN: this.flags.token,
-			N8N_TOKEN: this.flags.n8n,
-			REACT_APP_SUPABASE_URL: this.flags.supabase,
-			REACT_APP_SUPABASE_ANON_KEY: this.flags.supabase_anon_key,
-			SUPABASE_SECRET_KEY: this.flags.supabase_secret_key,
+			REACT_APP_API_URL: flags.url,
+			PROCA_TOKEN: flags.token,
+			PROCA_CONFIG_FOLDER: flags.folder,
+			N8N_TOKEN: flags.n8n,
+			REACT_APP_SUPABASE_URL: flags.supabase,
+			REACT_APP_SUPABASE_ANON_KEY: flags.supabase_anon_key,
+			SUPABASE_SECRET_KEY: flags.supabase_secret_key,
 		};
 
-		return this.format(mapping);
+		return format(mapping);
 	};
 
 	async run() {
-		const { args, flags } = await this.parse();
+		const { args, flags } = await this.parse(this.constructor);
+
 		const file = getFilename(this.config.configDir, flags.env);
-		const userConfig = getConfig(file);
-		if (userConfig && !this.flags.force) {
-			this.error("config file exists already", {
-				code: "CONFIG_EXISTS",
-				_ref: "README.md#",
-				suggestions: [
-					`edit ${file}`,
-					"add --force flag\nWARNING, it will delete the existing file",
-				],
+		const userConfig = getConfig(file, true) || {};
+
+		if (Object.keys(userConfig).length > 0) {
+			this.log(`Config file ${file} exists. Using it to pre-fill values.`);
+		}
+
+		if (!flags.token) {
+			const response = await prompts({
+				type: "text",
+				name: "token",
+				message: this.constructor.flags.token.description,
+				initial: userConfig.PROCA_TOKEN || "API-",
+			});
+			flags.token = response.token;
+		}
+		if (!flags.folder) {
+			const response = await prompts({
+				type: "text",
+				name: "folder",
+				message: this.constructor.flags.folder.description,
+				initial: userConfig.PROCA_FOLDER,
 			});
+			flags.folder = response.folder;
+		}
+
+		if (!flags.token || !flags.token.startsWith("API-")) {
+			return error("Token must start with API-, config file not saved");
 		}
-		write(file, this.generate());
+		write(file, this.generate(flags));
 	}
 }

package/src/commands/config/folder.mjs

@@ -0,0 +1,42 @@
+import fs from "node:fs";
+import path from "node:path";
+import { Command } from "#src/procaCommand.mjs";
+
+export default class FolderConfig extends Command {
+	static summary = "Check and create config folders";
+	static description =
+		"Check if the PROCA_CONFIG_FOLDER is set up, if it is, check if the required subfolders exists and create if not";
+
+	async run() {
+		const configFolder = process.env.PROCA_CONFIG_FOLDER;
+
+		if (!configFolder) {
+			this.error("PROCA_CONFIG_FOLDER environment variable is not set.");
+		}
+
+		const subfolders = [
+			"org",
+			"target/source",
+			"target/server",
+			"target/public",
+			"campaign",
+			"email/actionpage",
+			"email/html",
+			"email/mjml",
+		];
+
+		this.log(`Checking config folder at ${configFolder}`);
+
+		subfolders.forEach((subfolder) => {
+			const fullPath = path.join(configFolder, subfolder);
+			if (!fs.existsSync(fullPath)) {
+				fs.mkdirSync(fullPath, { recursive: true });
+				this.log(`🆕 ${fullPath}`);
+			} else {
+				this.log(`✅ ${fullPath}`);
+			}
+		});
+
+		this.log("Config folder check complete.");
+	}
+}

package/src/commands/config/user.mjs

@@ -4,6 +4,7 @@ import Command from "#src/procaCommand.mjs";
 import { gql, query } from "#src/urql.mjs";
 
 export default class UserList extends Command {
+	static aliases = ["user:whoami"];
 	static description =
 		"fetch the information about the current user (based on the token)";
 

package/src/commands/org/add.mjs

@@ -8,6 +8,7 @@ export default class OrgAdd extends Command {
 	static args = {};
 
 	static examples = [
+		"<%= config.bin %> <%= command.id %> --name <twitter of the organisation> --title='this is an organisation'",
 		"<%= config.bin %> <%= command.id %> --twitter <twitter of the organisation>",
 	];
 
@@ -20,8 +21,13 @@ export default class OrgAdd extends Command {
 		}),
 		name: Flags.string({
 			char: "n",
-			description: "name of the org",
-			helpValue: "<org name>",
+			description: "short name of the org",
+			helpValue: "<org acronym/name>",
+		}),
+		title: Flags.string({
+			char: "t",
+			description: "title/full name of the org",
+			helpValue: "<org full name>",
 		}),
 	};
 
@@ -54,7 +60,11 @@ mutation ($org: OrgInput!) {
 			this.error("You must provide either --name or --twitter");
 		}
 
-		const org = { name: flags.twitter || flags.name, config: {} };
+		const org = {
+			name: flags.twitter || flags.name,
+			title: flags.title || flags.name,
+			config: {},
+		};
 
 		if (flags.twitter) {
 			await getTwitter(org);

package/src/commands/org/get.mjs

@@ -33,10 +33,6 @@ export default class OrgGet extends Command {
 			default: false,
 			allowNo: true,
 		}),
-		widgets: Flags.boolean({
-			default: true,
-			allowNo: true,
-		}),
 		users: Flags.boolean({
 			default: true,
 			allowNo: true,
@@ -45,19 +41,56 @@ export default class OrgGet extends Command {
 
 	fetch = async (params) => {
 		const GetOrgDocument = gql`
-      query GetOrg($name: String!, $withCampaigns: Boolean = true) {
+      query GetOrg($name: String!, $withCampaigns: Boolean = true, $withKeys: Boolean = true) {
         org (name: $name) {
           id name title
           config
+          keys @include(if: $withKeys) {id, name, expired, expiredAt, public}
+ 
           campaigns @include(if: $withCampaigns) {id, name, title, org {name}}
+   personalData {
+      contactSchema
+      doiThankYou
+      highSecurity
+      replyEnabled
+      supporterConfirm
+      supporterConfirmTemplate
+    }
+    processing {
+      customActionConfirm
+      customActionDeliver
+      customEventDeliver
+      customSupporterConfirm
+      detailBackend
+      doiThankYou
+      emailBackend
+      emailFrom
+      emailTemplates
+      eventBackend
+      pushBackend
+      storageBackend
+      supporterConfirm
+      supporterConfirmTemplate
+    }
+
+    services {
+      host
+      id
+      name
+      path
+      user
+    }
         }
       }
     `;
+
 		const result = await query(GetOrgDocument, {
 			name: params.name,
 			withCampaigns: params.campaigns,
+			withKeys: params.keys || true,
 		});
 		//    result.org.config = JSON.parse (result.org.config);
+		console.log(result.org);
 		return result.org;
 	};
 
@@ -66,6 +99,10 @@ export default class OrgGet extends Command {
 			id: d.id,
 			Name: d.name,
 			Title: d.title,
+			"can targets reply?": d.replyEnabled ? true : undefined,
+			"confirm actions?": d.supporterConfirm
+				? d.supporterConfirmTemplate
+				: undefined,
 		};
 		if (this.flags.stats) {
 			result["#Supporters"] = d.stats.supporterCount;

package/src/commands/user/reset.mjs

@@ -0,0 +1,83 @@
+import { Args, Flags } from "@oclif/core";
+import { error, stdout } from "@oclif/core/ux";
+import prompts from "prompts";
+import { format, get as getConfig, getFilename, write } from "#src/config.mjs";
+import Command from "#src/procaCommand.mjs";
+
+export default class UserReset extends Command {
+	static description = "Reset user API token";
+
+	static args = {
+		user: Args.string({ description: "Username (email)" }),
+	};
+
+	static flags = {
+		...super.globalFlags,
+		password: Flags.string({ description: "Password" }),
+		url: Flags.string({ description: "URL of the Proca server API" }),
+	};
+
+	async run() {
+		const { args, flags } = await this.parse(UserReset);
+
+		const file = getFilename(this.config.configDir, flags.env);
+		const userConfig = getConfig(file, true) || {};
+
+		if (!args.user) {
+			const response = await prompts({
+				type: "text",
+				name: "user",
+				message: "Username:",
+			});
+			args.user = response.user;
+		}
+
+		if (!flags.password) {
+			const response = await prompts({
+				type: "password",
+				name: "password",
+				message: "Password:",
+			});
+			flags.password = response.password;
+		}
+
+		const url =
+			flags.url || userConfig.REACT_APP_API_URL || "https://api.proca.app/api";
+
+		if (!args.user || !flags.password) {
+			return error("User and password are required.");
+		}
+
+		const query = `mutation {
+            resetApiToken
+        }`;
+
+		const auth = `Basic ${Buffer.from(`${args.user}:${flags.password}`).toString("base64")}`;
+
+		try {
+			const response = await fetch(url, {
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json",
+					Authorization: auth,
+				},
+				body: JSON.stringify({ query }),
+			});
+
+			const data = await response.json();
+
+			if (data.errors) {
+				return error(data.errors.map((e) => e.message).join("\n"));
+			}
+
+			const newToken = data.data.resetApiToken;
+			this.log(`New API token: ${newToken}`);
+
+			userConfig.PROCA_TOKEN = newToken;
+			write(file, format(userConfig));
+			this.log(`Token saved to ${file}`);
+		} catch (e) {
+			error(e.message);
+		}
+	}
+}

package/src/commands/widget/add.mjs

@@ -72,7 +72,7 @@ export default class WidgetAdd extends Command {
 
 		try {
 			const r = await mutation(addWidgetDocument, flag);
-			return r;
+			return { id: r.addActionPage.id };
 		} catch (e) {
 			const errors = e.graphQLErrors;
 			console.log(errors, flag, addWidgetDocument);

package/src/config.mjs

@@ -8,6 +8,7 @@ export const getFilename = (folder, env = "default") =>
 export const load = (folder, env = "default") => {
 	const file = getFilename(folder, env);
 	const config = dotenv({ path: file });
+
 	return {
 		token: config.parsed.PROCA_TOKEN,
 		url: config.parsed.REACT_APP_API_URL,
@@ -34,3 +35,15 @@ export const get = (file, parsed = false) => {
 export const write = (file, content) => {
 	writeFileSync(file, content);
 };
+
+export const format = (obj) => {
+	const content = ["# generated by proca-cli"];
+	for (const [key, value] of Object.entries(obj)) {
+		if (value) {
+			content.push(`${key}='${value.replace(/'/g, "''")}'`);
+		} else {
+			content.push(`#${key}= `);
+		}
+	}
+	return content.join("\n");
+};

package/src/commands/campaign/close.mjs

@@ -1,81 +0,0 @@
-import { Args, Flags } from "@oclif/core";
-import { error, stdout, ux } from "@oclif/core/ux";
-import OrgGet from "#src/commands/org/get.mjs";
-import Command from "#src/procaCommand.mjs";
-import { gql, mutation } from "#src/urql.mjs";
-import { getTwitter } from "#src/util/twitter.mjs";
-
-export default class CampaignClose extends Command {
-	static args = {
-		title: Args.string({
-			description: "title of the campaign",
-			multiple: true,
-		}),
-	};
-	//  static strict = false;
-
-	static examples = ["<%= config.bin %> <%= command.id %> -name <campaign>"];
-
-	static flags = {
-		// flag with no value (-f, --force)
-		...super.globalFlags,
-		name: Flags.string({
-			char: "n",
-			description: "name of the campaign",
-			helpValue: "<campaign name>",
-			required: true,
-		}),
-		org: Flags.string({
-			char: "o",
-			description: "name of the coordinator",
-			helpValue: "<org name>",
-			required: true,
-		}),
-		status: Flags.string({
-			description: "status",
-			required: true,
-			options: ["closed", "ignored", "live"],
-			default: "closed",
-		}),
-	};
-
-	updateStatus = async (props) => {
-		const org = await this.getOrg(props.org);
-
-		const Query = gql`
-mutation ($org: String!
-$name: String!
-$status: String!
-) {
-  upsertCampaign (input: { name: $name, status: $status }, orgName: $org) {
-    name
-    title
-    status
-    config
-  }
-}
-    `;
-		const result = await mutation(Query, {
-			org: props.org,
-			name: props.name,
-			status: props.status.toUpperCase(),
-		});
-
-		console.log("result", result);
-		return result;
-	};
-
-	async getOrg(orgName) {
-		const { config } = this;
-		const orgGet = new OrgGet({}, this.config);
-		const org = await orgGet.fetch({ name: orgName });
-		return org;
-	}
-
-	async run() {
-		const { args, flags } = await this.parse();
-
-		const data = await this.updateStatus(flags);
-		return this.output(data);
-	}
-}