Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 58fae87

Browse files
veshuveshu
committedJun 17, 2018
changes for #17 #15 #16 
1 parent be83c14 commit 58fae87

File tree

9 files changed

+490
-170
lines changed

9 files changed

+490
-170
lines changed
 

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Note: heroku domain should match subdomain of topcoder-dev or topcoder depending
7373

7474
## Verification
7575

76-
- run `npm serve` to start the app
76+
- run `npm run serve` to start the app
7777
- go to topcoderx.topcoder-dev.com and it will redirect to Topcoder login page, after successful login it will redirect back to Topcoder x app.
7878
- go to settings by clicking username at top right corner
7979
- setup both git provider to authorize topcoder-x to manage your repo on behalf of you

‎package-lock.json

Lines changed: 337 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"mongoose": "^4.11.9",
7171
"octonode": "^0.9.2",
7272
"pace-js": "~1.0.2",
73+
"parse-domain": "^2.1.2",
7374
"shortid": "^2.2.8",
7475
"superagent": "^3.6.0",
7576
"superagent-promise": "^1.1.0",

‎src/common/helper.js

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,16 @@ const getParams = require('get-parameter-names');
1515
const bluebird = require('bluebird');
1616
const uuid = require('uuid/v4');
1717
const bcrypt = require('bcryptjs');
18+
const parseDomain = require('parse-domain');
1819
const config = require('../config');
1920
const logger = require('./logger');
2021
const errors = require('./errors');
2122
const constants = require('./constants');
2223
const NotFoundError = require('./errors').NotFoundError;
24+
const ValidationError = require('./errors').ValidationError;
2325

2426
bluebird.promisifyAll(bcrypt);
27+
bluebird.promisifyAll(parseDomain);
2528

2629
/**
2730
* Convert array with arguments to object
@@ -82,7 +85,7 @@ function _decorateWithValidators(service) {
8285
const params = getParams(method);
8386
service[name] = async function serviceMethodWithValidation(...args) {
8487
const value = _combineObject(params, args);
85-
const normalized = Joi.attempt(value, method.schema, {abortEarly: false});
88+
const normalized = Joi.attempt(value, method.schema, { abortEarly: false });
8689
// Joi will normalize values
8790
// for example string number '1' to 1
8891
// if schema type is number
@@ -188,6 +191,42 @@ async function ensureExists(Model, criteria) {
188191
return result;
189192
}
190193

194+
/**
195+
* get the provider name from git repo url
196+
* @param {String} repoUrl the project repo URL
197+
* @returns {String} the provider
198+
*/
199+
async function getProviderType(repoUrl) {
200+
const parsedDomain = await parseDomain(repoUrl);
201+
if (!parsedDomain || !parsedDomain.domain || (parsedDomain.domain !== 'github' && parsedDomain.domain !== 'gitlab')) {
202+
throw new ValidationError('Invalid git repo url');
203+
}
204+
return parsedDomain.domain;
205+
}
206+
207+
/**
208+
* gets the git username of copilot for a project
209+
* @param {Object} models the db models
210+
* @param {Object} project the db project detail
211+
* @param {String} provider the git provider
212+
* @returns {Object} the owner/copilot for the project
213+
*/
214+
async function getProjectOwner(models, project, provider) {
215+
const userMapping = await models.UserMapping.findOne({
216+
topcoderUsername: project.username,
217+
});
218+
219+
if (!userMapping || (provider === 'github' && !userMapping.githubUserId) || (provider === 'gitlab' && !userMapping.gitlabUserId)) {
220+
throw new Error(`Couldn't find owner username for '${provider}' for this repository.`);
221+
}
222+
223+
const copilot = await models.User.findOne({
224+
username: provider === 'github' ? userMapping.githubUsername : userMapping.gitlabUsername,
225+
type: provider,
226+
});
227+
return copilot;
228+
}
229+
191230

