diff --git a/app/coffee/modules/base/urls.coffee b/app/coffee/modules/base/urls.coffee index edac0b5e..f6d9e061 100644 --- a/app/coffee/modules/base/urls.coffee +++ b/app/coffee/modules/base/urls.coffee @@ -30,8 +30,7 @@ class UrlsService extends taiga.Service constructor: (@config) -> @.urls = {} - @.host = config.get("host") - @.scheme = config.get("scheme") + @.mainUrl = config.get("api") update: (urls) -> @.urls = _.merge(@.urls, urls) @@ -44,7 +43,11 @@ class UrlsService extends taiga.Service name = args.slice(0, 1)[0] url = format(@.urls[name], args.slice(1)) - return format("%s://%s%s", [@.scheme, @.host, url]) + + return format("%s/%s", [ + _.str.rtrim(@.mainUrl, "/"), + _.str.ltrim(url, "/") + ]) module = angular.module("taigaBase") diff --git a/app/coffee/modules/resources.coffee b/app/coffee/modules/resources.coffee index bb0d9caf..6947e804 100644 --- a/app/coffee/modules/resources.coffee +++ b/app/coffee/modules/resources.coffee @@ -24,79 +24,79 @@ taiga = @.taiga class ResourcesService extends taiga.Service urls = { - "auth": "/api/v1/auth" - "auth-register": "/api/v1/auth/register" - "invitations": "/api/v1/invitations" - "permissions": "/api/v1/permissions" - "roles": "/api/v1/roles" - "projects": "/api/v1/projects" - "memberships": "/api/v1/memberships" - "notify-policies": "/api/v1/notify-policies" - "bulk-create-memberships": "/api/v1/memberships/bulk_create" - "milestones": "/api/v1/milestones" - "userstories": "/api/v1/userstories" - "bulk-create-us": "/api/v1/userstories/bulk_create" - "bulk-update-us-backlog-order": "/api/v1/userstories/bulk_update_backlog_order" - "bulk-update-us-sprint-order": "/api/v1/userstories/bulk_update_sprint_order" - "bulk-update-us-kanban-order": "/api/v1/userstories/bulk_update_kanban_order" - "userstories-restore": "/api/v1/userstories/%s/restore" - "tasks": "/api/v1/tasks" - "bulk-create-tasks": "/api/v1/tasks/bulk_create" - "tasks-restore": "/api/v1/tasks/%s/restore" - "issues": "/api/v1/issues" - "bulk-create-issues": "/api/v1/issues/bulk_create" - "issues-restore": "/api/v1/issues/%s/restore" - "wiki": "/api/v1/wiki" - "wiki-restore": "/api/v1/wiki/%s/restore" - "wiki-links": "/api/v1/wiki-links" - "choices/userstory-statuses": "/api/v1/userstory-statuses" - "choices/userstory-statuses/bulk-update-order": "/api/v1/userstory-statuses/bulk_update_order" - "choices/points": "/api/v1/points" - "choices/points/bulk-update-order": "/api/v1/points/bulk_update_order" - "choices/task-statuses": "/api/v1/task-statuses" - "choices/task-statuses/bulk-update-order": "/api/v1/task-statuses/bulk_update_order" - "choices/issue-statuses": "/api/v1/issue-statuses" - "choices/issue-statuses/bulk-update-order": "/api/v1/issue-statuses/bulk_update_order" - "choices/issue-types": "/api/v1/issue-types" - "choices/issue-types/bulk-update-order": "/api/v1/issue-types/bulk_update_order" - "choices/priorities": "/api/v1/priorities" - "choices/priorities/bulk-update-order": "/api/v1/priorities/bulk_update_order" - "choices/severities": "/api/v1/severities" - "choices/severities/bulk-update-order": "/api/v1/severities/bulk_update_order" - "search": "/api/v1/search" - "sites": "/api/v1/sites" - "project-templates": "/api/v1/project-templates" - "site-members": "/api/v1/site-members" - "site-projects": "/api/v1/site-projects" - "users": "/api/v1/users" - "users-password-recovery": "/api/v1/users/password_recovery" - "users-change-password-from-recovery": "/api/v1/users/change_password_from_recovery" - "users-change-password": "/api/v1/users/change_password" - "users-change-email": "/api/v1/users/change_email" - "user-storage": "/api/v1/user-storage" - "resolver": "/api/v1/resolver" - "userstory-statuses": "/api/v1/userstory-statuses" - "points": "/api/v1/points" - "task-statuses": "/api/v1/task-statuses" - "issue-statuses": "/api/v1/issue-statuses" - "issue-types": "/api/v1/issue-types" - "priorities": "/api/v1/priorities" - "severities": "/api/v1/severities" + "auth": "/auth" + "auth-register": "/auth/register" + "invitations": "/invitations" + "permissions": "/permissions" + "roles": "/roles" + "projects": "/projects" + "memberships": "/memberships" + "notify-policies": "/notify-policies" + "bulk-create-memberships": "/memberships/bulk_create" + "milestones": "/milestones" + "userstories": "/userstories" + "bulk-create-us": "/userstories/bulk_create" + "bulk-update-us-backlog-order": "/userstories/bulk_update_backlog_order" + "bulk-update-us-sprint-order": "/userstories/bulk_update_sprint_order" + "bulk-update-us-kanban-order": "/userstories/bulk_update_kanban_order" + "userstories-restore": "/userstories/%s/restore" + "tasks": "/tasks" + "bulk-create-tasks": "/tasks/bulk_create" + "tasks-restore": "/tasks/%s/restore" + "issues": "/issues" + "bulk-create-issues": "/issues/bulk_create" + "issues-restore": "/issues/%s/restore" + "wiki": "/wiki" + "wiki-restore": "/wiki/%s/restore" + "wiki-links": "/wiki-links" + "choices/userstory-statuses": "/userstory-statuses" + "choices/userstory-statuses/bulk-update-order": "/userstory-statuses/bulk_update_order" + "choices/points": "/points" + "choices/points/bulk-update-order": "/points/bulk_update_order" + "choices/task-statuses": "/task-statuses" + "choices/task-statuses/bulk-update-order": "/task-statuses/bulk_update_order" + "choices/issue-statuses": "/issue-statuses" + "choices/issue-statuses/bulk-update-order": "/issue-statuses/bulk_update_order" + "choices/issue-types": "/issue-types" + "choices/issue-types/bulk-update-order": "/issue-types/bulk_update_order" + "choices/priorities": "/priorities" + "choices/priorities/bulk-update-order": "/priorities/bulk_update_order" + "choices/severities": "/severities" + "choices/severities/bulk-update-order": "/severities/bulk_update_order" + "search": "/search" + "sites": "/sites" + "project-templates": "/project-templates" + "site-members": "/site-members" + "site-projects": "/site-projects" + "users": "/users" + "users-password-recovery": "/users/password_recovery" + "users-change-password-from-recovery": "/users/change_password_from_recovery" + "users-change-password": "/users/change_password" + "users-change-email": "/users/change_email" + "user-storage": "/user-storage" + "resolver": "/resolver" + "userstory-statuses": "/userstory-statuses" + "points": "/points" + "task-statuses": "/task-statuses" + "issue-statuses": "/issue-statuses" + "issue-types": "/issue-types" + "priorities": "/priorities" + "severities": "/severities" # History - "history/us": "/api/v1/history/userstory" - "history/issue": "/api/v1/history/issue" - "history/task": "/api/v1/history/task" - "history/wiki": "/api/v1/history/wiki" + "history/us": "/history/userstory" + "history/issue": "/history/issue" + "history/task": "/history/task" + "history/wiki": "/history/wiki" # Attachments - "attachments/us": "/api/v1/userstories/attachments" - "attachments/issue": "/api/v1/issues/attachments" - "attachments/task": "/api/v1/tasks/attachments" - "attachments/wiki_page": "/api/v1/wiki/attachments" + "attachments/us": "/userstories/attachments" + "attachments/issue": "/issues/attachments" + "attachments/task": "/tasks/attachments" + "attachments/wiki_page": "/wiki/attachments" # Feedback - "feedback": "/api/v1/feedback" + "feedback": "/feedback" } # Initialize api urls service