From c89ecd71343faf0c59254443f48a2fb736b3490c Mon Sep 17 00:00:00 2001
From: raphael <raphael@maenle.net>
Date: Fri, 24 Apr 2020 17:54:56 +0000
Subject: [PATCH] adds backend script which can be run as a cronjob every n
 minutes to generate new json files for google calendars - database updated to
 save google credentials - database updated to save json calendar information
 - json still saved as a json file under
 userinfo/<user.id>/calendarevents.json

---
 app.db                               | Bin 45056 -> 45056 bytes
 app.py                               |   3 +++
 migrations/versions/66f62f457a22_.py |  28 +++++++++++++++++++++++++++
 migrations/versions/7bbc2215d87d_.py |  28 +++++++++++++++++++++++++++
 server/__init__.py                   |   1 -
 server/googleHandler.py              |   4 ++--
 server/models.py                     |  20 +++++++++++++++++++
 server/routes.py                     |   7 +++----
 8 files changed, 84 insertions(+), 7 deletions(-)
 create mode 100644 migrations/versions/66f62f457a22_.py
 create mode 100644 migrations/versions/7bbc2215d87d_.py

diff --git a/app.db b/app.db
index b6fb9828714fac150c0468ad7b44488677d25b67..ca2cebc86685583770bd51e66cf630ebed74614b 100644
GIT binary patch
delta 1463
zcmb_c&u<z>6kc0yQow*($x5a6fHw!%lFg50VZprw3^s&7DPSD(LukA^YbM^^S$1b3
z7`bcIQ>sd>%b(C*daIjDdq^wwlylBK<R8ebha7U~%*M2hr6g68U9B|l?f2gIy*Kmb
z`0@Pl<N0qsd~b#0xB&fTkMCqHxxB(fKl(Aa*ysHIM_f1<{v{L&{So{*c+3ANm|R>A
zJUpE={Qil3@#3YWrMWN4)A8c>C0+&^G!$T6wXwlR+PTJNDc4ww>|?yI!LDpU1sVha
z&Hm?~-&b#xtGPxeQYm&KA0uVezdC&w_+cUZl>7Z;^6Q0_cQ0J}WNG?a_=EeO1;2ZL
zF`ZV^f-0sYAP7H2{tUn9h|gUKgmrG-_ki;~2t7HSoccmvuFnOe)x;zfytjSto#}FB
zY5J8*+%bQE429o_{4M)398i5WzZT)oRvVF<W8MHdWU!_Np~-$CJEv&{FrrSC76YkE
z#u~O5=yE#2UIw!Xut)(A*g{@{F|SaAg2wy^0++#sxDcmE9UG)aO_8n@FRvgT(KVR`
z_OQd?9u^snmxUQNl(APs{D|Rgg3Xr_p5t@>3t@&P)n7(P8Q-8e?kl@<PV70YskhJ^
zy8r*)j{iaU>gL=&8uJ7nK!ffZKLSEF3gS5^YJ<&$qGQo^%dMs~XqMpi^*h-;u$dif
zWzF*L7RgsTJ3^|eu2;9~s#3`Ji;BFZHWGJHt0=|QVomARhb?KRtc}$AVLN|-HudXr
ztCp`9+kLrkSRuQ$YlW*xr+gz{7r~w8U|4J?tESR-vc*!NfQ(A~?q0$bFlg4HW+ivq
zN_B)YHNAfzuV;4RpYF5MYeCh5cCS0D!EiK<x;?Y&ScsL?BgC{fVlfOH(i5W3=Ny>G
zj>=e%J&&X@vWDnfb&)r0NlB72QX=C@l9*Yyd(HrfsGr(H;=Te&x}QWC5P)>NXNy`d
z3QW^JOYGRtqQ{-kTr58md6t=ufdvUuRC2nVUA<zrD?9SF;Ru#%okOLf-tgv8#wN5W
z>LwHJddi2x;d$AtmKftghKi$52S{VlvszypVOm&48hl+0&uC^BX4HZ}!G<<sQB<Wt
cdv*J0`sDND1$r${PbOb~du8GN!tt}%Us{*P*#H0l

delta 200
zcmZp8z|`=7X@az%0s{jBHxR=B`$QdMMFj>unGL-BKNz^UPcZQF^6%v1<GaJVgExk!
zkk^<;k^97EK>-i$$tSp1ay8nsvx|$0GBzbnzQeUdii<NK$kW#`C{n@OHBvz%Gewh2
zQ=NlN+*)+<etwC~fxL@_cr1-ll8jPKEX@oo%r_}~;YSrPU~~Yvhl%ek1Ai{xTcAx3
g`6j=uYv5`WU}QJfG;B2GovdgfI{86m$)W}W05fSbC;$Ke

diff --git a/app.py b/app.py
index eba3919..6a415da 100644
--- a/app.py
+++ b/app.py
@@ -1,5 +1,8 @@
 # Configuration
 from server import app
+from backend import routine
+
+routine.start()
 
 if __name__ == "__main__":
     context = ('certificate/xip.io.crt', 'certificate/xip.io.key')#certificate and key files
diff --git a/migrations/versions/66f62f457a22_.py b/migrations/versions/66f62f457a22_.py
new file mode 100644
index 0000000..51d1d96
--- /dev/null
+++ b/migrations/versions/66f62f457a22_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: 66f62f457a22
+Revises: 7bbc2215d87d
+Create Date: 2020-04-24 17:12:45.275636
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '66f62f457a22'
+down_revision = '7bbc2215d87d'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('user', sa.Column('google_credentials', sa.String(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('user', 'google_credentials')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/7bbc2215d87d_.py b/migrations/versions/7bbc2215d87d_.py
new file mode 100644
index 0000000..7da6d2e
--- /dev/null
+++ b/migrations/versions/7bbc2215d87d_.py
@@ -0,0 +1,28 @@
+"""empty message
+
+Revision ID: 7bbc2215d87d
+Revises: 92db2e496087
+Create Date: 2020-04-24 11:36:43.600038
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '7bbc2215d87d'
+down_revision = '92db2e496087'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('user', sa.Column('calendarJson', sa.String(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('user', 'calendarJson')
+    # ### end Alembic commands ###
diff --git a/server/__init__.py b/server/__init__.py
index 8f9a5b0..9984e05 100644
--- a/server/__init__.py
+++ b/server/__init__.py
@@ -1,4 +1,3 @@
-
 import os
 import sqlite3
 
diff --git a/server/googleHandler.py b/server/googleHandler.py
index aa3caad..ae18493 100644
--- a/server/googleHandler.py
+++ b/server/googleHandler.py
@@ -86,7 +86,7 @@ def verifyResponse():
     flask.session['credentials'] = credentials_to_dict(credentials)
 
     session = flow.authorized_session()
-    return session 
+    return session, credentials_to_dict(credentials)
 
 
 def get_google_provider_cfg():
@@ -103,7 +103,7 @@ def calendarsFromDb():
     pyCalendars = []
     for calendar in calendars:
         name = calendar.name
-        calId = calendar.calendar_id
+        # calId = calendar.calendar_id
         toggle = calendar.toggle
         color = calendar.color
 
diff --git a/server/models.py b/server/models.py
index 58cd8ce..a061988 100644
--- a/server/models.py
+++ b/server/models.py
@@ -1,3 +1,4 @@
+import json
 from flask_login import UserMixin
 from server import login_manager, db
 from werkzeug.security import generate_password_hash, check_password_hash
@@ -12,6 +13,8 @@ class User(UserMixin, db.Model):
     email = db.Column(db.String(120), index=True, unique=True)
     profile_pic = db.Column(db.String(256))
     password_hash = db.Column(db.String(128))
+    calendarJson = db.Column(db.String)
+    google_credentials = db.Column(db.String)
 
     def __repr__(self):
         return '<User {}>'.format(self.username)  
@@ -22,6 +25,23 @@ class User(UserMixin, db.Model):
     def checkPassword(self, password):
         return check_password_hash(self.password_hash, password)  
 
+    def setJson(self, jsonObject):
+        self.calendarJson = json.dumps(jsonObject)
+        db.session.commit()
+
+    def getJson(self):
+        return json.loads(self.calendarJson)
+
+    def setGoogleCredentials(self, credentials):
+        self.google_credentials = json.dumps(credentials)
+        db.session.commit()
+        
+    def getGoogleCredentials(self):
+
+        if self.google_credentials is None:
+            return None
+        return json.loads(self.google_credentials)
+        
 class Calendar(db.Model):
     usr_id = db.Column(db.String(21), index=True)
     calendar_id = db.Column(db.String(256), primary_key=True)
diff --git a/server/routes.py b/server/routes.py
index ffb9d64..defb040 100644
--- a/server/routes.py
+++ b/server/routes.py
@@ -82,8 +82,7 @@ def googlelogin():
 
 @app.route("/login/google/callback")
 def callback():
-    session = google.verifyResponse()
-    
+    session, credentials = google.verifyResponse()
     userinfo = session.get('https://www.googleapis.com/userinfo/v2/me').json()
     
     # Create a user in your db with the information provided
@@ -107,7 +106,7 @@ def callback():
     print("login:" + user.id)
 
     login_user(user)
-
+    user.setGoogleCredentials(credentials)
     return flask.redirect(flask.url_for('index'))
 
 @app.route("/logout")
@@ -128,7 +127,7 @@ def credentials_to_dict(credentials):
 @app.route("/userinfo/<path:user>/calendarevents.json")
 def downloader(user):
     print(user)
-    path = "/home/raphael/dev/website_ws/website/userinfo/" + user
+    path = "userinfo/" + user
     return flask.send_from_directory(path, "calendarevents.json")
 
 # POST