proca 1.7.0 → 1.7.2

package/README.md

@@ -48,6 +48,7 @@ you should also use the local proca-api in your [widget generator](https://githu
 
 <!-- commands -->
 * [`proca action add`](#proca-action-add)
+* [`proca action confirm`](#proca-action-confirm)
 * [`proca action count`](#proca-action-count)
 * [`proca action list [TITLE]`](#proca-action-list-title)
 * [`proca action replay`](#proca-action-replay)
@@ -71,8 +72,8 @@ you should also use the local proca-api in your [widget generator](https://githu
 * [`proca org add`](#proca-org-add)
 * [`proca org crm`](#proca-org-crm)
 * [`proca org delete`](#proca-org-delete)
+* [`proca org email`](#proca-org-email)
 * [`proca org get`](#proca-org-get)
-* [`proca org join`](#proca-org-join)
 * [`proca plugins`](#proca-plugins)
 * [`proca plugins add PLUGIN`](#proca-plugins-add-plugin)
 * [`proca plugins:inspect PLUGIN...`](#proca-pluginsinspect-plugin)
@@ -83,10 +84,16 @@ you should also use the local proca-api in your [widget generator](https://githu
 * [`proca plugins uninstall [PLUGIN]`](#proca-plugins-uninstall-plugin)
 * [`proca plugins unlink [PLUGIN]`](#proca-plugins-unlink-plugin)
 * [`proca plugins update`](#proca-plugins-update)
+* [`proca service add`](#proca-service-add)
+* [`proca service list`](#proca-service-list)
 * [`proca target add`](#proca-target-add)
+* [`proca template add`](#proca-template-add)
+* [`proca template list`](#proca-template-list)
 * [`proca user get`](#proca-user-get)
+* [`proca user join`](#proca-user-join)
 * [`proca user leave`](#proca-user-leave)
 * [`proca user list`](#proca-user-list)
+* [`proca user me`](#proca-user-me)
 * [`proca user reset [USER]`](#proca-user-reset-user)
 * [`proca user whoami`](#proca-user-whoami)
 * [`proca widget add`](#proca-widget-add)
@@ -114,12 +121,13 @@ FLAGS
       --firstname=<value>      (required) supporter's firstname
   --lastname=<value>
   --locality=<value>
-  --optin
+      --[no-]optin             Whether the user opts in (default: false). Use --optin to enable or --no-optin to
+                               explicitly disable.
   --region=<value>
   --street=<value>
       --subject=<value>        [mtt] subject of the email
       --target=<value>         [mtt] uid of the target
-  --testing
+      --[no-]testing           Run action in testing mode (default: true). Use --no-testing to disable.
       --utm=<value>            utm=campaign.source.medium
 
 OUTPUT FLAGS
@@ -136,6 +144,33 @@ EXAMPLES
   $ proca action add -i <widget_id> --firstname=John --email=john@example.org target=715a9580-cfe6-4005-9e23-61a62ddecfea --subject='MTT subject' --body='message MTT'
 ```
 
+## `proca action confirm`
+
+Should the supporter confirm the action? it can be set either for all the widgets or an organisation or all the widgets of a campaign
+
+```
+USAGE
+  $ proca action confirm [--json | --human | --csv] [--env <value>] [--simplify] [--org
+    <value>] [--campaign <value>] [--confirm] [--template <value>]
+
+FLAGS
+  --campaign=<value>  campaign collecting the action
+  --[no-]confirm      should the supporters confirm each action
+  --env=<value>       [default: default] allow to switch between configurations (server or users)
+  --org=<value>       organisation collecting the action
+  --template=<value>  template for sending the message
+
+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
+  Should the supporter confirm the action? it can be set either for all the widgets or an organisation or all the
+  widgets of a campaign
+```
+
 ## `proca action count`
 
 counter of actions
@@ -650,6 +685,7 @@ DESCRIPTION
 
 ALIASES
   $ proca user whoami
+  $ proca user me
 
 EXAMPLES
   $ proca config user
@@ -811,22 +847,25 @@ EXAMPLES
   $ proca org delete  <organisation_name>
 ```
 
-## `proca org get`
+## `proca org email`
 
-view a org
+Set service, usually email backend for an org
 
 ```
 USAGE
-  $ proca org get [ID_NAME_DXID] [--json | --human | --csv] [--env <value>]
-    [--simplify] [-n <org name>] [--config] [--keys] [--campaigns] [--users]
+  $ proca org email [ID_NAME_DXID] --org <value> --mailer mailjet ses stripe
+    test_stripe system preview webhook supabase smtp [--json | --human | --csv] [--env <value>] [--simplify] [--from
+    <value>]
 
 FLAGS
-  -n, --name=<org name>  name of the org
-  --[no-]campaigns
-      --[no-]config      display the config
-      --env=<value>      [default: default] allow to switch between configurations (server or users)
-  --[no-]keys
-  --[no-]users
+  --env=<value>                                                                 [default: default] allow to switch
+                                                                                between configurations (server or users)
+  --from=<value>                                                                Email address to send from (default:
+                                                                                <org>@proca.app)
+  --mailer=mailjet ses stripe test_stripe system preview webhook supabase smtp  (required) [default: MAILJET] service to
+                                                                                send emails
+  --org=<value>                                                                 (required) organisation running the
+                                                                                service
 
 OUTPUT FLAGS
   --csv            Format output as csv
@@ -835,27 +874,25 @@ OUTPUT FLAGS
   --[no-]simplify  flatten and filter to output only the most important attributes, mostly relevant for json
 
 DESCRIPTION
-  view a org
-
-EXAMPLES
-  $ proca org get <name of the ngo>
+  Set service, usually email backend for an org
 ```
 
-## `proca org join`
+## `proca org get`
 
-let a user join an organisation with a role
+view a org
 
 ```
 USAGE
-  $ proca org join -o <org name> [--json | --human | --csv] [--env <value>]
-    [--simplify] [--user <value>] [--role owner|campaigner|coordinator|translator]
+  $ proca org get [ID_NAME_DXID] [--json | --human | --csv] [--env <value>]
+    [--simplify] [-n <org name>] [--config] [--keys] [--campaigns] [--users]
 
 FLAGS
-  -o, --org=<org name>  (required) name of the org
-      --env=<value>     [default: default] allow to switch between configurations (server or users)
-      --role=<option>   [default: campaigner] permission level in that org
-                        <options: owner|campaigner|coordinator|translator>
-      --user=<value>    user email
+  -n, --name=<org name>  name of the org
+  --[no-]campaigns
+      --[no-]config      display the config
+      --env=<value>      [default: default] allow to switch between configurations (server or users)
+  --[no-]keys
+  --[no-]users
 
 OUTPUT FLAGS
   --csv            Format output as csv
@@ -864,10 +901,10 @@ OUTPUT FLAGS
   --[no-]simplify  flatten and filter to output only the most important attributes, mostly relevant for json
 
 DESCRIPTION
-  let a user join an organisation with a role
+  view a org
 
 EXAMPLES
-  $ proca org join
+  $ proca org get <name of the ngo>
 ```
 
 ## `proca plugins`
@@ -1160,6 +1197,59 @@ DESCRIPTION
 
 _See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.25/src/commands/plugins/update.ts)_
 
+## `proca service add`
+
+Set service, usually email backend for an org, the specific meaning of each param is dependant on the service
+
+```
+USAGE
+  $ proca service add -o <value> --type
+    mailjet|ses|stripe|test_stripe|preview|webhook|supabase|smtp [--json | --human | --csv] [--env <value>] [--simplify]
+    [--user <value>] [--password <value>] [--host <value>] [--path <value>]
+
+FLAGS
+  -o, --org=<value>       (required) organisation running the service
+      --env=<value>       [default: default] allow to switch between configurations (server or users)
+      --host=<value>      server of the service
+      --password=<value>  credential of the account on the service
+      --path=<value>      path on the service
+      --type=<option>     (required) [default: system] type of the service
+                          <options: mailjet|ses|stripe|test_stripe|preview|webhook|supabase|smtp>
+      --user=<value>      credential of the account on the service
+
+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
+  Set service, usually email backend for an org, the specific meaning of each param is dependant on the service
+```
+
+## `proca service list`
+
+list services set for an organisation
+
+```
+USAGE
+  $ proca service list -o <value> [--json | --human | --csv] [--env <value>]
+    [--simplify]
+
+FLAGS
+  -o, --org=<value>  (required) organisation running the service
+      --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
+  list services set for an organisation
+```
+
 ## `proca target add`
 
 ```
@@ -1181,6 +1271,53 @@ OUTPUT FLAGS
   --[no-]simplify  flatten and filter to output only the most important attributes, mostly relevant for json
 ```
 
+## `proca template add`
+
+```
+USAGE
+  $ proca template add -o <value> [--json | --human | --csv] [--env <value>] [--simplify]
+    [--type thankyou|doi|confirm|doi_thankyou|doi_confirm] [-l <locale>] [-n by default  type@language] [-s 'template:'
+    + type]
+
+FLAGS
+  -l, --lang=<locale>                   [default: en] language
+  -n, --name=by default  type@language  name
+  -o, --org=<value>                     (required) organisation
+  -s, --subject='template:' + type      subject
+      --env=<value>                     [default: default] allow to switch between configurations (server or users)
+      --type=<option>                   [default: thankyou]
+                                        <options: thankyou|doi|confirm|doi_thankyou|doi_confirm>
+
+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
+```
+
+## `proca template list`
+
+list services set for an organisation
+
+```
+USAGE
+  $ proca template list -o <value> [--json | --human | --csv] [--env <value>]
+    [--simplify]
+
+FLAGS
+  -o, --org=<value>  (required) organisation having the templates
+      --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
+  list services set for an organisation
+```
+
 ## `proca user get`
 
 fetch the information about a user
@@ -1209,19 +1346,48 @@ EXAMPLES
   $ proca user get
 ```
 
+## `proca user join`
+
+let a user join an organisation with a role
+
+```
+USAGE
+  $ proca user join -o <org name> [--json | --human | --csv] [--env <value>]
+    [--simplify] [--role owner|campaigner|coordinator|translator] [-u <user email>]
+
+FLAGS
+  -o, --org=<org name>     (required) name of the org
+  -u, --user=<user email>  email
+      --env=<value>        [default: default] allow to switch between configurations (server or users)
+      --role=<option>      [default: campaigner] permission level in that org
+                           <options: owner|campaigner|coordinator|translator>
+
+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
+  let a user join an organisation with a role
+
+EXAMPLES
+  $ proca user join
+```
+
 ## `proca user leave`
 
 leave a org
 
 ```
 USAGE
-  $ proca user leave --email <user email> -o <org name> [--json | --human | --csv]
-    [--env <value>] [--simplify]
+  $ proca user leave -o <org name> [--json | --human | --csv] [--env <value>]
+    [--simplify] [-u <user email>]
 
 FLAGS
-  -o, --org=<org name>      (required) name of the org
-      --email=<user email>  (required) email
-      --env=<value>         [default: default] allow to switch between configurations (server or users)
+  -o, --org=<org name>     (required) name of the org
+  -u, --user=<user email>  email
+      --env=<value>        [default: default] allow to switch between configurations (server or users)
 
 OUTPUT FLAGS
   --csv            Format output as csv
@@ -1262,6 +1428,34 @@ EXAMPLES
   $ proca user list %pizza%
 ```
 
+## `proca user me`
+
+fetch the information about the current user (based on the token)
+
+```
+USAGE
+  $ proca user me [--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
+  $ proca user me
+
+EXAMPLES
+  $ proca user me
+```
+
 ## `proca user reset [USER]`
 
 Reset user API token
@@ -1311,6 +1505,7 @@ DESCRIPTION
 
 ALIASES
   $ proca user whoami
+  $ proca user me
 
 EXAMPLES
   $ proca user whoami

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "proca",
 	"description": "Access the proca api",
-	"version": "1.7.0",
+	"version": "1.7.2",
 	"author": "Xavier",
 	"bin": {
 		"proca": "proca-cli"

package/src/commands/action/add.mjs

@@ -1,6 +1,5 @@
 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";
@@ -22,8 +21,18 @@ export default class ActionAdd extends Command {
 			description: "widget's id",
 			required: true,
 		}),
-		testing: Flags.boolean({ default: true }),
-		optin: Flags.boolean({ default: false }),
+		testing: Flags.boolean({
+			default: true,
+			allowNo: true, // ✅ enables --no-testing
+			description:
+				"Run action in testing mode (default: true). Use --no-testing to disable.",
+		}),
+		optin: Flags.boolean({
+			default: false,
+			allowNo: true, // ✅ enables --no-optin
+			description:
+				"Whether the user opts in (default: false). Use --optin to enable or --no-optin to explicitly disable.",
+		}),
 		action_type: Flags.string({
 			default: "register",
 		}),

package/src/commands/action/confirm.mjs

@@ -0,0 +1,93 @@
+import { Flags } from "@oclif/core";
+import Command from "#src/procaCommand.mjs";
+import { gql, mutation, query } from "#src/urql.mjs";
+
+export default class Actionconfirm extends Command {
+	static description =
+		"Should the supporter confirm the action? it can be set either for all the widgets or an organisation or all the widgets of a campaign";
+
+	static flags = {
+		...super.globalFlags,
+		org: Flags.string({
+			aliases: ["name", "o"],
+			description: "organisation collecting the action",
+			exactlyOne: ["org", "campaign"],
+		}),
+		campaign: Flags.string({
+			aliases: ["c"],
+			description: "campaign collecting the action",
+		}),
+		confirm: Flags.boolean({
+			description: "should the supporters confirm each action",
+			default: true,
+			allowNo: true,
+		}),
+		template: Flags.string({
+			description: "template for sending the message",
+		}),
+	};
+
+	async mutate(flags) {
+		const DocumentOrg = gql`
+    mutation UpdateOrgProcessing(
+      $name: String!
+      $confirm: Boolean!
+      $template: String
+    ) {
+      updateOrgProcessing(
+        name: $name
+        supporterConfirmTemplate: $template
+        supporterConfirm: $confirm
+      ) {
+        id
+        name
+        processing {
+          supporterConfirm
+          supporterConfirmTemplate
+        }
+      }
+    }
+  `;
+		const DocumentCampaign = gql`
+    mutation UpdateCampaignProcessing(
+      $name: String!
+      $confirm: Boolean!
+      $template: String
+    ) {
+      updateCampaignProcessing(
+        name: $name
+        supporterConfirmTemplate: $template
+        supporterConfirm: $confirm
+      ) {
+        id
+        name
+        campaignProcessing {
+          supporterConfirm
+          supporterConfirmTemplate
+        }
+      }
+    }
+  `;
+		const Document = flags.org ? DocumentOrg : DocumentCampaign;
+
+		const result = await mutation(Document, {
+			name: flags.org || flags.campaign,
+			confirm: flags.confirm,
+			template: flags.template,
+		});
+		return result.updateOrgProcessing || result.updateCommandProcessing;
+	}
+
+	simplify = (d) => ({
+		id: d.id,
+		name: d.name,
+		template: d.processing.supporterConfirmTemplate,
+		confirm: d.processing.supporterConfirm,
+	});
+	async run() {
+		const { flags } = await this.parse();
+		const result = await this.mutate(flags);
+
+		this.output(result);
+	}
+}

package/src/commands/config/user.mjs

@@ -4,7 +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 aliases = ["user:whoami", "user:me"];
 	static description =
 		"fetch the information about the current user (based on the token)";
 
@@ -14,7 +14,7 @@ export default class UserList extends Command {
 		...super.globalFlags,
 	};
 
-	fetch = async (params) => {
+	fetch = async () => {
 		const Document = gql`
 query  {
   currentUser {

package/src/commands/org/add.mjs

@@ -13,7 +13,6 @@ export default class OrgAdd extends Command {
 	];
 
 	static flags = {
-		// flag with no value (-f, --force)
 		...super.globalFlags,
 		twitter: Flags.string({
 			description: "twitter account",

package/src/commands/org/email.mjs

@@ -0,0 +1,83 @@
+import { Flags } from "@oclif/core";
+import Command from "#src/procaCommand.mjs";
+import { gql, mutation, query } from "#src/urql.mjs";
+
+const SERVICE_NAMES = [
+	"MAILJET",
+	"SES",
+	"STRIPE",
+	"TEST_STRIPE",
+	"SYSTEM",
+	"PREVIEW",
+	"WEBHOOK",
+	"SUPABASE",
+	"SMTP",
+].map((d) => d.toLowerCase());
+
+export default class OrgEmail extends Command {
+	static description = "Set service, usually email backend for an org";
+
+	static args = this.multiid();
+	static flags = {
+		...super.globalFlags,
+		org: Flags.string({
+			aliases: ["name", "o"],
+			description: "organisation running the service",
+			required: true,
+		}),
+		mailer: Flags.string({
+			description: "service to send emails",
+			options: SERVICE_NAMES,
+			helpValue: SERVICE_NAMES,
+			required: true,
+			default: "MAILJET",
+		}),
+		from: Flags.string({
+			description: "Email address to send from (default: <org>@proca.app)",
+		}),
+	};
+
+	async mutate(flags) {
+		flags.from = flags.from || `${flags.org}@proca.app`;
+
+		const Document = gql`
+    mutation UpdateOrgProcessing(
+      $name: String!
+      $emailBackend: ServiceName!
+      $emailFrom: String!
+    ) {
+      updateOrgProcessing(
+        name: $name
+        emailBackend: $emailBackend
+        emailFrom: $emailFrom
+      ) {
+        id
+        name
+        processing {
+          emailBackend
+          emailFrom
+        }
+      }
+    }
+  `;
+		const result = await mutation(Document, {
+			name: flags.org,
+			emailBackend: flags.mailer.toUpperCase(),
+			emailFrom: flags.from,
+		});
+		return result.updateOrgProcessing;
+	}
+
+	simplify = (d) => ({
+		id: d.id,
+		name: d.name,
+		mailer: d.processing.emailBackend,
+		from: d.processing.emailFrom,
+	});
+	async run() {
+		const { flags } = await this.parse();
+		const result = await this.mutate(flags);
+
+		this.output(result);
+	}
+}

package/src/commands/org/get.mjs

@@ -90,7 +90,6 @@ export default class OrgGet extends Command {
 			withKeys: params.keys || true,
 		});
 		//    result.org.config = JSON.parse (result.org.config);
-		console.log(result.org);
 		return result.org;
 	};
 

package/src/commands/service/add.mjs

@@ -0,0 +1,78 @@
+import { Flags } from "@oclif/core";
+import Command from "#src/procaCommand.mjs";
+import { gql, mutation, query } from "#src/urql.mjs";
+
+const SERVICE_NAMES = [
+	"MAILJET",
+	"SES",
+	"STRIPE",
+	"TEST_STRIPE",
+	"PREVIEW",
+	//	"SYSTEM", not an external service type, just an alias
+	"WEBHOOK",
+	"SUPABASE",
+	"SMTP",
+].map((d) => d.toLowerCase());
+
+export default class OrgEmail extends Command {
+	static description =
+		"Set service, usually email backend for an org, the specific meaning of each param is dependant on the service";
+
+	static flags = {
+		...super.globalFlags,
+		org: Flags.string({
+			char: "o",
+			description: "organisation running the service",
+			required: true,
+		}),
+		type: Flags.string({
+			description: "type of the service",
+			options: SERVICE_NAMES,
+			required: true,
+			default: "system",
+		}),
+		user: Flags.string({
+			description: "credential of the account on the service",
+		}),
+		password: Flags.string({
+			description: "credential of the account on the service",
+		}),
+		host: Flags.string({
+			description: "server of the service",
+		}),
+		path: Flags.string({
+			description: "path on the service",
+		}),
+	};
+
+	async mutate(flags) {
+		const Document = gql`
+ mutation ($id: Int, $input: ServiceInput!, $orgName: String!) {
+  upsertService(id: $id, input: $input, orgName: $orgName) {    host    id    name    path    user  }
+}
+  `;
+
+		const variables = {
+			//      id: flags.id || null
+			orgName: flags.org,
+			input: {
+				name: flags.type.toUpperCase(),
+				host: flags.host || "",
+				path: flags.path || "",
+				user: flags.user || "",
+				password: flags.password || "",
+			},
+		};
+
+		const result = await mutation(Document, variables);
+		return result.upsertService;
+	}
+
+	table = (r) => super.table(r, null, null);
+
+	async run() {
+		const { flags } = await this.parse();
+		const result = await this.mutate(flags);
+		this.output(result);
+	}
+}

package/src/commands/service/list.mjs

@@ -0,0 +1,24 @@
+import { Flags } from "@oclif/core";
+import Org from "#src/commands/org/get.mjs";
+import Command from "#src/procaCommand.mjs";
+import { gql, mutation, query } from "#src/urql.mjs";
+
+export default class OrgServices extends Command {
+	static description = "list services set for an organisation";
+
+	static flags = {
+		...super.globalFlags,
+		org: Flags.string({
+			char: "o",
+			description: "organisation running the service",
+			required: true,
+		}),
+	};
+
+	async run() {
+		const { flags } = await this.parse();
+		const orgCmd = new Org({}, this.config);
+		const org = await orgCmd.fetch({ name: flags.org });
+		this.output(org.services);
+	}
+}

package/src/commands/template/add.mjs

@@ -0,0 +1,97 @@
+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 TemplateAdd extends Command {
+	//static args = { path: { description: "" } };
+
+	static flags = {
+		// flag with no value (-f, --force)
+		...super.globalFlags,
+		org: Flags.string({
+			char: "o",
+			description: "organisation",
+			required: true,
+		}),
+		type: Flags.string({
+			options: ["thankyou", "doi", "confirm", "doi_thankyou", "doi_confirm"],
+			default: "thankyou",
+		}),
+		lang: Flags.string({
+			char: "l",
+			description: "language",
+			default: "en",
+			helpValue: "<locale>",
+		}),
+		name: Flags.string({
+			char: "n",
+			description: "name",
+			helpValue: "by default  type@language",
+		}),
+		subject: Flags.string({
+			char: "s",
+			description: "subject",
+			helpValue: "'template:' + type",
+		}),
+	};
+
+	create = async (flag) => {
+		const orgName = flag.org;
+
+		const addTemplateDocument = gql`
+      mutation (
+        $org: String!
+        $name: String!
+        $lang: String!
+        $subject: String!
+        $text: String
+        $html: String
+      ) {
+        upsertTemplate(
+          orgName: $org
+          input: { name: $name, locale: $lang, subject:$subject,text: $text, html: $html }
+        ) 
+      }
+    `;
+
+		if (!flag.name) {
+			flag.name = flag.type; // +'@'+flag.lang;
+		}
+
+		if (!flag.subject) {
+			flag.subject = `template ${flag.type} in ${flag.lang}`;
+		}
+
+		if (!flag.text) {
+			flag.text = "This is the email body";
+		}
+		if (!flag.html) {
+			flag.html = "This is the email html body";
+		}
+		try {
+			const r = await mutation(addTemplateDocument, flag);
+		} catch (e) {
+			const errors = e.graphQLErrors;
+			console.log(JSON.stringify(e.graphQLErrors, null, 2));
+			if (errors[0].path[1] === "name") {
+				this.error(`invalid name (already taken?): ${flag.name}`);
+				throw new Error(errors[0].message);
+			}
+			if (errors[0].extensions?.code === "permission_denied") {
+				console.error("permission denied to create", flag.name, flag.org);
+				throw new Error(errors[0].message);
+			}
+			throw new Error(errors[0].message);
+		}
+	};
+
+	async run() {
+		const { args, flags } = await this.parse();
+
+		//		const org = { name: flags.twitter || flags.name, config: {} };
+
+		const data = await this.create(flags);
+		return this.output(data);
+	}
+}

package/src/commands/template/list.mjs

@@ -0,0 +1,61 @@
+import { Flags } from "@oclif/core";
+import Org from "#src/commands/org/get.mjs";
+import Command from "#src/procaCommand.mjs";
+import { gql, mutation, query } from "#src/urql.mjs";
+
+export default class OrgTemplate extends Command {
+	static description = "list services set for an organisation";
+
+	static flags = {
+		...super.globalFlags,
+		org: Flags.string({
+			char: "o",
+			description: "organisation having the templates",
+			required: true,
+		}),
+	};
+
+	fetch = async (org) => {
+		const GetOrgDocument = gql`
+      query GetOrg($name: String!) {
+        org (name: $name) {
+          id name title
+   personalData {
+      supporterConfirm
+      supporterConfirmTemplate
+    }
+    processing {
+      emailFrom
+      emailTemplates
+      supporterConfirm
+      supporterConfirmTemplate
+    }
+
+        }
+      }
+    `;
+
+		const result = await query(GetOrgDocument, {
+			name: org,
+		});
+		const supporterConfirm = (tplName) => {
+			if (
+				tplName.split("@")[0] === result.org.processing.supporterConfirmTemplate
+			) {
+				return result.org.processing.supporterConfirm ? "enabled" : "disabled";
+			}
+			return "";
+		};
+		const tpl = result.org.processing?.emailTemplates?.map((d) => ({
+			name: d,
+			actionConfirm: supporterConfirm(d),
+		}));
+		return tpl;
+	};
+
+	async run() {
+		const { flags } = await this.parse();
+		const tpl = await this.fetch(flags.org);
+		this.output(tpl);
+	}
+}

package/src/commands/{org → user}/join.mjs

@@ -10,7 +10,6 @@ export default class UserJoinOrg extends Command {
 
 	static flags = {
 		...super.globalFlags,
-		user: Flags.string({ description: "user email" }),
 		role: Flags.string({
 			description: "permission level in that org",
 			default: "campaigner",
@@ -22,6 +21,11 @@ export default class UserJoinOrg extends Command {
 			description: "name of the org",
 			helpValue: "<org name>",
 		}),
+		user: Flags.string({
+			char: "u",
+			description: "email",
+			helpValue: "<user email>",
+		}),
 	};
 
 	join = async (org) => {
@@ -40,9 +44,8 @@ mutation ($name: String!) {
 		const result = await mutation(Document, {
 			name: org,
 		});
-		console.log(result);
-		return result.status;
 		//return result.users.map (d => {d.config = JSON.parse(d.config); return d});
+		return { ...result.joinOrg.org, status: result.joinOrg.status };
 	};
 
 	mutate = async (params) => {
@@ -58,20 +61,21 @@ mutation ($org: String!, $user: String!, $role: String = "campaigner") {
 			org: params.org,
 			role: params.role,
 		});
-		console.log(result);
-		return result.status;
-		//return result.users.map (d => {d.config = JSON.parse(d.config); return d});
+		return result.addOrgUser;
+	};
+
+	table = (r) => {
+		super.table(r, null, null);
 	};
 
 	async run() {
-		console.log("WIP, probably not working");
 		const { args, flags } = await this.parse();
-
+		let data = undefined;
 		if (!flags.user) {
 			data = await this.join(flags.org);
 		} else {
 			data = await this.mutate(flags);
 		}
-		console.log(data);
+		this.output(data);
 	}
 }

package/src/commands/user/leave.mjs

@@ -1,5 +1,6 @@
 import { Args, Flags } from "@oclif/core";
 import { error, stdout, ux } from "@oclif/core/ux";
+import getCurrentUser from "#src/commands/config/user.mjs";
 import Command from "#src/procaCommand.mjs";
 import { gql, mutation } from "#src/urql.mjs";
 
@@ -15,9 +16,9 @@ export default class OrgLeave extends Command {
 	static flags = {
 		// flag with no value (-f, --force)
 		...super.globalFlags,
-		email: Flags.string({
+		user: Flags.string({
+			char: "u",
 			description: "email",
-			required: true,
 			helpValue: "<user email>",
 		}),
 		org: Flags.string({
@@ -28,16 +29,16 @@ export default class OrgLeave extends Command {
 		}),
 	};
 
-	mutate = async ({ email, org }) => {
+	mutate = async ({ user, org }) => {
 		const Document = gql`
 mutation ($email: String!, $org: String!) {
   deleteOrgUser(email: $email, orgName: $org) { status }
 }`;
 		const result = await mutation(Document, {
-			email: email,
+			email: user,
 			org: org,
 		});
-		return result.deleteOrgUser.status;
+		return result.deleteOrgUser;
 	};
 
 	table = (r) => {
@@ -46,7 +47,11 @@ mutation ($email: String!, $org: String!) {
 
 	async run() {
 		const { args, flags } = await this.parse();
+		if (!flags.user) {
+			const me = await this.getCurrentUser();
+			flags.user = me.email;
+		}
 		const data = await this.mutate(flags);
-		return data;
+		this.output(data);
 	}
 }

package/src/commands/widget/list.mjs

@@ -95,8 +95,9 @@ ${FragmentSummary}
 		if (d.extraSupporters > 0) {
 			result.extra = d.extraSupporters;
 		}
-		if (d.journey) result.journey = d.journey.join(" → ");
-
+		//		if (d.journey) result.journey = d.journey.join(" → ");
+		result.org = d.org.name;
+		result.org_id = d.org.id;
 		if (this.flags.config) {
 		}
 		return result;

package/src/queries/widget.mjs

@@ -6,7 +6,8 @@ locale
 name
 journey
 extraSupporters
-status,
+status
 location
+org {name, ... on PrivateOrg {id} }
 }
 `;