Browse Source

jitsi_meet: use domain param

Guénaël Muller 7 years ago
parent
commit
8c897ed9f9

+ 3 - 1
tracim/tracim/controllers/root.py View File

188
         fake_api = Context(CTX.CURRENT_USER).toDict({'current_user': current_user_content})
188
         fake_api = Context(CTX.CURRENT_USER).toDict({'current_user': current_user_content})
189
         room = 'test'
189
         room = 'test'
190
         token = JitsiMeetRoom.generate_token(room)
190
         token = JitsiMeetRoom.generate_token(room)
191
+        domain = JitsiMeetRoom.domain
191
 
192
 
192
         return DictLikeClass(fake_api=fake_api,
193
         return DictLikeClass(fake_api=fake_api,
193
                              token=token,
194
                              token=token,
194
-                             room=room)
195
+                             room=room,
196
+                             domain=domain)

+ 7 - 7
tracim/tracim/lib/jitsi_meet/jitsi_meet.py View File

3
 
3
 
4
 import jwt
4
 import jwt
5
 
5
 
6
-JITSI_URL = "https://prosody"
6
+JITSI_DOMAIN = "prosody"
7
 JWT_APP_ID = "test"
7
 JWT_APP_ID = "test"
8
 JWT_SECRET = "secret"
8
 JWT_SECRET = "secret"
9
 JWT_ALG = 'HS256'
9
 JWT_ALG = 'HS256'
28
 class JitsiMeetRoomHandler:
28
 class JitsiMeetRoomHandler:
29
 
29
 
30
     def __init__(self,
30
     def __init__(self,
31
-                 base_url: str,
31
+                 domain: str,
32
                  token_config: typing.Optional[JitsiTokenConfig],
32
                  token_config: typing.Optional[JitsiTokenConfig],
33
                  ) -> None:
33
                  ) -> None:
34
-        self.base_url = base_url
34
+        self.domain = domain
35
         self.token_config = token_config
35
         self.token_config = token_config
36
 
36
 
37
     def generate_token(self, room: str)->str:
37
     def generate_token(self, room: str)->str:
64
         """
64
         """
65
         if self.token_config:
65
         if self.token_config:
66
             token = self.generate_token(room)
66
             token = self.generate_token(room)
67
-            url = "{}/{}?jwt={}".format(JITSI_URL,
67
+            url = "{}/{}?jwt={}".format(self.domain,
68
                                         room,
68
                                         room,
69
                                         token,)
69
                                         token,)
70
         else:
70
         else:
71
-            url = "{}/{}".format(JITSI_URL,
71
+            url = "{}/{}".format(self.domain,
72
                                  room,)
72
                                  room,)
73
-        return url
73
+        return "https://{}".format(url)
74
 
74
 
75
 if JITSI_USE_TOKEN:
75
 if JITSI_USE_TOKEN:
76
     defaultTokenConfig = JitsiTokenConfig(
76
     defaultTokenConfig = JitsiTokenConfig(
83
     defaultTokenConfig = None
83
     defaultTokenConfig = None
84
 
84
 
85
 JitsiMeetRoom = JitsiMeetRoomHandler(
85
 JitsiMeetRoom = JitsiMeetRoomHandler(
86
-    base_url=JITSI_URL,
86
+    domain=JITSI_DOMAIN,
87
     token_config= defaultTokenConfig
87
     token_config= defaultTokenConfig
88
 )
88
 )
89
 
89
 

+ 1 - 1
tracim/tracim/templates/videoconf.mak View File

40
         // It support alls jitsi-meet features.
40
         // It support alls jitsi-meet features.
41
         // About support for "private (1-to-1) text message into room", check this :
41
         // About support for "private (1-to-1) text message into room", check this :
42
         // https://github.com/jitsi/lib-jitsi-meet/pull/616
42
         // https://github.com/jitsi/lib-jitsi-meet/pull/616
43
-        var domain = "prosody";
43
+        var domain = '${domain}';
44
         var options = {
44
         var options = {
45
 	    // jitsi-meet support now(10-2017) only one way to auto-auth, token,
45
 	    // jitsi-meet support now(10-2017) only one way to auto-auth, token,
46
 	    // which is anonymous BOSH auth with specific url (with token value in params of the url).
46
 	    // which is anonymous BOSH auth with specific url (with token value in params of the url).