From ce28e87f4badd5c2c7c2ba1ffaf495b13cd20bd4 Mon Sep 17 00:00:00 2001
From: Marcel Ackermann <31695+dreamflasher@users.noreply.github.com>
Date: Sun, 20 Jun 2021 16:38:04 +0200
Subject: [PATCH 1/3] according to discussion in channel not needed anymore

---
 docs/configuring-playbook-bridge-mx-puppet-slack.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/configuring-playbook-bridge-mx-puppet-slack.md b/docs/configuring-playbook-bridge-mx-puppet-slack.md
index 61600c7a4..e7d8dba20 100644
--- a/docs/configuring-playbook-bridge-mx-puppet-slack.md
+++ b/docs/configuring-playbook-bridge-mx-puppet-slack.md
@@ -13,8 +13,6 @@ playbook configuration:
 
 ```yaml
 matrix_mx_puppet_slack_enabled: true
-matrix_mx_puppet_slack_client_id: ""
-matrix_mx_puppet_slack_client_secret: ""
 ```
 
 

From ed078998b58dc35cb394ddcafc5a2b375bc4d97d Mon Sep 17 00:00:00 2001
From: Marcel Ackermann <31695+dreamflasher@users.noreply.github.com>
Date: Mon, 21 Jun 2021 12:12:07 +0200
Subject: [PATCH 2/3] deprecated

---
 roles/matrix-bridge-mx-puppet-slack/templates/config.yaml.j2 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/roles/matrix-bridge-mx-puppet-slack/templates/config.yaml.j2 b/roles/matrix-bridge-mx-puppet-slack/templates/config.yaml.j2
index 01714cb30..b1917b868 100644
--- a/roles/matrix-bridge-mx-puppet-slack/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mx-puppet-slack/templates/config.yaml.j2
@@ -18,10 +18,6 @@ bridge:
 # Slack OAuth settings. Create a slack app at https://api.slack.com/apps
 oauth:
   enabled: true
-  # Slack app credentials.
-  # N.B. This must be quoted so YAML wouldn't parse it as a float.
-  clientId: "{{ matrix_mx_puppet_slack_client_id }}"
-  clientSecret: {{ matrix_mx_puppet_slack_client_secret }}
   # Path where to listen for OAuth redirect callbacks.
   redirectPath: {{ matrix_mx_puppet_slack_redirect_path }}
   # Set up proxying from https://your.domain/redirect_path to http://bindAddress:port/redirect_path,

From a790096adfc88a31836012832644976b478fe420 Mon Sep 17 00:00:00 2001
From: Marcel Ackermann <31695+dreamflasher@users.noreply.github.com>
Date: Mon, 21 Jun 2021 12:13:20 +0200
Subject: [PATCH 3/3] matrix_mx_puppet_slack_client_id deprecated

---
 roles/matrix-bridge-mx-puppet-slack/defaults/main.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/roles/matrix-bridge-mx-puppet-slack/defaults/main.yml b/roles/matrix-bridge-mx-puppet-slack/defaults/main.yml
index 65b295c94..30d42475b 100644
--- a/roles/matrix-bridge-mx-puppet-slack/defaults/main.yml
+++ b/roles/matrix-bridge-mx-puppet-slack/defaults/main.yml
@@ -27,8 +27,6 @@ matrix_mx_puppet_slack_homeserver_address: "{{ matrix_homeserver_container_url }
 matrix_mx_puppet_slack_homeserver_domain: '{{ matrix_domain }}'
 matrix_mx_puppet_slack_appservice_address: 'http://matrix-mx-puppet-slack:{{ matrix_mx_puppet_slack_appservice_port }}'
 
-matrix_mx_puppet_slack_client_id: ''
-matrix_mx_puppet_slack_client_secret: ''
 matrix_mx_puppet_slack_redirect_path: '/slack/oauth'
 matrix_mx_puppet_slack_redirect_uri: 'https://{{ matrix_server_fqn_matrix }}{{ matrix_mx_puppet_slack_redirect_path }}'