192231
/**
193232
* Generate an unique identifier
@@ -206,4 +245,6 @@ module.exports = {
206245
convertGitLabError,
207246
ensureExists,
208247
generateIdentifier,
248+
getProviderType,
249+
getProjectOwner,
209250
};

‎src/controllers/ProjectController.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const ProjectService = require('../services/ProjectService');
1818
* @returns {Object} the result
1919
*/
2020
async function create(req) {
21-
return await ProjectService.create(req.body);
21+
return await ProjectService.create(req.body, req.currentUser.handle);
2222
}
2323

2424
/**
@@ -28,7 +28,7 @@ async function create(req) {
2828
* @returns {Object} the result
2929
*/
3030
async function update(req) {
31-
return await ProjectService.update(req.body);
31+
return await ProjectService.update(req.body, req.currentUser.handle);
3232
}
3333

3434
/**
@@ -37,7 +37,7 @@ async function update(req) {
3737
* @returns {Array} the result
3838
*/
3939
async function getAll(req) {
40-
return await ProjectService.getAll(req.query.status);
40+
return await ProjectService.getAll(req.query.status, req.currentUser.handle);
4141
}
4242

4343
/**
@@ -47,7 +47,7 @@ async function getAll(req) {
4747
* @returns {Object} the result
4848
*/
4949
async function createLabel(req) {
50-
return await ProjectService.createLabel(req.body);
50+
return await ProjectService.createLabel(req.body, req.currentUser.handle);
5151
}
5252

5353
/**
@@ -57,7 +57,7 @@ async function createLabel(req) {
5757
* @returns {Object} the result
5858
*/
5959
async function createHook(req) {
60-
return await ProjectService.createHook(req.body);
60+
return await ProjectService.createHook(req.body, req.currentUser.handle);
6161
}
6262

6363
module.exports = {

‎src/front/src/.eslintrc

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
"rules": {
66
"angular/no-service-method": 0,
77
"angular/window-service": 0,
8-
"angular/di": [2, "array"],
8+
"angular/di": [
9+
2,
10+
"array"
11+
],
912
"angular/angularelement": 0,
1013
"angular/timeout-service": 0,
1114
"max-params": 0,
@@ -14,24 +17,26 @@
1417
"valid-jsdoc": 0,
1518
"require-jsdoc": 0,
1619
"no-magic-numbers": 0,
17-
"no-invalid-this" : 0,
18-
"no-nested-ternary" : 0,
19-
"no-void" : 0,
20-
"consistent-return" : 0,
21-
"lodash/prefer-includes" : 0,
22-
"one-var" : 0,
23-
"no-restricted-syntax" : 0,
24-
"func-style" : 0,
25-
"vars-on-top" : 0,
26-
"func-names" : 0,
27-
"prefer-rest-params" : 0,
28-
"no-var":0,
29-
"no-inner-declarations":0
20+
"no-invalid-this": 0,
21+
"no-nested-ternary": 0,
22+
"no-void": 0,
23+
"consistent-return": 0,
24+
"lodash/prefer-includes": 0,
25+
"one-var": 0,
26+
"no-restricted-syntax": 0,
27+
"func-style": 0,
28+
"vars-on-top": 0,
29+
"func-names": 0,
30+
"prefer-rest-params": 0,
31+
"no-var": 0,
32+
"no-inner-declarations": 0,
33+
"prefer-arrow-callback": 0,
34+
"prefer-template":0,
3035
},
3136
"env": {
3237
"browser": true,
3338
"commonjs": true,
3439
"es6": true,
3540
"jquery": true
3641
}
37-
}
42+
}

‎src/front/src/app/projects/projects.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ <h4>You don't have active projects right now. Please
4242
</tr>
4343
</thead>
4444
<tbody>
45-
<tr ng-repeat="project in projects" class="animate-repeat" ng-class-even="'footable-even'" ng-class-odd="'footable-odd'">
45+
<tr ng-repeat="project in projects" ng-class-even="'footable-even'" ng-class-odd="'footable-odd'">
4646
<td class="col-lg-2">{{project.title}}</td>
4747
<td class="col-lg-2">
4848
<a href="{{directUrlBase}}{{project.tcDirectId}}" target="_blank">{{project.tcDirectId}}</a>

