From 4d2252b90ac9383b265843fc639d508b2c5229bd Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Wed, 4 Jan 2017 20:57:26 -0500 Subject: [PATCH] (delete-account X) --> (delete-resource (account X)) --- examples/webchat/server/account.rkt | 2 +- examples/webchat/server/api.rkt | 2 +- examples/webchat/server/pages.rkt | 4 ++-- examples/webchat/server/protocol.rkt | 5 ----- examples/webchat/server/trust.rkt | 6 +++--- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/examples/webchat/server/account.rkt b/examples/webchat/server/account.rkt index fd63142..14cae89 100644 --- a/examples/webchat/server/account.rkt +++ b/examples/webchat/server/account.rkt @@ -23,4 +23,4 @@ (on-stop (log-info "Account ~s deleted." email)) (assert (account email)) (assert (grant email email email (p:follow email) #t)) - (stop-when (message (delete-account email))))) + (stop-when (message (delete-resource (account email)))))) diff --git a/examples/webchat/server/api.rkt b/examples/webchat/server/api.rkt index 76b9934..c90b395 100644 --- a/examples/webchat/server/api.rkt +++ b/examples/webchat/server/api.rkt @@ -22,7 +22,7 @@ #:scope scope #:hook (lambda () (stop-when (message (end-session sid))) - (stop-when (message (delete-account email)))))] + (stop-when (message (delete-resource (account email))))))] [else (web-respond/xexpr! id #:header (web-response-header #:code 401 diff --git a/examples/webchat/server/pages.rkt b/examples/webchat/server/pages.rkt index 795469a..58e5e1e 100644 --- a/examples/webchat/server/pages.rkt +++ b/examples/webchat/server/pages.rkt @@ -223,7 +223,7 @@ (assert (login-link email sid)) (stop-when (asserted (session _ sid))) ;; happy path (stop-when (message (end-session sid))) - (stop-when (message (delete-account email))) + (stop-when (message (delete-resource (account email)))) (stop-when-timeout (* 10 1000)))) ;; 10 seconds (define (login-link-emailed-page id maybe-insecure-validation-url) @@ -267,5 +267,5 @@ (on-stop (log-info "Session ~s for ~s stopped." sid email)) (assert (session email sid)) (stop-when (message (end-session sid))) - (stop-when (message (delete-account email))) + (stop-when (message (delete-resource (account email)))) (stop-when-timeout (* 7 86400 1000)))) ;; 1 week diff --git a/examples/webchat/server/protocol.rkt b/examples/webchat/server/protocol.rkt index 127c792..f0ea55e 100644 --- a/examples/webchat/server/protocol.rkt +++ b/examples/webchat/server/protocol.rkt @@ -31,11 +31,6 @@ ;; Represents an extant account. (struct account (email) #:prefab) ;; ASSERTION -;; (delete-account EmailString) -;; Deletes the account named by the given email. -;; As a side effect, should delete all sessions associated with the account. -(struct delete-account (email) #:prefab) ;; MESSAGE - ;;--------------------------------------------------------------------------- ;; API requests and assertions diff --git a/examples/webchat/server/trust.rkt b/examples/webchat/server/trust.rkt index ebc1549..33086cf 100644 --- a/examples/webchat/server/trust.rkt +++ b/examples/webchat/server/trust.rkt @@ -29,9 +29,9 @@ (stop-when (message (delete-resource g))) (stop-when (message (delete-resource (permitted issuer grantee permission delegable?)))) - (stop-when (message (delete-account issuer))) - (stop-when (message (delete-account grantor))) - (stop-when (message (delete-account grantee)))))) + (stop-when (message (delete-resource (account issuer)))) + (stop-when (message (delete-resource (account grantor)))) + (stop-when (message (delete-resource (account grantee))))))) (actor #:name 'request-factory (stop-when-reloaded)