getting closer

Author: sspickle

ide/auth.py

@@ -30,21 +30,28 @@
 
 AUTHORIZATION_SCOPE ='openid email profile'
 
-AUTH_REDIRECT_URI = os.environ.get("FN_AUTH_REDIRECT_URI", default=False)
 BASE_URI = os.environ.get("FN_BASE_URI", default=False)
 
 def get_project_name():
     web_setting = models.Setting.get('google_project_name')
     return web_setting.value
 
+def get_redirect_uri():
+    return get_base_url() + '/google/auth'
+
+def get_base_url():
+    return models.Setting.get('auth_base_url').value
 #
 # Robust way to check for running locally. Also easy to modify.
 #
 GRL = os.environ.get("GLOWSCRIPT_RUNNING_LOCALLY")
 GRL = GRL and GRL.lower()        # let's keep it case insenstive
 GRL = GRL not in (None, 'false') # Anything but None or 'false'
 
-class ModuleCache:
+class SecretCache:
+    """
+    We need to cache the client_id and the client_secret.
+    """
 
     def __init__(self):
         self.cache = {}
@@ -76,7 +83,7 @@ def fillCache(self):
             CLIENT_SECRET = ''
 
         self.cache['CLIENT_ID'] = CLIENT_ID
-        self.cache['CLINET_SECRET'] = CLIENT_SECRET
+        self.cache['CLIENT_SECRET'] = CLIENT_SECRET
 
     def getID(self):
         theID = self.cache.get('CLIENT_ID')
@@ -86,13 +93,13 @@ def getID(self):
         return theID
 
     def getSecret(self):
-        theSecret = self.cache.get('CLINET_SECRET')
+        theSecret = self.cache.get('CLIENT_SECRET')
         if theSecret is None:
             self.fillCache()
-            theSecret = self.cache.get('CLINET_SECRET')
+            theSecret = self.cache.get('CLIENT_SECRET')
         return theSecret
 
-module_cache = ModuleCache()
+secret_cache = SecretCache()
 
 AUTH_TOKEN_KEY = 'auth_token'
 AUTH_STATE_KEY = 'auth_state'
@@ -109,8 +116,8 @@ def build_credentials():
     return google.oauth2.credentials.Credentials(
                 oauth2_tokens['access_token'],
                 refresh_token=oauth2_tokens['refresh_token'],
-                client_id=module_cache.getID(),
-                client_secret=module_cache.getSecret(),
+                client_id=secret_cache.getID(),
+                client_secret=secret_cache.getSecret(),
                 token_uri=ACCESS_TOKEN_URI)
 
 def get_user_info():
@@ -123,7 +130,7 @@ def get_user_info():
     oauth2_client = googleapiclient.discovery.build(
                         'oauth2', 'v2',
                         credentials=credentials)
-    return oauth2_client.userinfo().get().execute()
+    return oauth2_client.userinfo().get().execute() # pylint: disable=maybe-no-member" 
 
 
 def no_cache(view):
@@ -142,9 +149,9 @@ def no_cache_impl(*args, **kwargs):
 @no_cache
 def google_login():
 
-    session = OAuth2Session(module_cache.getID(), module_cache.getSecret(),
+    session = OAuth2Session(secret_cache.getID(), secret_cache.getSecret(),
                             scope=AUTHORIZATION_SCOPE,
-                            redirect_uri=AUTH_REDIRECT_URI)
+                            redirect_uri=get_redirect_uri())
 
     uri, state = session.create_authorization_url(AUTHORIZATION_URL)
 
@@ -168,18 +175,18 @@ def google_auth_redirect():
         """
         return flask.redirect('/index')
 
-    session = OAuth2Session(module_cache.getID(), module_cache.getSecret(),
+    session = OAuth2Session(secret_cache.getID(), secret_cache.getSecret(),
         scope=AUTHORIZATION_SCOPE,
         state=flask.session.get(AUTH_STATE_KEY),
-        redirect_uri=AUTH_REDIRECT_URI)
+        redirect_uri=get_redirect_uri())
 
     oauth2_tokens = session.fetch_access_token(
                         ACCESS_TOKEN_URI,            
                         authorization_response=flask.request.url)
 
     flask.session[AUTH_TOKEN_KEY] = oauth2_tokens
 
-    return flask.redirect(BASE_URI, code=302)
+    return flask.redirect(get_base_url(), code=302)
 
 @app.route('/google/logout')
 @no_cache
@@ -188,5 +195,4 @@ def google_logout():
     flask.session.pop(AUTH_TOKEN_KEY, None)
     flask.session.pop(AUTH_STATE_KEY, None)
 
-    return flask.redirect(BASE_URI, code=302)
-
+    return flask.redirect(get_base_url(), code=302)

ide/dumpSettings.py

@@ -0,0 +1,4 @@
+# pipe this into "flask shell" to update all users in the datastore
+
+wc(modDBFunctions.DumpSettings, Setting=Setting)
+

ide/dumpUsers.py

@@ -0,0 +1,4 @@
+# pipe this into "flask shell" to update all users in the datastore
+
+wc(modDBFunctions.DumpUsers, User=User)
+

ide/modDBFunctions.py

@@ -25,3 +25,17 @@ def UpdateUsers(**kwargs):
                 count += 1
 
 
+def DumpSettings(**kwargs):
+    for s in kwargs['Setting'].query():
+        print (s)
+
+def DumpUsers(**kwargs):
+    for s in kwargs['User'].query():
+        print (s)
+
+
+def SetSetting(name, value, **kwargs):
+    Setting = kwargs['Setting']
+    s = Setting(id=name, value=value)
+    s.put()
+    

ide/models.py

@@ -29,13 +29,24 @@ class Setting(ndb.Model):
     """A setting value"""
     # No parent
     # Key is the setting name
+    # we're going to cache values since these will be
+    # static configuration values
+    #
+
     value = ndb.StringProperty()
+    cache = {}
 
     @staticmethod
     def get(name):
         NOT_SET_VALUE = "NOT SET"
-        ndb_setting = ndb.Key("Setting",name).get()
+        ndb_setting = Setting.cache.get(name)
+
         if not ndb_setting:
-            ndb_setting = Setting(id=name, value=NOT_SET_VALUE)
-            ndb_setting.put()
+            ndb_setting = ndb.Key("Setting",name).get()
+            if ndb_setting:
+                Setting.cache[name] = ndb_setting
+            else:
+                ndb_setting = Setting(id=name, value=NOT_SET_VALUE)
+                ndb_setting.put()
+
         return ndb_setting

ide/saveSetting.py

@@ -0,0 +1,2 @@
+
+wc(modDBFunctions.SetSetting, name='foo', value='baz',  Setting=Setting)

main.py

@@ -1,5 +1,5 @@
 
-from ide import app, models, routes
+from ide import app, models, routes, modDBFunctions
 from google.cloud import ndb
 
 @app.shell_context_processor
@@ -13,6 +13,8 @@ def wc(func, **args):
         with client.context():
             func(**args)
 
-    return {'app': app, 'User': models.User, 'Folder':models.Folder, 'Program':models.Program, 'ndb':ndb, 'wc':wc}
+    return {'app': app, 'User': models.User, 'Folder':models.Folder, 'Program':models.Program, 'Setting':models.Setting,
+            'ndb':ndb, 'wc':wc, 'models':models, 'routes':routes,
+            'project':project, 'client':client, 'modDBFunctions':modDBFunctions}