Skip to content

Commit fabed47

Browse files
dmessingdmessing
authored
Merge pull request #114 from huangqun/spigit-integration
Spigit integration
2 parents bd70baf + c6636d8 commit fabed47

19 files changed

+1048
-268
lines changed

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ The following configuration parameters are available:
3434
| ACCOUNTS_CONNECTOR_URL | Url to TC account connector |
3535
| JWT_V3_NAME | jwt V3 cookie name |
3636
| JWT_V2_NAME | jwt V2 cookie name |
37+
| OAUTH2_TOKEN_NAME | OAuth2 token name |
38+
| OAUTH2_TOKEN_EXPIRETIME_TAGNAME | OAuth2 token expire time tag name |
39+
| SPIGIT_API_URL | SPIGIT api base url |
40+
|SPIGIT_API_VERSION_PATH | SPIGIT api version path |
3741

3842
## Start the Application
3943

‎config.json‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
"AUTH_URL": "https://accounts.topcoder-dev.com/member",
88
"ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder-dev.com/connector.html",
99
"JWT_V3_NAME": "v3jwt",
10-
"JWT_V2_NAME": "tcjwt"
10+
"JWT_V2_NAME": "tcjwt",
11+
"OAUTH2_TOKEN_NAME": "oa2spigit",
12+
"OAUTH2_TOKEN_EXPIRETIME_TAGNAME": "oa2expire",
13+
"SPIGIT_API_URL": "spigit.com",
14+
"SPIGIT_API_VERSION_PATH" : "/api/v1"
1115
},
1216
"dev": {
1317
"API_URL" : "https://api.topcoder-dev.com",
@@ -17,7 +21,11 @@
1721
"AUTH_URL": "https://accounts.topcoder-dev.com/member",
1822
"ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder-dev.com/connector.html",
1923
"JWT_V3_NAME": "v3jwt",
20-
"JWT_V2_NAME": "tcjwt"
24+
"JWT_V2_NAME": "tcjwt",
25+
"OAUTH2_TOKEN_NAME": "oa2spigit",
26+
"OAUTH2_TOKEN_EXPIRETIME_TAGNAME": "oa2expire",
27+
"SPIGIT_API_URL": "spigit.com",
28+
"SPIGIT_API_VERSION_PATH" : "/api/v1"
2129
},
2230
"qa": {
2331
"API_URL" : "https://api.topcoder-qa.com",
@@ -27,7 +35,11 @@
2735
"AUTH_URL": "https://accounts.topcoder-qa.com/member",
2836
"ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder-qa.com/connector.html",
2937
"JWT_V3_NAME": "v3jwt",
30-
"JWT_V2_NAME": "tcjwt"
38+
"JWT_V2_NAME": "tcjwt",
39+
"OAUTH2_TOKEN_NAME": "oa2spigit",
40+
"OAUTH2_TOKEN_EXPIRETIME_TAGNAME": "oa2expire",
41+
"SPIGIT_API_URL": "spigit.com",
42+
"SPIGIT_API_VERSION_PATH" : "/api/v1"
3143
},
3244
"prod": {
3345
"API_URL" : "https://api.topcoder.com",
@@ -37,6 +49,10 @@
3749
"AUTH_URL": "https://accounts.topcoder.com/member",
3850
"ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder.com/connector.html",
3951
"JWT_V3_NAME": "v3jwt",
40-
"JWT_V2_NAME": "tcjwt"
52+
"JWT_V2_NAME": "tcjwt",
53+
"OAUTH2_TOKEN_NAME": "oa2spigit",
54+
"OAUTH2_TOKEN_EXPIRETIME_TAGNAME": "oa2expire",
55+
"SPIGIT_API_URL": "spigit.com",
56+
"SPIGIT_API_VERSION_PATH" : "/api/v1"
4157
}
4258
}

‎src/app/app.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,20 @@ angular.module('supportAdminApp', [
389389
templateUrl: 'app/challenges/challenges.html',
390390
data: { pageTitle: 'Challenge Management'},
391391
resolve: { auth: authenticate }
392+
})
393+
.state('index.ideas', {
394+
abstract: true,
395+
url: '/ideas',
396+
templateUrl: 'app/ideas/ideas.html',
397+
data: { pageTitle: 'Spigit' },
398+
controller: 'IdeasController'
399+
})
400+
.state('index.ideas.list', {
401+
url: '/list',
402+
templateUrl: 'app/ideas/ideas.list.html',
403+
data: { pageTitle: 'Spigit - Idea List' },
404+
controller: 'IdeaListController',
405+
resolve: { auth: authenticate }
392406
});
393407

