Fixed service launcher & metapool launcher to correctly recognize http urls

server/src/uds/web/util/services.py

@@ -33,7 +33,7 @@ import typing
 
 from django.utils.translation import ugettext
 from django.utils import formats
-from django.urls.base import reverse
+from django.urls import reverse
 
 from uds.models import ServicePool, Transport, Network, ServicePoolGroup, MetaPool, getSqlDatetime
 from uds.core.util.config import GlobalConfig

server/src/uds/web/views/service.py

@@ -33,6 +33,7 @@ import logging
 import typing
 
 from django.utils.translation import ugettext as _
+from django.urls import reverse
 from django.http import HttpResponse
 from django.views.decorators.cache import cache_page, never_cache
 
@@ -126,16 +127,22 @@ def userServiceEnabler(request: 'HttpRequest', idService: str, idTransport: str)
 
         userService, trans = res[1], res[3]
 
-        data = {
+        typeTrans = trans.getType()
-            'service': 'A' + userService.uuid,
-            'transport': trans.uuid,
-            'user': request.user.uuid,
-            'password': password
-        }
 
-        ticket = TicketStore.create(data)
+        error = ''  # No error
-        error = ''
+
-        url = html.udsLink(request, ticket, scrambler)
+        if typeTrans.ownLink:
+            url = reverse('TransportOwnLink', args=('A' + userService.uuid, trans.uuid))
+        else:
+            data = {
+                'service': 'A' + userService.uuid,
+                'transport': trans.uuid,
+                'user': request.user.uuid,
+                'password': password
+            }
+
+            ticket = TicketStore.create(data)
+            url = html.udsLink(request, ticket, scrambler)
     except ServiceNotReadyError as e:
         logger.debug('Service not ready')
         # Not ready, show message and return to this page in a while