Skip to content

Commit 1bee40a

Browse files
baywetbaywet
committed
- lints code
1 parent e1ffd0c commit 1bee40a

File tree

7 files changed

+67
-74
lines changed

7 files changed

+67
-74
lines changed

‎.eslintrc.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ module.exports = {
1313
"prefer-arrow-callback": 0,
1414
"new-cap": 0,
1515
"no-param-reassign": 0,
16-
"no-use-before-define": 0
16+
"no-use-before-define": 0,
17+
"linebreak-style": 0,
18+
"no-plusplus": 0
1719
}
1820
};

‎helpers/authHelper.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ const resource = 'https://graph.microsoft.com/';
99
* @return {string} a fully formed uri with which authentication can be completed.
1010
*/
1111
export function getAuthUrl() {
12-
return adalConfiguration.authority + '/oauth2/authorize' +
13-
'?client_id=' + adalConfiguration.clientID +
14-
'&response_type=code' +
15-
'&redirect_uri=' + adalConfiguration.redirectUri;
12+
return adalConfiguration.authority + '/oauth2/authorize'
13+
+ '?client_id=' + adalConfiguration.clientID
14+
+ '&response_type=code'
15+
+ '&redirect_uri=' + adalConfiguration.redirectUri;
1616
}
1717

1818
/**

‎helpers/dbHelper.js‎

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,16 @@ const sqlite3 = sql.verbose();
1010
export function createDatabase() {
1111
const dbExists = fs.existsSync(dbFile);
1212
const db = new sqlite3.Database(dbFile);
13-
const createSubscriptionStatement =
14-
'CREATE TABLE Subscription (' +
15-
'UserId TEXT NOT NULL, ' +
16-
'SubscriptionId TEXT NOT NULL, ' +
17-
'AccessToken TEXT NOT NULL, ' +
18-
'Resource TEXT NOT NULL, ' +
19-
'ChangeType TEXT NOT NULL, ' +
20-
'ClientState TEXT NOT NULL, ' +
21-
'NotificationUrl TEXT NOT NULL, ' +
22-
'SubscriptionExpirationDateTime TEXT NOT NULL' +
23-
')';
13+
const createSubscriptionStatement = 'CREATE TABLE Subscription ('
14+
+ 'UserId TEXT NOT NULL, '
15+
+ 'SubscriptionId TEXT NOT NULL, '
16+
+ 'AccessToken TEXT NOT NULL, '
17+
+ 'Resource TEXT NOT NULL, '
18+
+ 'ChangeType TEXT NOT NULL, '
19+
+ 'ClientState TEXT NOT NULL, '
20+
+ 'NotificationUrl TEXT NOT NULL, '
21+
+ 'SubscriptionExpirationDateTime TEXT NOT NULL'
22+
+ ')';
2423

2524
db.serialize(() => {
2625
if (!dbExists) {
@@ -38,19 +37,18 @@ export function createDatabase() {
3837

3938
export function getSubscription(subscriptionId, callback) {
4039
const db = new sqlite3.Database(dbFile);
41-
const getUserDataStatement =
42-
'SELECT ' +
43-
'UserId as userId, ' +
44-
'SubscriptionId as subscriptionId, ' +
45-
'AccessToken as accessToken, ' +
46-
'Resource as resource, ' +
47-
'ChangeType as changeType, ' +
48-
'ClientState as clientState, ' +
49-
'NotificationUrl as notificationUrl, ' +
50-
'SubscriptionExpirationDateTime as subscriptionExpirationDateTime ' +
51-
'FROM Subscription ' +
52-
'WHERE SubscriptionId = $subscriptionId ' +
53-
'AND SubscriptionExpirationDateTime > datetime(\'now\')';
40+
const getUserDataStatement = 'SELECT '
41+
+ 'UserId as userId, '
42+
+ 'SubscriptionId as subscriptionId, '
43+
+ 'AccessToken as accessToken, '
44+
+ 'Resource as resource, '
45+
+ 'ChangeType as changeType, '
46+
+ 'ClientState as clientState, '
47+
+ 'NotificationUrl as notificationUrl, '
48+
+ 'SubscriptionExpirationDateTime as subscriptionExpirationDateTime '
49+
+ 'FROM Subscription '
50+
+ 'WHERE SubscriptionId = $subscriptionId '
51+
+ 'AND SubscriptionExpirationDateTime > datetime(\'now\')';
5452

5553
db.serialize(() => {
5654
db.get(
@@ -65,12 +63,11 @@ export function getSubscription(subscriptionId, callback) {
6563

6664
export function saveSubscription(subscriptionData, callback) {
6765
const db = new sqlite3.Database(dbFile);
68-
const insertStatement =
69-
'INSERT INTO Subscription ' +
70-
'(UserId, SubscriptionId, AccessToken, Resource, ChangeType, ' +
71-
'ClientState, NotificationUrl, SubscriptionExpirationDateTime) ' +
72-
'VALUES ($userId, $subscriptionId, $accessToken, $resource, $changeType, ' +
73-
'$clientState, $notificationUrl, $subscriptionExpirationDateTime)';
66+
const insertStatement = 'INSERT INTO Subscription '
67+
+ '(UserId, SubscriptionId, AccessToken, Resource, ChangeType, '
68+
+ 'ClientState, NotificationUrl, SubscriptionExpirationDateTime) '
69+
+ 'VALUES ($userId, $subscriptionId, $accessToken, $resource, $changeType, '
70+
+ '$clientState, $notificationUrl, $subscriptionExpirationDateTime)';
7471

7572
db.serialize(() => {
7673
db.run(
@@ -92,9 +89,8 @@ export function saveSubscription(subscriptionData, callback) {
9289

9390
export function deleteSubscription(subscriptionId, callback) {
9491
const db = new sqlite3.Database(dbFile);
95-
const deleteStatement =
96-
'DELETE FROM Subscription WHERE ' +
97-
'SubscriptionId = $subscriptionId';
92+
const deleteStatement = 'DELETE FROM Subscription WHERE '
93+
+ 'SubscriptionId = $subscriptionId';
9894

9995
db.serialize(() => {
10096
db.run(

‎helpers/requestHelper.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export function postData(path, token, data, callback) {
2424
const req = https.request(options, res => {
2525
let subscriptionData = '';
2626

27-
res.on('data', chunk => (subscriptionData += chunk));
27+
res.on('data', chunk => { subscriptionData += chunk; });
2828
res.on('end', () => {
2929
if (res.statusCode === 201) callback(null, JSON.parse(subscriptionData));
3030
else callback(JSON.parse(subscriptionData), null);
@@ -50,16 +50,16 @@ export function getData(path, token, callback) {
5050
method: 'GET',
5151
headers: {
5252
'Content-Type': 'application/json',
53-
Accept: 'application/json;odata.metadata=minimal;' +
54-
'odata.streaming=true;IEEE754Compatible=false',
53+
Accept: 'application/json;odata.metadata=minimal;'
54+
+ 'odata.streaming=true;IEEE754Compatible=false',
5555
Authorization: 'Bearer ' + token
5656
}
5757
};
5858

5959
const req = https.request(options, res => {
6060
let endpointData = '';
6161

62-
res.on('data', chunk => (endpointData += chunk));
62+
res.on('data', chunk => { endpointData += chunk; });
6363
res.on('end', () => {
6464
if (res.statusCode === 200) callback(null, JSON.parse(endpointData));
6565
else callback(JSON.parse(endpointData), null);
@@ -91,8 +91,6 @@ export function deleteData(path, token, callback) {
9191
};
9292

9393
const req = https.request(options, res => {
94-
let endpointData = '';
95-
res.on('data', chunk => (endpointData += chunk));
9694
res.on('end', () => callback(null));
9795
});
9896

‎public/client.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ document.getElementById('subscriptionId').innerHTML = subscriptionId;
3131
const userId = getQueryStringParameter('userId');
3232
document.getElementById('userId').innerHTML = userId;
3333
document.getElementById('signOutButton').onclick = () => {
34-
location.href = '/signout/' + subscriptionId;
34+
window.location.href = '/signout/' + subscriptionId;
3535
};
3636

3737
function getQueryStringParameter(paramToRetrieve) {

‎routes/auth.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ authRouter.get('/callback', (req, res, next) => {
4141
// The name of the property coming from the service might change from
4242
// subscriptionId to id in the near future.
4343
res.redirect(
44-
'/home.html?subscriptionId=' + subscriptionData.id +
45-
'&userId=' + subscriptionData.userId
44+
'/home.html?subscriptionId=' + subscriptionData.id
45+
+ '&userId=' + subscriptionData.userId
4646
);
4747
} else if (requestError) {
4848
res.status(500);

‎tests/confTest.js‎

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ describe('ADAL', function () { // eslint-disable-line no-undef
77
function () {
88
assert(
99
isADALConfigured(conf.adalConfiguration),
10-
'\nRegister clientID and clientSecret in file constants.js.\n' +
11-
'You don\'t have them? Get them by using the Office 365 app registration tool\n' +
12-
'http://dev.office.com/app-registration\n' +
13-
'App type: Web App\n' +
14-
'Sign on URL: http://localhost:3000\n' +
15-
'Redirect URI: http://localhost:3000/callback\n' +
16-
'App permissions: Mail.Read'
10+
'\nRegister clientID and clientSecret in file constants.js.\n'
11+
+ 'You don\'t have them? Get them by using the Office 365 app registration tool\n'
12+
+ 'http://dev.office.com/app-registration\n'
13+
+ 'App type: Web App\n'
14+
+ 'Sign on URL: http://localhost:3000\n'
15+
+ 'Redirect URI: http://localhost:3000/callback\n'
16+
+ 'App permissions: Mail.Read'
1717
);
1818
}
1919
);
@@ -23,36 +23,33 @@ describe('NotificationURL', function () { // eslint-disable-line no-undef
2323
it('Checking notificationUrl in constants.js', function () { // eslint-disable-line no-undef
2424
assert(
2525
isSubscriptionConfigured(conf.subscriptionConfiguration),
26-
'\nConfigure the notification URL in file constants.js.\n' +
27-
'Install ngrok from https://ngrok.com/download and run\n' +
28-
'\tngrok http 3000\n' +
29-
'Copy the NGROK_ID in https://NGROK_ID.ngrok.io from the output\n' +
30-
'of the command above to the notificationUrl property.'
26+
'\nConfigure the notification URL in file constants.js.\n'
27+
+ 'Install ngrok from https://ngrok.com/download and run\n'
28+
+ '\tngrok http 3000\n'
29+
+ 'Copy the NGROK_ID in https://NGROK_ID.ngrok.io from the output\n'
30+
+ 'of the command above to the notificationUrl property.'
3131
);
3232
});
3333
});
3434

3535
function isADALConfigured(configuration) {
36-
var clientIDConfigured =
37-
typeof(configuration.clientID) !== 'undefined' &&
38-
configuration.clientID !== null &&
39-
configuration.clientID !== '' &&
40-
configuration.clientID !== 'ENTER_YOUR_CLIENT_ID';
41-
var clientSecretConfigured =
42-
typeof(configuration.clientSecret) !== 'undefined' &&
43-
configuration.clientSecret !== null &&
44-
configuration.clientSecret !== '' &&
45-
configuration.clientSecret !== 'ENTER_YOUR_SECRET';
36+
var clientIDConfigured = typeof (configuration.clientID) !== 'undefined'
37+
&& configuration.clientID !== null
38+
&& configuration.clientID !== ''
39+
&& configuration.clientID !== 'ENTER_YOUR_CLIENT_ID';
40+
var clientSecretConfigured = typeof (configuration.clientSecret) !== 'undefined'
41+
&& configuration.clientSecret !== null
42+
&& configuration.clientSecret !== ''
43+
&& configuration.clientSecret !== 'ENTER_YOUR_SECRET';
4644

4745
return clientIDConfigured && clientSecretConfigured;
4846
}
4947

5048
function isSubscriptionConfigured(configuration) {
51-
var notificationURLConfigured =
52-
typeof(configuration.notificationUrl) !== 'undefined' &&
53-
configuration.notificationUrl !== null &&
54-
configuration.notificationUrl !== '' &&
55-
configuration.notificationUrl.indexOf('NGROK_ID') === -1;
49+
var notificationURLConfigured = typeof (configuration.notificationUrl) !== 'undefined'
50+
&& configuration.notificationUrl !== null
51+
&& configuration.notificationUrl !== ''
52+
&& configuration.notificationUrl.indexOf('NGROK_ID') === -1;
5653

5754
return notificationURLConfigured;
5855
}

0 commit comments

Comments
 (0)