394408
$urlRouterProvider.otherwise('/index/main');

‎src/app/auth/auth.config.js‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ angular.module('supportAdminApp')
1212
var refreshingToken = null;
1313

1414
jwtInterceptorProvider.tokenGetter = [
15-
'AuthService', '$http', 'API_URL', 'ADMIN_TOOL_URL', 'config',
16-
function($authService, $http, API_URL, ADMIN_TOOL_URL, config) {
15+
'AuthService', '$http', 'API_URL', 'ADMIN_TOOL_URL', 'config', 'SPIGIT_API_URL',
16+
function($authService, $http, API_URL, ADMIN_TOOL_URL, config, SPIGIT_API_URL) {
1717
// token V2 for API V2
1818
if (config.url.indexOf(ADMIN_TOOL_URL) > -1) {
1919
if ($authService.getTokenV2()) {
@@ -24,39 +24,42 @@ angular.module('supportAdminApp')
2424

2525
// token V3 for API V3
2626
} else {
27-
var currentToken = $authService.getTokenV3();
27+
if (config.url.indexOf(SPIGIT_API_URL) === -1) {
2828

29-
function handleRefreshResponse(res) {
30-
var newToken, ref, ref1, ref2;
29+
var currentToken = $authService.getTokenV3();
3130

32-
newToken = (ref = res.data) != null ? (ref1 = ref.result) != null ? (ref2 = ref1.content) != null ? ref2.token : void 0 : void 0 : void 0;
31+
function handleRefreshResponse(res) {
32+
var newToken, ref, ref1, ref2;
3333

34-
$authService.setTokenV3(newToken);
34+
newToken = (ref = res.data) != null ? (ref1 = ref.result) != null ? (ref2 = ref1.content) != null ? ref2.token : void 0 : void 0 : void 0;
3535

36-
return newToken;
37-
};
36+
$authService.setTokenV3(newToken);
3837

39-
function refreshingTokenComplete() {
40-
return refreshingToken = null;
41-
};
38+
return newToken;
39+
};
4240

43-
if ($authService.getTokenV3() && $authService.isTokenV3Expired()) {
44-
if (refreshingToken === null) {
45-
refreshingToken = $http({
46-
method: 'GET',
47-
url: API_URL + "/v3/authorizations/1",
48-
headers: {
49-
'Authorization': "Bearer " + currentToken
50-
}
51-
})
52-
.then(handleRefreshResponse)["finally"](refreshingTokenComplete)
53-
.catch(function() {
54-
$authService.login();
55-
});
41+
function refreshingTokenComplete() {
42+
return refreshingToken = null;
43+
};
44+
45+
if ($authService.getTokenV3() && $authService.isTokenV3Expired()) {
46+
if (refreshingToken === null) {
47+
refreshingToken = $http({
48+
method: 'GET',
49+
url: API_URL + "/v3/authorizations/1",
50+
headers: {
51+
'Authorization': "Bearer " + currentToken
52+
}
53+
})
54+
.then(handleRefreshResponse)["finally"](refreshingTokenComplete)
55+
.catch(function () {
56+
$authService.login();
57+
});
58+
}
59+
return refreshingToken;
60+
} else {
61+
return currentToken;
5662
}
57-
return refreshingToken;
58-
} else {
59-
return currentToken;
6063
}
6164
}
6265
}];

‎src/app/ideas/ideas-detail-dialog.html‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<div class="inmodal">
2+
<div class="modal-header" style="padding:14px"></div>
3+
<div class="modal-body">
4+
<div class="row">
5+
<div class="text-center" ng-show="isLoading">
6+
<img src="assets/images/loading.gif" />
7+
</div>
8+
<form role="form" name="detaillForm">
9+
<div class="col-md-12" ng-include src="'components/alert/alert.html'"></div>
10+
<div class="form-group">
11+
<h2>Idea Information</h2>
12+
<label>Ttitle</label>
13+
<input ng-model="form.title" type="text" class="form-control" readonly="readonly">
14+
</div>
15+
<div class="form-group">
16+
<label>Content</label>
17+
<div ng-bind-html="form.content" class="content"></div>
18+
<!--<div><textarea readonly="readonly">{{form.content}}</textarea></div>-->
19+
</div>
20+
<hr>
21+
<h2>Creator Information</h2>
22+
<div class="form-group">
23+
<label>First Name</label>
24+
<input ng-model="form.firstName" type="text" class="form-control" readonly="readonly">
25+
</div>
26+
<div class="form-group">
27+
<label>Last Name</label>
28+
<input ng-model="form.lastName" type="text" class="form-control" readonly="readonly">
29+
</div>
30+
<div class="form-group">
31+
<label>Email</label>
32+
<input ng-model="form.email" type="text" class="form-control" readonly="readonly">
33+
</div>
34+
</form>
35+
</div>
36+
</div>
37+
<div class="modal-footer">
38+
<button type="button" class="btn btn-white" ng-click="cancel()" ng-disabed="form.isLoading">
39+
Close
40+
</button>
41+
</div>
42+
<div style="text-align:center;position:absolute;top:65px;left:0;width:100%;height:100%;zIndex:1;"
43+
ng-show="form.isLoading">
44+
<img src="assets/images/loading.gif"/>
45+
</div>
46+
</div>

‎src/app/ideas/ideas.controller.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
'use strict';
2+
3+
var module = angular.module('supportAdminApp');
4+
5+
/**
6+
* The parent controller for the clients states
7+
*/
8+
module.controller('IdeasController', ['$scope', 'AuthService', '$state',
9+
function ($scope, $authService, $state) {
10+
$scope.$state = $state;
11+
12+
/**
13+
* Validate the user authentication
14+
*/
15+
$scope.authorized = function() {
16+
return $authService.isLoggedIn();
17+
};
18+
}
19+
]);

‎src/app/ideas/ideas.detail.controller.js‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
'use strict';
2+
3+
var module = angular.module('supportAdminApp');
4+
5+
module.controller('IdeasDetailController', ['$scope', '$log','IdeaService', 'Alert', '$timeout', 'OAuth2Service','$uibModalInstance', 'ideaId', 'domain', 'username', 'password', 'clientId', 'clientSecret', '$sce', 'SPIGIT_API_URL',
6+
function ($scope, $log, IdeaService, $alert, $timeout, OAuth2Service, $modalInstance, ideaId, domain, username, password, clientId, clientSecret, $sce, SPIGIT_API_URL) {
7+
8+
$scope.ideaId = ideaId;
9+
$scope.domain = domain;
10+
$scope.username = username;
11+
$scope.password = password;
12+
$scope.clientId = clientId;
13+
$scope.clientSecret = clientSecret;
14+
15+
$scope.form = {};
16+
$scope.isLoading = false;
17+
18+
$scope.load = function() {
19+
20+
$scope.isLoading = true;
21+
22+
// If token expired should get new token first
23+
if (OAuth2Service.checkTokenExpireTime()) {
24+
OAuth2Service.refreshToken($scope.username, $scope.password, $scope.domain, $scope.clientId, $scope.clientSecret).then(function (data) {
25+
$scope.loadDetail();
26+
}).catch(function (error) {
27+
$alert.error(error.message, $scope);
28+
$scope.isLoading = false;
29+
});
30+
} else {
31+
$scope.loadDetail();
32+
}
33+
}
34+
35+
// get idea detail
36+
$scope.loadDetail = function() {
37+
IdeaService.getIdeaDetail(domain, $scope.ideaId).then(function (data) {
38+
$scope.form.title = data.title;
39+
$scope.form.content = $sce.trustAsHtml($scope.convertContent(data.content));
40+
// get creator detail
41+
IdeaService.getUserDetail(domain, data.creator_id).then(function(user) {
42+
$scope.form.firstName = user.first_name;
43+
$scope.form.lastName = user.last_name;
44+
$scope.form.email = user.primary_email;
45+
$scope.isLoading = false;
46+
});
47+
}).catch(function (error) {
48+
$alert.error(error.error, $scope);
49+
$scope.isLoading = false;
50+
});
51+
}
52+
53+
/**
54+
* Convert detail content without html tags
55+
* @param content
56+
* @returns {string}
57+
*/
58+
$scope.convertContent = function(content) {
59+
var newContent= content.replace(/<img [^>]*src=['"]([^'"]+)[^>]*>/gi,function(match,capture){
60+
var newStr='<img src="http://' + domain + "." + SPIGIT_API_URL +capture+'" />';
61+
return newStr;
62+
});
63+
return newContent;
64+
}
65+
66+
$scope.cancel = function() {
67+
$modalInstance.close();
68+
};
69+
70+
71+
$scope.load();
72+
}
73+
]);

‎src/app/ideas/ideas.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<div class="row wrapper border-bottom white-bg page-heading">
2+
<div class="col-lg-10">
3+
<h2>{{$state.current.data.pageTitle}}</h2>
4+
</div>
5+
<div class="col-md-10 col-lg-12" ng-include src="'components/alert/alert.html'"></div>
6+
</div>
7+
<div ui-view=""></div>

0 commit comments

Comments
 (0)