Skip to content

Commit 685119f

Browse files
committed
cleaned up dead code and added some comments to electron-main
1 parent df6c2a6 commit 685119f

File tree

2 files changed

+26
-15
lines changed

2 files changed

+26
-15
lines changed

.env.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#DO NOT DELETE THIS FILE, and follow instructions:
22
# Required for Slack Oauth features
3-
# Create a file named .env in this directory, and give it the following values
4-
# Any variable you create in .env, you must create an example for here in .env.example
3+
# Create a file named .env in this directory, and give it the following variables
4+
# Any variable you create in .env, you MUST create an example for here in .env.example
55
SLACK_CLIENT_SECRET = "ENTER_CLIENT_SECRET_HERE",
66
SLACK_CLIENT_ID = "ENTER_CLIENT_ID_HERE"
77

src-electron/main-process/electron-main.js

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ const deeplink = new Deeplink({
3939
debugLogging: true
4040
});
4141

42-
function getSlackAuth() {
43-
logEverywhere("inside getSlackAuth");
42+
// Sends request to Slack for User's information,
43+
// then sends user information back to renderer process
44+
function sendTokenRequest() {
45+
logEverywhere("inside sendTokenRequest");
4446

4547
const authData = {
4648
client_id: process.env.SLACK_CLIENT_ID,
@@ -49,6 +51,7 @@ function getSlackAuth() {
4951
redirect_uri: isDev ? "overvuedev://test" : "overvue://slack"
5052
};
5153
logEverywhere(authData.code);
54+
5255
const url =
5356
"https://slack.com/api/openid.connect.token?" +
5457
"client_id=" +
@@ -60,41 +63,49 @@ function getSlackAuth() {
6063
"&grant_type=authorization_code" +
6164
"&redirect_uri=" +
6265
authData.redirect_uri;
63-
logEverywhere(url);
66+
67+
logEverywhere(`Token Request URL: ${url}`);
68+
69+
// Send Post request for user information
6470
const request = net.request({
6571
method: "POST",
6672
url: url,
6773
headers: {
6874
"Content-Type": "application/x-www-form-urlencoded"
69-
// 'Content-Length': authData.length
7075
}
7176
});
7277

78+
// Listens for response from token request
7379
request.on("response", response => {
7480
// logEverywhere("request.on response received");
7581
response.on("end", () => {
7682
logEverywhere("Response ended ");
7783
});
7884
response.on("data", data => {
79-
logEverywhere("res on data ");
85+
// logEverywhere("response.on data ");
86+
// decodes utf8 Buffer into JSON, then parses it
8087
const decoded = JSON.parse(data.toString())
88+
89+
// decodes JSON Web Token and places decoded JWT back into response data
8190
decoded.id_token = jwt_decode(decoded.id_token)
82-
// logEverywhere(data + ')'); //error
83-
logEverywhere(`decoded in response.on data: ${decoded}`)
84-
logEverywhere('SEND #2')
91+
// logEverywhere(`decoded in response.on data: ${decoded}`)
92+
// send user information back to renderer process
8593
mainWindow.webContents.send("tokenReceived", decoded);
8694
});
8795
});
8896
request.end();
8997
}
9098

91-
function getSlackToken() {
99+
// Turns on event listener for Slack Oauth deep linking back app
100+
// TODO: Deep linking currently doesn't work properly in dev mode - requires fix
101+
function setOauthListener() {
92102
logEverywhere(`process.env.SLACK_CLIENT_ID in electron-main: ${process.env.SLACK_CLIENT_ID}`);
93103
logEverywhere(`process.env.SLACK_CLIENT_SECRET in electron-main: ${process.env.SLACK_CLIENT_SECRET}`);
94104
return deeplink.on("received", link => {
95-
// logEverywhere(`auth worked here link: ${link}`);
105+
logEverywhere(`auth worked here link: ${link}`);
106+
// Extracts Slack authorization code from deep link
96107
authCode = link.split("=")[1];
97-
getSlackAuth();
108+
sendTokenRequest();
98109
});
99110
}
100111

@@ -123,7 +134,7 @@ function createWindow() {
123134

124135
app.on("ready", () => {
125136
createWindow();
126-
getSlackToken();
137+
setOauthListener();
127138
});
128139

129140
app.on("window-all-closed", () => {
@@ -135,6 +146,6 @@ app.on("window-all-closed", () => {
135146
app.on("activate", () => {
136147
if (mainWindow === null) {
137148
createWindow();
138-
getSlackToken();
149+
setOauthListener();
139150
}
140151
});

0 commit comments

Comments
 (0)