Store gh_ts in actor cookie, refs #67

datasette_auth_github/utils.py

@@ -54,8 +54,8 @@ async def load_orgs_and_teams(config, profile, access_token):
         extras["gh_teams"] = gh_teams
         store_timestamp = True
 
-    # if store_timestamp:
-    #     extras["gh_ts"] = int(time.time())
+    if store_timestamp:
+        extras["gh_ts"] = int(time.time())
 
     return extras
 

tests/test_datasette_auth_github.py

@@ -7,7 +7,6 @@
 import re
 
 
-
 @pytest.fixture
 def non_mocked_hosts():
     return ["localhost"]
@@ -144,17 +143,17 @@ async def test_github_auth_callback(ds, mocked_github_api):
             "http://localhost/-/github-auth-callback?code=github-code-here",
             allow_redirects=False,
         )
+        actor = ds.unsign(response.cookies["ds_actor"], "actor")["a"]
         assert {
-            "a": {
-                "display": "demouser",
-                "gh_id": "123",
-                "gh_name": "GitHub User",
-                "gh_login": "demouser",
-                "gh_email": "[email protected]",
-                "gh_orgs": ["demouser-org"],
-                "gh_teams": ["demouser-org/thetopteam"],
-            }
-        } == ds.unsign(response.cookies["ds_actor"], "actor")
+            "display": "demouser",
+            "gh_id": "123",
+            "gh_name": "GitHub User",
+            "gh_login": "demouser",
+            "gh_email": "[email protected]",
+            "gh_orgs": ["demouser-org"],
+            "gh_teams": ["demouser-org/thetopteam"],
+        }.items() <= actor.items()
+        assert isinstance(actor["gh_ts"], int)
         assert "/" == response.headers["location"]