Skip to content
This repository was archived by the owner on Nov 15, 2024. It is now read-only.

Commit 06f4487

Browse files
cstrykercstryker
committed
eliminate sharing and strict slack apps
1 parent 082b1d7 commit 06f4487

File tree

13 files changed

+16
-64
lines changed

13 files changed

+16
-64
lines changed

‎api_server/docs/integrations/slack.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,7 @@ them to the CodeStream configuration file.
114114
"appClientId": null,
115115
"appClientSecret": null,
116116
"appId": null,
117-
"appSharingClientId": "*******************************",
118-
"appSharingClientSecret": "********************************",
119-
"appSharingId": "***************************",
120-
"appSharingSigningSecret": "**************************",
121117
"appSigningSecret": null,
122-
"appStrictClientId": null,
123-
"appStrictClientSecret": null,
124-
"appStrictId": null,
125-
"appStrictSigningSecret": null,
126118
"disabled": false,
127119
"interactiveComponentsEnabled": true
128120
}

‎api_server/docs/unified-cfg-file.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,7 @@ working with the **codestream-cloud** configuration.
108108
"slack.com": {
109109
"appClientId": "my-client-id",
110110
"appClientSecret": "my-client-secret",
111-
"appSharingClientId": "my-client-id",
112-
"appSharingClientSecret": "my-client-secret",
113-
"appSharingSigningSecret": "my-signing-secret",
114111
"appSigningSecret": "my-signing-secret",
115-
"appStrictClientId": "my-client-id",
116-
"appStrictClientSecret": "my-client-secret",
117-
"appStrictSigningSecret": "my-signing-secret",
118112
"interactiveComponentsEnabled": true
119113
}
120114
}

‎api_server/modules/providers/slack_events_request.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class SlackEventsRequest extends RestfulRequest {
2929
return false;
3030
}
3131

32-
const slackSigningSecret = this.api.config.integrations.slack.appSharingSigningSecret;
32+
const slackSigningSecret = this.api.config.integrations.slack.appSigningSecret;
3333
if (!slackSigningSecret) {
3434
this.api.warn('Could not find signingSecret');
3535
return false;

‎api_server/modules/providers/test/provider_action/common_init.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class CommonInit {
9999
actions: [{
100100
action_id: JSON.stringify(actionPayload)
101101
}],
102-
api_app_id: this.apiConfig.integrations.slack.appSharingId
102+
api_app_id: this.apiConfig.integrations.slack.appId
103103
};
104104

105105
const plan = this.isOnPrem() ? CompanyTestConstants.DEFAULT_ONPREM_COMPANY_PLAN : CompanyTestConstants.DEFAULT_COMPANY_PLAN;
@@ -177,7 +177,7 @@ class CommonInit {
177177
const now = Math.floor(Date.now() / 1000);
178178
this.rawBody=`payload=${rawData}`;
179179
const mySignature = 'v0=' +
180-
Crypto.createHmac('sha256', this.apiConfig.integrations.slack.appSharingSigningSecret)
180+
Crypto.createHmac('sha256', this.apiConfig.integrations.slack.appSigningSecret)
181181
.update(`v0:${now}:${this.rawBody}`, 'utf8')
182182
.digest('hex');
183183
this.apiRequestOptions = this.apiRequestOptions || {};

‎api_server/modules/providers/test/provider_action/invalid_signature_test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class InvalidSignatureTest extends ProviderActionTest {
1919
super.prepareData(() => {
2020
const now = Date.now();
2121
const falseSignature = 'v0=' +
22-
Crypto.createHmac('sha256', this.apiConfig.integrations.slack.appSharingSigningSecret)
22+
Crypto.createHmac('sha256', this.apiConfig.integrations.slack.appSigningSecret)
2323
.update(`v0:${now}:bogus`, 'utf8')
2424
.digest('hex');
2525
this.apiRequestOptions.headers['x-slack-signature'] = falseSignature;

‎api_server/modules/providers/test/provider_auth/provider_auth_test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ class ProviderAuthTest extends CodeStreamAPITest {
284284

285285
getSlackRedirectData () {
286286
const parameters = {
287-
client_id: this.apiConfig.integrations.slack.appSharingClientId,
287+
client_id: this.apiConfig.integrations.slack.appClientId,
288288
redirect_uri: this.redirectUri,
289289
response_type: 'code',
290290
state: this.state,

‎api_server/modules/providers/test/provider_token/common_init.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ class CommonInit {
231231
const parameters = {
232232
code: this.code,
233233
grant_type: 'authorization_code',
234-
client_id: this.apiConfig.integrations.slack.appSharingClientId,
235-
client_secret: this.apiConfig.integrations.slack.appSharingClientSecret,
234+
client_id: this.apiConfig.integrations.slack.appClientId,
235+
client_secret: this.apiConfig.integrations.slack.appClientSecret,
236236
redirect_uri: this.redirectUri,
237237
state: this.state
238238
};

‎api_server/modules/providers/test/test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ describe('provider requests', function() {
2121

2222
this.timeout(20000);
2323

24-
describe('GET /provider-auth-code', ProviderAuthCodeRequestTester.test);
24+
describe('GET /provider-auth-code', ProviderAuthCodeRequestTester.test);
2525
describe('GET /no-auth/provider-auth/:provider', ProviderAuthRequestTester.test);
2626
describe('GET /no-auth/provider-token/:provider', ProviderTokenRequestTester.test);
2727
describe('PUT /provider-deauth/:provider', ProviderDeauthRequestTester.test);

‎api_server/modules/slack_auth/slack_auth.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ class SlackAuth extends OAuthModule {
4646
// overrides OAuthModule.getClientInfo to use "sharing model" app
4747
getClientInfo(options) {
4848
const info = super.getClientInfo(options);
49-
info.clientId = this.apiConfig.appSharingClientId;
50-
info.clientSecret = this.apiConfig.appSharingClientSecret;
49+
info.clientId = this.apiConfig.appClientId;
50+
info.clientSecret = this.apiConfig.appClientSecret;
5151
return info;
5252
}
5353

‎api_server/modules/slack_auth/slack_authorizer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ class SlackAuthorizer {
6969
throw 'mock invalid';
7070
}
7171
result = await this.webClient.oauth.access({
72-
client_id: this.request.api.config.integrations.slack.appSharingClientId,
73-
client_secret: this.request.api.config.integrations.slack.appSharingClientSecret,
72+
client_id: this.request.api.config.integrations.slack.appClientId,
73+
client_secret: this.request.api.config.integrations.slack.appClientSecret,
7474
redirect_uri: this.providerInfo.redirectUri,
7575
code: this.providerInfo.code
7676
});

0 commit comments

Comments
 (0)