taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding jira oauth verifier param

stable
Jesús Espino 2017-03-23 18:44:11 +01:00 committed by David Barragán Merino
parent da067e1d7b
commit f2fe2ec1df
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/modules/projects/create/import/import-project.controller.coffee
View File

@ -76,7 +76,8 @@ class ImportProjectController
jiraOauthToken = locationSearch.oauth_token
if jiraOauthToken
return @jiraService.authorize().then ((data) =>
jiraOauthVerifier = locationSearch.oauth_verifier
return @jiraService.authorize(jiraOauthVerifier).then ((data) =>
@location.search({token: data.token, url: data.url})
), @.cancelCurrentImport.bind(this)
else

4
app/modules/projects/create/jira-import/jira-import.service.coffee
View File

@ -48,9 +48,9 @@ class JiraImportService extends taiga.Service
, (err) =>
reject(err.data._error_message)
authorize: () ->
authorize: (oauth_verifier) ->
return new Promise (resolve, reject) =>
@resources.jiraImporter.authorize().then ((response) =>
@resources.jiraImporter.authorize(oauth_verifier).then ((response) =>
@.token = response.data.token
@.url = response.data.url
resolve(response.data)

4
app/modules/resources/importers-resource.service.coffee
View File

@ -70,9 +70,9 @@ JiraResource = (urlsService, http) ->
url = urlsService.resolve("importers-jira-auth-url") + "?url=" + jira_url
return http.get(url)
service.authorize = () ->
service.authorize = (oauth_verifier) ->
url = urlsService.resolve("importers-jira-authorize")
return http.post(url)
return http.post(url, {oauth_verifier: oauth_verifier})
service.listProjects = (jira_url, token) ->
url = urlsService.resolve("importers-jira-list-projects")