ep verbesserung

fet2020/documents/__init__.py

@@ -5,6 +5,8 @@ from django.utils.text import slugify
 import urllib.parse
 t = datetime.now() + timedelta(days=1)
 
+from .etherpadlib import get_ep_sessionid2, add_ep_cookie
+
 SERVER_URL="https://etherpad2.2020.fet.at/"
 
 

fet2020/documents/etherpadlib.py

@@ -0,0 +1,55 @@
+from etherpad_lite import EtherpadLiteClient
+
+from datetime import datetime, timedelta
+from django.utils.text import slugify
+import urllib.parse
+from django.conf import settings
+
+
+
+
+with open("/srv/andis_test/etherpad_test2/etherpad-lite/APIKEY.txt", "r") as f:
+    k = f.read()
+    epc = EtherpadLiteClient(
+        base_params={'apikey': k, },
+        base_url=urllib.parse.urljoin("http://localhost:9003", "api")
+    )
+#    a = epc.createAuthorIfNotExistsFor(name="andis", authorMapper="andis")
+    g = epc.createGroupIfNotExistsFor(groupMapper="fet")
+
+
+def get_ep_sessionid2(request):
+    if request.user is None:
+        return "NoUser", None
+    # server = SERVER_URL
+
+    author = epc.createAuthorIfNotExistsFor(
+        name=str(request.user),
+        authorMapper=str(request.user)
+    )['authorID']
+    expires = datetime.utcnow() + timedelta(
+        hours=3
+    )
+    try:
+        result = epc.createSession(
+            groupID=str(g['groupID']),
+            authorID=str(author),
+            validUntil=str(int(expires.timestamp()))
+        )
+    except Exception as e:
+        raise e
+        return None, None
+
+    return result['sessionID'], expires
+
+def add_ep_cookie(request, response):
+    response.set_cookie("HILib", "TestWert", domain="https://andis.2020.fet.at")
+    ep_sessid, expires = get_ep_sessionid2(request)
+    response.set_cookie(
+        "sessionID",
+        ep_sessid,
+        expires=expires,
+        domain=".2020.fet.at",
+        path="/"
+    )
+    return response

fet2020/posts/views.py

@@ -11,7 +11,7 @@ from rest_framework import viewsets
 
 from .models import Post, PostSerializer
 # from documents import add_ep_to_response
-from documents import get_ep_sessionid, get_pad_link
+from documents import get_ep_sessionid2, get_pad_link,add_ep_cookie
 
 from collections import deque
 
@@ -48,34 +48,7 @@ def show(request, id=None):
         "ep_link": get_pad_link(p.slug + "-agenda")
     }
     response = render(request, 'posts/show.html', context)
-    response.set_cookie("HelloWorld", "TestWert", domain="https://etherpad2.2020.fet.at")
-<<<<<<< HEAD
-    ep_sessid, expires=get_ep_sessionid(request)
-    response.set_cookie("sessionID",ep_sessid,expires=expires, domain=".2020.fet.at", path="/")
-    #response.set_cookie("express_sid",ep_sessid,expires=expires, domain="https://andis.2020.fet.at",path="/etherpad")
-    #response=add_ep_to_response(request, response  )
-=======
-    ep_sessid, expires = get_ep_sessionid(request)
-    response.set_cookie(
-        "sessionID",
-        ep_sessid,
-        expires=expires,
-        domain=".2020.fet.at",
-        path="/etherpad"
-    )
-    '''
-    response.set_cookie(
-        "express_sid",
-        ep_sessid,
-        expires=expires,
-        domain="https://andis.2020.fet.at",
-        path="/etherpad"
-    )
-    '''
-    # response=add_ep_to_response(request, response  )
->>>>>>> a9b7ca5faead194ba253fadc59f6f1d83a8e5bc1
-
-    return response
+    return add_ep_cookie(request,response)
 
 ###########
 # HELPERS #