‎src/front/src/app/upsertproject/upsertproject.controller.js

Lines changed: 21 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
angular.module('topcoderX').controller('ProjectController', ['currentUser', '$scope', '$timeout', 'ProjectService',
99
'$rootScope', '$state', 'Alert', function (currentUser, $scope, $timeout, ProjectService, $rootScope, $state, Alert) {
1010

11-
//Maintain the navigation state.
11+
// Maintain the navigation state.
1212
$timeout(function () {
1313
angular.element('#projectsManagement').addClass('active');
1414
}, 0);
1515

16-
//below logic is trying to identify whether we are editing a project
16+
// below logic is trying to identify whether we are editing a project
1717
$scope.editing = true;
1818
$scope.project = {
19-
'title': '',
20-
'tcDirectId': '',
21-
'repoUrl': '',
22-
'rocketChatWebhook': null,
23-
'rocketChatChannelName': null,
24-
'archived': false
19+
title: '',
20+
tcDirectId: '',
21+
repoUrl: '',
22+
rocketChatWebhook: null,
23+
rocketChatChannelName: null,
24+
archived: false,
2525
};
2626
if ($rootScope.project) {
2727
$scope.title = 'Edit a Project';
@@ -33,97 +33,40 @@ angular.module('topcoderX').controller('ProjectController', ['currentUser', '$sc
3333
$scope.editing = false;
3434
}
3535

36-
//represents the repo owner
37-
$scope.repoOwner = '';
38-
39-
//represents the repo name
40-
$scope.repoName = '';
41-
42-
//represents the repo is located at github or gitlab
43-
$scope.repoType = '';
44-
45-
//function to get the repo's owner and the repo's name based on repoUrl
46-
const getRepoDetail = function (repoUrl, callback, errorCallBack) {
47-
$scope.$broadcast('alert.ClearAll', {});
48-
if (repoUrl.endsWith('/')) {
49-
repoUrl = repoUrl.slice(0, -1);
50-
}
51-
const results = repoUrl.split('/');
52-
$scope.repoName = results[results.length - 1];
53-
$scope.repoOwner = results[results.length - 2];
54-
$scope.repoType = results[results.length - 3].split('.')[0];
55-
ProjectService.getUserToken($scope.repoOwner, $scope.repoType).then(function (response) {
56-
if (angular.isDefined(response.data.token)) {
57-
$scope.token = response.data.token;
58-
return callback();
59-
} else {
60-
const erroMessage = 'Token not found for the user ' + $scope.repoOwner + ' of type ' + $scope.repoType + ' please complete profile setting';
61-
Alert.error(erroMessage, $scope);
62-
}
63-
}, function (error) {
64-
errorCallBack(error);
65-
});
66-
};
67-
68-
//function to add labels to the current project.
36+
// function to add labels to the current project.
6937
$scope.addLabels = function () {
70-
getRepoDetail($scope.project.repoUrl, function () {
71-
// for (var i = 0; i < $rootScope.config.LABELS.length; i++) {
72-
var objc = {
73-
'repoOwner': $scope.repoOwner,
74-
'repoName': $scope.repoName,
75-
'repoToken': $scope.token,
76-
77-
'repoType': $scope.repoType
78-
};
79-
ProjectService.createLabel(objc).then(function () {
80-
Alert.info('Label Added Successfully', $scope);
81-
}).catch(function (error) {
82-
Alert.error(error.data.message, $scope);
83-
});
84-
// }
85-
}, function (error) {
38+
ProjectService.createLabel({ projectId: $scope.project.id }).then(function () {
39+
Alert.info('Label Added Successfully', $scope);
40+
}).catch(function (error) {
8641
Alert.error(error.data.message, $scope);
8742
});
8843
};
8944

90-
//function to add hooks to the current project.
45+
// function to add hooks to the current project.
9146
$scope.addHooks = function () {
92-
getRepoDetail($scope.project.repoUrl, function () {
93-
var objc = {
94-
'repoOwner': $scope.repoOwner,
95-
'repoName': $scope.repoName,
96-
'repoToken': $scope.token,
97-
'repoType': $scope.repoType,
98-
'projectId': $scope.project.id
99-
};
100-
ProjectService.createHooks(objc).then(function () {
101-
Alert.info('Webhook Added Successfully', $scope);
102-
}).catch(function (error) {
103-
Alert.error(error.data.message, $scope);
104-
});
105-
}, function (error) {
47+
ProjectService.createHooks({ projectId: $scope.project.id }).then(function () {
48+
Alert.info('Webhook Added Successfully', $scope);
49+
}).catch(function (error) {
10650
Alert.error(error.data.message, $scope);
10751
});
10852
};
10953

110-
//save the project info to database, and go back to project list view.
54+
// save the project info to database, and go back to project list view.
11155
$scope.save = function () {
112-
$scope.project.username = $rootScope.currentUser.handle;
11356
if ($scope.editing) {
11457
ProjectService.update($scope.project).then(function () {
11558
Alert.info('Project Updated Successfully', $scope);
11659
$state.go('app.projects');
117-
}).catch((function (error) {
60+
}).catch(function (error) {
11861
Alert.error(error.data.message, $scope);
119-
}))
62+
});
12063
} else {
12164
ProjectService.create($scope.project).then(function () {
12265
Alert.info('Project Created Successfully', $scope);
12366
$state.go('app.projects');
12467
}).catch(function (error) {
12568
Alert.error(error.data.message, $scope);
126-
})
69+
});
12770
}
128-
}
71+
};
12972
}]);

‎src/services/ProjectService.js

Lines changed: 62 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ const _ = require('lodash');
1515
const guid = require('guid');
1616
const kafka = require('../utils/kafka');
1717
const helper = require('../common/helper');
18-
const Project = require('../models').Project;
18+
const models = require('../models');
1919
const config = require('../config');
2020

21+
const Project = models.Project;
2122
const projectSchema = {
2223
project: {
2324
id: Joi.string().required(),
@@ -29,7 +30,8 @@ const projectSchema = {
2930
archived: Joi.boolean().required(),
3031
username: Joi.string().required(),
3132
secretWebhookKey: Joi.string().required(),
32-
}
33+
},
34+
currentUserTopcoderHandle: Joi.string().required(),
3335
};
3436

3537
const createProjectSchema = {
@@ -40,16 +42,18 @@ const createProjectSchema = {
4042
rocketChatWebhook: Joi.string().allow(null),
4143
rocketChatChannelName: Joi.string().allow(null),
4244
archived: Joi.boolean().required(),
43-
username: Joi.string().required(),
44-
}
45+
},
46+
currentUserTopcoderHandle: Joi.string().required(),
4547
};
4648

