diff --git a/app/modules/projects/create/import/import-project.controller.coffee b/app/modules/projects/create/import/import-project.controller.coffee index d2967f64..2318759c 100644 --- a/app/modules/projects/create/import/import-project.controller.coffee +++ b/app/modules/projects/create/import/import-project.controller.coffee @@ -28,9 +28,10 @@ class ImportProjectController '$routeParams', '$tgNavUrls', '$tgConfig', + '$tgConfirm', ] - constructor: (@trelloService, @jiraService, @githubService, @asanaService, @location, @window, @routeParams, @tgNavUrls, @config) -> + constructor: (@trelloService, @jiraService, @githubService, @asanaService, @location, @window, @routeParams, @tgNavUrls, @config, @confirm) -> start: -> @.token = null @@ -88,7 +89,9 @@ class ImportProjectController @window.open(url, "_self") else if from == "jira" @jiraService.getAuthUrl(@.jiraUrl).then (url) => - @window.open(url, "_self") + @window.open url, "_self" + , (err) => + @confirm.notify('error', err) else if from == "github" callbackUri = @location.absUrl() + "/github" @githubService.getAuthUrl(callbackUri).then (url) => diff --git a/app/modules/projects/create/import/import-project.controller.spec.coffee b/app/modules/projects/create/import/import-project.controller.spec.coffee index 670b6484..36735fdf 100644 --- a/app/modules/projects/create/import/import-project.controller.spec.coffee +++ b/app/modules/projects/create/import/import-project.controller.spec.coffee @@ -68,6 +68,13 @@ describe "ImportProjectCtrl", -> $provide.value("$window", mocks.window) + _mockConfirm = -> + mocks.confirm = { + notify: sinon.stub() + } + + $provide.value("$tgConfirm", mocks.confirm) + _mockLocation = -> mocks.location = { search: sinon.stub() @@ -98,6 +105,7 @@ describe "ImportProjectCtrl", -> _mockJiraImportService() _mockAsanaImportService() _mockWindow() + _mockConfirm() _mockLocation() _mockTgNavUrls() _mockRouteParams() 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 f9fcbe2e..cbd87116 100644 --- a/app/modules/projects/create/jira-import/jira-import.service.coffee +++ b/app/modules/projects/create/jira-import/jira-import.service.coffee @@ -41,10 +41,12 @@ class JiraImportService extends taiga.Service @resources.jiraImporter.importProject(@.url, @.token, name, description, projectId, userBindings, keepExternalReference, isPrivate, projectType, importerType) getAuthUrl: (url) -> - return new Promise (resolve) => + return new Promise (resolve, reject) => @resources.jiraImporter.getAuthUrl(url).then (response) => @.authUrl = response.data.url resolve(@.authUrl) + , (err) => + reject(err.data._error_message) authorize: () -> return new Promise (resolve, reject) =>