Slightly better factored version. Moved stuff out of the viewmodels into msal_builder.

Author: mikeckennedy

app/ch15_deploy/final/pypi_org/infrastructure/msal_builder.py

@@ -0,0 +1,18 @@
+import uuid
+
+import msal
+
+from pypi_org.configs import app_config
+
+
+def build_auth_url(authority=None, scopes=None, state=None):
+    return build_msal_app(authority=authority).get_authorization_request_url(
+        scopes or [],
+        state=state or str(uuid.uuid4()),
+        redirect_uri="http://localhost:5006/account/auth")
+
+
+def build_msal_app(cache=None, authority=None):
+    return msal.ConfidentialClientApplication(
+        app_config.CLIENT_ID, authority=authority or app_config.AUTHORITY,
+        client_credential=app_config.CLIENT_SECRET, token_cache=cache)

app/ch15_deploy/final/pypi_org/viewmodels/shared/viewmodelbase.py

@@ -18,21 +18,7 @@ def __init__(self):
         self.user_id: Optional[int] = cookie_auth.get_user_id_via_auth_cookie(self.request)
 
     def to_dict(self):
-        d = self.__dict__
-        d['build_auth_url'] = self.build_auth_url
-
-        return d
-
-    # noinspection PyMethodMayBeStatic
-    def build_auth_url(self, authority=None, scopes=None, state=None):
-        return self.build_msal_app(authority=authority).get_authorization_request_url(
-            scopes or [],
-            state=state or str(uuid.uuid4()),
-            redirect_uri="http://localhost:5006/account/auth")
-
-    # noinspection PyMethodMayBeStatic
-    def build_msal_app(self, cache=None, authority=None):
-        return msal.ConfidentialClientApplication(
-            app_config.CLIENT_ID, authority=authority or app_config.AUTHORITY,
-            client_credential=app_config.CLIENT_SECRET, token_cache=cache)
+        return self.__dict__
+
+
 

app/ch15_deploy/final/pypi_org/views/account_views.py

@@ -5,7 +5,7 @@
 
 import pypi_org.infrastructure.cookie_auth as cookie_auth
 from pypi_org.configs import app_config
-from pypi_org.infrastructure import session_cache
+from pypi_org.infrastructure import session_cache, msal_builder
 from pypi_org.infrastructure.view_modifiers import response
 from pypi_org.services import user_service
 from pypi_org.viewmodels.account.index_viewmodel import IndexViewModel
@@ -21,7 +21,6 @@
 
 @blueprint.route('/account/auth')
 def auth():
-    vm = ViewModelBase()
     args = flask.request.args
 
     if flask.request.args.get('state') != session.get("state"):
@@ -31,7 +30,7 @@ def auth():
         return f"There was an error logging in: Error: {args.get('error')}, details: {args.get('error_description')}."
     if flask.request.args.get('code'):
         cache = session_cache.load_cache()
-        result = vm.build_msal_app(cache=cache).acquire_token_by_authorization_code(
+        result = msal_builder.build_msal_app(cache=cache).acquire_token_by_authorization_code(
             flask.request.args['code'],
             scopes=app_config.SCOPE,  # Misspelled scope would cause an HTTP 400 error here
             redirect_uri='http://localhost:5006/account/auth')
@@ -59,11 +58,10 @@ def auth():
 
 @blueprint.route('/account/begin_auth')
 def begin_auth():
-    vm = ViewModelBase()
     state = str(uuid.uuid4())
     session["state"] = state
 
-    return flask.redirect(vm.build_auth_url(state=state))
+    return flask.redirect(msal_builder.build_auth_url(state=state))
 
 
 # ################### INDEX #################################