diff --git a/app/modules/projects/create/import/import-project.controller.coffee b/app/modules/projects/create/import/import-project.controller.coffee index 2318759c..3c0d3fa7 100644 --- a/app/modules/projects/create/import/import-project.controller.coffee +++ b/app/modules/projects/create/import/import-project.controller.coffee @@ -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 diff --git a/app/modules/projects/create/jira-import/jira-import.service.coffee b/app/modules/projects/create/jira-import/jira-import.service.coffee index cbd87116..65d0d2f3 100644 --- a/app/modules/projects/create/jira-import/jira-import.service.coffee +++ b/app/modules/projects/create/jira-import/jira-import.service.coffee @@ -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) diff --git a/app/modules/resources/importers-resource.service.coffee b/app/modules/resources/importers-resource.service.coffee index 82479bf2..5ac517dc 100644 --- a/app/modules/resources/importers-resource.service.coffee +++ b/app/modules/resources/importers-resource.service.coffee @@ -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")