4749
/**
4850
* creates project
4951
* @param {Object} project the project detail
52+
* @param {String} currentUserTopcoderHandle the topcoder handle of current user
5053
* @returns {Object} created project
5154
*/
52-
async function create(project) {
55+
async function create(project, currentUserTopcoderHandle) {
56+
await helper.getProviderType(project.repoUrl);
5357
/**
5458
* Uncomment below code to enable the function of raising event when 'project was created'
5559
*
@@ -58,7 +62,7 @@ async function create(project) {
5862
* }
5963
* await kafka.send(JSON.stringify(JSON.stringify(projectCreateEvent)));
6064
*/
61-
project.username = project.username.toLowerCase();
65+
project.username = currentUserTopcoderHandle;
6266
project.secretWebhookKey = guid.raw();
6367
const dbProject = new Project(project);
6468
return await dbProject.save();
@@ -69,9 +73,11 @@ create.schema = createProjectSchema;
6973
/**
7074
* updates project
7175
* @param {Object} project the project detail
76+
* @param {String} currentUserTopcoderHandle the topcoder handle of current user
7277
* @returns {Object} updated project
7378
*/
74-
async function update(project) {
79+
async function update(project, currentUserTopcoderHandle) {
80+
await helper.getProviderType(project.repoUrl);
7581
const dbProject = await helper.ensureExists(Project, project.id);
7682
if (dbProject.archived === 'false' && project.archived === true) {
7783
// project archived detected.
@@ -90,7 +96,7 @@ async function update(project) {
9096
* }
9197
* await kafka.send(JSON.stringify(JSON.stringify(projectUpdateEvent)));
9298
*/
93-
project.username = project.username.toLowerCase();
99+
project.username = currentUserTopcoderHandle;
94100
Object.entries(project).map((item) => {
95101
dbProject[item[0]] = item[1];
96102
return item;
@@ -103,29 +109,44 @@ update.schema = projectSchema;
103109
/**
104110
* gets all projects
105111
* @param {String} status the status of project
112+
* @param {String} currentUserTopcoderHandle the topcoder handle of current user
106113
* @returns {Array} all projects
107114
*/
108-
async function getAll(status) {
115+
async function getAll(status, currentUserTopcoderHandle) {
109116
if (status === 'archived') {
110-
return await Project.find({ archived: true });
117+
return await Project.find({ archived: true, username: currentUserTopcoderHandle });
111118
}
112-
return await Project.find({ archived: false });
119+
return await Project.find({ archived: false, username: currentUserTopcoderHandle });
113120
}
114121

115122
getAll.schema = Joi.object().keys({
116123
status: Joi.string().required().allow('active', 'archived').default('active'),
124+
currentUserTopcoderHandle: Joi.string().required(),
117125
});
118126

119127
/**
120128
* creates label
121129
* @param {Object} body the request body
130+
* @param {String} currentUserTopcoderHandle the topcoder handle of current user
122131
* @returns {Object} result
123132
*/
124-
async function createLabel(body) {
125-
if (body.repoType === 'github') {
133+
async function createLabel(body, currentUserTopcoderHandle) {
134+
const dbProject = await helper.ensureExists(Project, body.projectId);
135+
if (dbProject.username !== currentUserTopcoderHandle) {
136+
dbProject.username = currentUserTopcoderHandle;
137+
await dbProject.save();
138+
}
139+
const provider = await helper.getProviderType(dbProject.repoUrl);
140+
const copilot = await helper.getProjectOwner(models, dbProject, provider);
141+
const results = dbProject.repoUrl.split('/');
142+
let index = 1;
143+
const repoName = results[results.length - index];
144+
index += 1;
145+
const repoOwner = results[results.length - index];
146+
if (provider === 'github') {
126147
try {
127-
const client = gitHubApi.client(body.repoToken);
128-
const ghrepo = client.repo(`${body.repoOwner}/${body.repoName}`);
148+
const client = gitHubApi.client(copilot.accessToken);
149+
const ghrepo = client.repo(`${repoOwner}/${repoName}`);
129150
await Promise.all(config.LABELS.map(async (label) => {
130151
await new Promise((resolve, reject) => {
131152
ghrepo.label({
@@ -149,10 +170,10 @@ async function createLabel(body) {
149170
try {
150171
const client = new Gitlab({
151172
url: config.GITLAB_API_BASE_URL,
152-
oauthToken: body.repoToken,
173+
oauthToken: copilot.accessToken,
153174
});
154175
await Promise.all(config.LABELS.map(async (label) => {
155-
await client.Labels.create(`${body.repoOwner}/${body.repoName}`, {
176+
await client.Labels.create(`${repoOwner}/${repoName}`, {
156177
name: label.name,
157178
color: `#${label.color}`,
158179
});
@@ -168,24 +189,34 @@ async function createLabel(body) {
168189

169190
createLabel.schema = Joi.object().keys({
170191
body: Joi.object().keys({
171-
repoType: Joi.string().required(),
172-
repoToken: Joi.string().required(),
173-
repoOwner: Joi.string().required(),
174-
repoName: Joi.string().required(),
192+
projectId: Joi.string().required(),
175193
}),
194+
currentUserTopcoderHandle: Joi.string().required(),
176195
});
177196

178197
/**
179198
* creates hook
180199
* @param {Object} body the request body
200+
* @param {String} currentUserTopcoderHandle the topcoder handle of current user
181201
* @returns {Object} result
182202
*/
183-
async function createHook(body) {
184-
const projectDetail = await helper.ensureExists(Project, body.projectId);
185-
if (body.repoType === 'github') {
203+
async function createHook(body, currentUserTopcoderHandle) {
204+
const dbProject = await helper.ensureExists(Project, body.projectId);
205+
if (dbProject.username !== currentUserTopcoderHandle) {
206+
dbProject.username = currentUserTopcoderHandle;
207+
await dbProject.save();
208+
}
209+
const provider = await helper.getProviderType(dbProject.repoUrl);
210+
const copilot = await helper.getProjectOwner(models, dbProject, provider);
211+
const results = dbProject.repoUrl.split('/');
212+
let index = 1;
213+
const repoName = results[results.length - index];
214+
index += 1;
215+
const repoOwner = results[results.length - index];
216+
if (provider === 'github') {
186217
try {
187-
const client = gitHubApi.client(body.repoToken);
188-
const ghrepo = client.repo(`${body.repoOwner}/${body.repoName}`);
218+
const client = gitHubApi.client(copilot.accessToken);
219+
const ghrepo = client.repo(`${repoOwner}/${repoName}`);
189220
await new Promise((resolve, reject) => {
190221
ghrepo.hook({
191222
name: 'web',
@@ -202,7 +233,7 @@ async function createHook(body) {
202233
config: {
203234
url: `${config.HOOK_BASE_URL}/webhooks/github`,
204235
content_type: 'json',
205-
secret: projectDetail.secretWebhookKey,
236+
secret: dbProject.secretWebhookKey,
206237
},
207238
}, (error) => {
208239
if (error) {
@@ -221,9 +252,9 @@ async function createHook(body) {
221252
try {
222253
const client = new Gitlab({
223254
url: config.GITLAB_API_BASE_URL,
224-
oauthToken: body.repoToken,
255+
oauthToken: copilot.accessToken,
225256
});
226-
await client.ProjectHooks.add(`${body.repoOwner}/${body.repoName}`,
257+
await client.ProjectHooks.add(`${repoOwner}/${repoName}`,
227258
`${config.HOOK_BASE_URL}/webhooks/gitlab`, {
228259
push_events: true,
229260
issues_events: true,
@@ -234,7 +265,7 @@ async function createHook(body) {
234265
job_events: true,
235266
pipeline_events: true,
236267
wiki_page_events: true,
237-
token: projectDetail.secretWebhookKey,
268+
token: dbProject.secretWebhookKey,
238269
}
239270
);
240271
} catch (err) {
@@ -244,15 +275,7 @@ async function createHook(body) {
244275
return { success: true }
245276
}
246277

247-
createHook.schema = Joi.object().keys({
248-
body: Joi.object().keys({
249-
projectId: Joi.string().required(),
250-
repoType: Joi.string().required(),
251-
repoOwner: Joi.string().required(),
252-
repoToken: Joi.string().required(),
253-
repoName: Joi.string().required(),
254-
}),
255-
});
278+
createHook.schema = createLabel.schema;
256279

257280
module.exports = {
258281
create,

0 commit comments

Comments
 (0)
This repository has been archived.