Fixing mod_auth_token

esl · Jul 25, 2022 · 95d8c48 · 95d8c48
1 parent dc718e4
commit 95d8c48
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/src/graphql/admin/mongoose_graphql_token_admin_mutation.erl b/src/graphql/admin/mongoose_graphql_token_admin_mutation.erl
@@ -7,7 +7,7 @@
 
  -include("../mongoose_graphql_types.hrl").
 
- -import(mongoose_graphql_helper, [make_error/2, format_result/2]).
+ -import(mongoose_graphql_helper, [make_error/2]).
 
  -type token_info() :: map().
 

diff --git a/src/graphql/user/mongoose_graphql_token_user_mutation.erl b/src/graphql/user/mongoose_graphql_token_user_mutation.erl
@@ -7,7 +7,7 @@
 
  -include("../mongoose_graphql_types.hrl").
 
- -import(mongoose_graphql_helper, [null_to_default/2, make_error/2]).
+ -import(mongoose_graphql_helper, [make_error/2]).
 
  -type token_info() :: map().
  -type args() :: mongoose_graphql:args().

diff --git a/src/mod_auth_token.erl b/src/mod_auth_token.erl
@@ -31,6 +31,9 @@
 -export([deserialize/1,
          serialize/1]).
 
+%% Command-line interface
+-export([revoke_token_command/1]).
+
 %% Test only!
 -export([datetime_to_seconds/1,
          seconds_to_datetime/1]).
@@ -130,7 +133,7 @@ validity_period_spec() ->
 commands() ->
     [#ejabberd_commands{ name = revoke_token, tags = [tokens],
                          desc = "Revoke REFRESH token",
-                         module = mod_auth_token_api, function = revoke_token_command,
+                         module = ?MODULE, function = revoke_token_command,
                          args = [{owner, binary}], result = {res, restuple} }].
 
 %%
@@ -412,6 +415,16 @@ key_name(access)    -> token_secret;
 key_name(refresh)   -> token_secret;
 key_name(provision) -> provision_pre_shared.
 
+-spec revoke_token_command(Owner) -> ResTuple when
+      Owner :: jid:jid(),
+      ResCode :: ok | not_found | error,
+      ResTuple :: {ResCode, string()}.
+revoke_token_command(Owner) ->
+    case mod_auth_token_api:revoke_token_command(Owner) of
+        {ok, _} = Result -> Result;
+        {error, Error} -> Error
+    end.
+
 -spec clean_tokens(mongoose_acc:t(), User :: jid:user(), Server :: jid:server()) ->
           mongoose_acc:t().
 clean_tokens(Acc, User, Server) ->

diff --git a/src/mod_auth_token_api.erl b/src/mod_auth_token_api.erl
@@ -23,7 +23,9 @@ revoke_token_command(User) ->
                     {ok, "Revoked."};
                 error ->
                     {error, {internal_server_error, "Internal server error."}}
-            catch _:_ ->
+            catch Class:Reason:Stacktrace ->
+                ?LOG_ERROR(#{what => auth_token_revoke_failed,
+                             class => Class, reason => Reason, stacktrace => Stacktrace}),
                 {error, {internal_server_error, "Internal server error."}}
             end;
         _ ->