Skip to content

Commit 8965519

Browse files
Shanon LeeShanon Lee
authored andcommitted
Reset .env vars to original state; FUNCTIONAL SLACK OAUTH component; behaves as expected
1 parent 3cc83bb commit 8965519

File tree

4 files changed

+26
-4
lines changed

4 files changed

+26
-4
lines changed

.env

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
SLACK_CLIENT_SECRET = "6a6206cc93da2e49243ee9683f958438"
22
SLACK_CLIENT_ID = "2696943977700.2696948669268"
3-
SLACK_REDIRECT_URI = "overvue://slack"
3+
SLACK_REDIRECT_URI = "overvue://slack"
4+
5+
# SLACK_CLIENT_ID = 2863575808677.2851894215719
6+
# SLACK_CLIENT_SECRET = "f2298f5fbb83d842616711d19c829a45"
7+
# SLACK_REDIRECT_URI = "overvue://slack"

.env.development

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
SLACK_CLIENT_SECRET = "6a6206cc93da2e49243ee9683f958438"
22
SLACK_CLIENT_ID = "2696943977700.2696948669268"
3-
SLACK_REDIRECT_URI = "overvuedev://test"
3+
SLACK_REDIRECT_URI = "overvuedev://test"
4+
5+
# SLACK_CLIENT_ID = "2863575808677.2851894215719"
6+
# SLACK_CLIENT_SECRET = "f2298f5fbb83d842616711d19c829a45"
7+
# SLACK_REDIRECT_URI = "overvuedev://test"

src-electron/electron-main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ function createWindow () {
133133
useContentSize: true,
134134
webPreferences: {
135135
contextIsolation: true,
136-
nodeIntegration: true,
136+
// nodeIntegration: true,
137137
// More info: /quasar-cli/developing-electron-apps/electron-preload-script
138138
preload: path.resolve(__dirname, process.env.QUASAR_ELECTRON_PRELOAD)
139139
}

src/components/slack_login/SlackLoginWindow.vue

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,25 @@ export default {
139139
const clientId = process.env.SLACK_CLIENT_ID;
140140
141141
this.isAuthenticating = true;
142+
143+
// Tests
144+
// console.log(`${slackBaseUrl}?scope=${scope}&redirect_uri=${redirectUri}&client_id=${clientId}`)
145+
// console.log(redirectUri.slice(1, redirectUri.length - 1))
146+
const trimmedUri = redirectUri.slice(1, redirectUri.length - 1);
147+
const trimmedClientId = clientId.slice(1, clientId.length - 1);
148+
console.log(`${slackBaseUrl}?scope=${scope}&redirect_uri=${trimmedUri}&client_id=${trimmedClientId}`)
142149
143150
// console.log("clicked");
151+
// **************** ok
152+
// shell.openExternal(
153+
// // `${slackBaseUrl}?response_type=${responseType}&scope=${scope}&client_id=${clientId}&redirect_uri=${redirectUri}`,
154+
// `${slackBaseUrl}?scope=${scope}&redirect_uri=${redirectUri}&client_id=${clientId}`,
155+
// { activate: true }
156+
// );
157+
// ****************** test
144158
shell.openExternal(
145159
// `${slackBaseUrl}?response_type=${responseType}&scope=${scope}&client_id=${clientId}&redirect_uri=${redirectUri}`,
146-
`${slackBaseUrl}?scope=${scope}&redirect_uri=${redirectUri}&client_id=${clientId}`,
160+
`${slackBaseUrl}?scope=${scope}&redirect_uri=${trimmedUri}&client_id=${trimmedClientId}`,
147161
{ activate: true }
148162
);
149163
},

0 commit comments

Comments
 (0)