1 files changed, 33 insertions, 11 deletions
diff --git a/src/access/token.rs b/src/access/token.rs
index e7aff42..ae1546c 100644
--- a/src/access/token.rs
+++ b/src/access/token.rs
@@ -124,16 +124,7 @@ pub(crate) fn verify(
         return Err(Refused::OtherSwarm);
     }
     let key = identity::public_of(&claims.issuer).ok_or(Refused::Malformed)?;
-    let member = store::read_path(doc, &meta::path(&[meta::MEMBERS, &claims.issuer]))
-        .ok()
-        .flatten()
-        .is_some();
-    if !member {
-        return Err(Refused::UnknownIssuer);
-    }
-    if super::bans::banned(doc, &claims.issuer) {
-        return Err(Refused::BannedIssuer);
-    }
+    issuer_counts(doc, &claims)?;
     let mut signed = LABEL.to_vec();
     signed.extend_from_slice(&payload);
     if !identity::verify(&key, &signed, &signature) {
@@ -145,6 +136,37 @@ pub(crate) fn verify(
     if claims.iat > now.saturating_add(SKEW_MS) {
         return Err(Refused::Future);
     }
+    user_counts(doc, &claims)?;
+    Ok(claims)
+}
+
+/// Whether a token of `claims`, taken once (`verify`), still is by what `doc` says now:
+/// its issuer a member and not banned, its user registered, enabled, its tokens not
+/// revoked since and its session not ended. What a stream opened with it is judged by
+/// as the document changes (`api::login::streams_end`).
+pub(crate) fn still_taken(doc: &impl ReadDoc, claims: &Claims) -> Result<(), Refused> {
+    issuer_counts(doc, claims)?;
+    user_counts(doc, claims)
+}
+
+/// Its issuer a member of the swarm, not banned.
+fn issuer_counts(doc: &impl ReadDoc, claims: &Claims) -> Result<(), Refused> {
+    let member = store::read_path(doc, &meta::path(&[meta::MEMBERS, &claims.issuer]))
+        .ok()
+        .flatten()
+        .is_some();
+    if !member {
+        return Err(Refused::UnknownIssuer);
+    }
+    if super::bans::banned(doc, &claims.issuer) {
+        return Err(Refused::BannedIssuer);
+    }
+    Ok(())
+}
+
+/// In a swarm with a registry: its user registered, enabled, its tokens not revoked
+/// since it was issued, its session not ended.
+fn user_counts(doc: &impl ReadDoc, claims: &Claims) -> Result<(), Refused> {
     if registry::exists(doc) {
         let user = registry::user(doc, &claims.user).ok_or(Refused::UnknownUser)?;
         if user.disabled {
@@ -157,7 +179,7 @@ pub(crate) fn verify(
             return Err(Refused::Ended);
         }
     }
-    Ok(claims)
+    Ok(())
 }
 
 /// A new session's ID (8 random bytes, hex).