From 3739a0e4f67b41f23a4c8faccc3cde1ee496559e Mon Sep 17 00:00:00 2001 From: 7riumph Date: Tue, 11 Mar 2025 19:37:55 -0600 Subject: [PATCH 1/4] lint... --- app/controllers/api/v1/users/sessions_controller.rb | 5 ++--- app/controllers/volunteers_controller.rb | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/v1/users/sessions_controller.rb b/app/controllers/api/v1/users/sessions_controller.rb index b72c05c7f8..c9bfb2f10c 100644 --- a/app/controllers/api/v1/users/sessions_controller.rb +++ b/app/controllers/api/v1/users/sessions_controller.rb @@ -9,11 +9,10 @@ def create end def destroy - # fetch access token from request header api_token = request.headers["Authorization"]&.split(" ")&.last - # find user's api credentials by access token + api_credential = ApiCredential.find_by(api_token_digest: Digest::SHA256.hexdigest(api_token)) - # set api and refresh tokens to nil; otherwise render 401 + if api_credential api_credential.revoke_api_token api_credential.revoke_refresh_token diff --git a/app/controllers/volunteers_controller.rb b/app/controllers/volunteers_controller.rb index 1cb691e115..f3ca6c9b52 100644 --- a/app/controllers/volunteers_controller.rb +++ b/app/controllers/volunteers_controller.rb @@ -32,7 +32,7 @@ def create authorize @volunteer if @volunteer.save - # invitation error handling + begin @volunteer.invite!(current_user) rescue => e From 3bb6a57084885a57eb5eb6ad90d419e658a7c300 Mon Sep 17 00:00:00 2001 From: 7riumph Date: Tue, 18 Mar 2025 18:23:15 -0600 Subject: [PATCH 2/4] test --- app/controllers/api/v1/users/sessions_controller.rb | 5 +++-- app/controllers/volunteers_controller.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/v1/users/sessions_controller.rb b/app/controllers/api/v1/users/sessions_controller.rb index c9bfb2f10c..05902a35fe 100644 --- a/app/controllers/api/v1/users/sessions_controller.rb +++ b/app/controllers/api/v1/users/sessions_controller.rb @@ -9,10 +9,11 @@ def create end def destroy + # fetch access token from request header api_token = request.headers["Authorization"]&.split(" ")&.last - + # find user's api credentials by access token api_credential = ApiCredential.find_by(api_token_digest: Digest::SHA256.hexdigest(api_token)) - + # set api and refresh tokens to nil; otherwise render 401 if api_credential api_credential.revoke_api_token api_credential.revoke_refresh_token diff --git a/app/controllers/volunteers_controller.rb b/app/controllers/volunteers_controller.rb index f3ca6c9b52..1cb691e115 100644 --- a/app/controllers/volunteers_controller.rb +++ b/app/controllers/volunteers_controller.rb @@ -32,7 +32,7 @@ def create authorize @volunteer if @volunteer.save - + # invitation error handling begin @volunteer.invite!(current_user) rescue => e From 2394b9d9c1851fcf09dc7ff53d563e24dc52bc01 Mon Sep 17 00:00:00 2001 From: 7riumph Date: Tue, 18 Mar 2025 18:54:10 -0600 Subject: [PATCH 3/4] tests --- app/controllers/api/v1/users/sessions_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/v1/users/sessions_controller.rb b/app/controllers/api/v1/users/sessions_controller.rb index 05902a35fe..604c40c6a8 100644 --- a/app/controllers/api/v1/users/sessions_controller.rb +++ b/app/controllers/api/v1/users/sessions_controller.rb @@ -13,7 +13,7 @@ def destroy api_token = request.headers["Authorization"]&.split(" ")&.last # find user's api credentials by access token api_credential = ApiCredential.find_by(api_token_digest: Digest::SHA256.hexdigest(api_token)) - # set api and refresh tokens to nil; otherwise render 401 + # set api and refresh tokens to nil; otherwise render 401 0000 if api_credential api_credential.revoke_api_token api_credential.revoke_refresh_token From ba8c987537c9c4e5c9e34ec07f77362639c85895 Mon Sep 17 00:00:00 2001 From: 7riumph Date: Tue, 18 Mar 2025 19:19:49 -0600 Subject: [PATCH 4/4] ... --- app/controllers/api/v1/users/sessions_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/v1/users/sessions_controller.rb b/app/controllers/api/v1/users/sessions_controller.rb index 604c40c6a8..689313b582 100644 --- a/app/controllers/api/v1/users/sessions_controller.rb +++ b/app/controllers/api/v1/users/sessions_controller.rb @@ -11,7 +11,7 @@ def create def destroy # fetch access token from request header api_token = request.headers["Authorization"]&.split(" ")&.last - # find user's api credentials by access token + # find user's api credentials by access token api_credential = ApiCredential.find_by(api_token_digest: Digest::SHA256.hexdigest(api_token)) # set api and refresh tokens to nil; otherwise render 401 0000 if api_credential