From: Mickaël Rémond <mremond@process-one.net>
Date: Mon, 1 Aug 2016 13:36:47 +0000 (+0200)
Subject: Merge pull request #1223 from processone/expand_api
X-Git-Tag: 16.08~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ef58a33a9c3384429508bac60db8c322f4fc782;p=ejabberd

Merge pull request #1223 from processone/expand_api

More API fixes and improvements
---

2ef58a33a9c3384429508bac60db8c322f4fc782
diff --cc src/ejabberd_oauth.erl
index c45a69d17,531f27749..e4396260e
--- a/src/ejabberd_oauth.erl
+++ b/src/ejabberd_oauth.erl
@@@ -295,38 -315,46 +295,48 @@@ associate_refresh_token(_RefreshToken, 
  check_token(User, Server, ScopeList, Token) ->
      LUser = jid:nodeprep(User),
      LServer = jid:nameprep(Server),
 -    case catch mnesia:dirty_read(oauth_token, Token) of
 -        [#oauth_token{us = {LUser, LServer},
 -                      scope = TokenScope,
 -                      expire = Expire}] ->
 +    DBMod = get_db_backend(),
 +    case DBMod:lookup(Token) of
 +        #oauth_token{us = {LUser, LServer},
 +                     scope = TokenScope,
 +                     expire = Expire} ->
              {MegaSecs, Secs, _} = os:timestamp(),
              TS = 1000000 * MegaSecs + Secs,
-             TokenScopeSet = oauth2_priv_set:new(TokenScope),
-             lists:any(fun(Scope) ->
-                 oauth2_priv_set:is_member(Scope, TokenScopeSet) end,
-                 ScopeList) andalso Expire > TS;
+             if
+                 Expire > TS ->
+                     TokenScopeSet = oauth2_priv_set:new(TokenScope),
+                     lists:any(fun(Scope) ->
+                                       oauth2_priv_set:is_member(Scope, TokenScopeSet) end,
+                               ScopeList);
+                 true ->
+                     {false, expired}
+             end;
          _ ->
-             false
+             {false, not_found}
      end.
  
  check_token(ScopeList, Token) ->
 -    case catch mnesia:dirty_read(oauth_token, Token) of
 -        [#oauth_token{us = US,
 -                      scope = TokenScope,
 -                      expire = Expire}] ->
 +    DBMod = get_db_backend(),
 +    case DBMod:lookup(Token) of
 +        #oauth_token{us = US,
 +                     scope = TokenScope,
 +                     expire = Expire} ->
              {MegaSecs, Secs, _} = os:timestamp(),
              TS = 1000000 * MegaSecs + Secs,
-             TokenScopeSet = oauth2_priv_set:new(TokenScope),
-             case lists:any(fun(Scope) ->
-                 oauth2_priv_set:is_member(Scope, TokenScopeSet) end,
-                 ScopeList) andalso Expire > TS of
-                 true -> {ok, user, US};
-                 false -> false
+             if
+                 Expire > TS ->
+                     TokenScopeSet = oauth2_priv_set:new(TokenScope),
+                     case lists:any(fun(Scope) ->
+                                            oauth2_priv_set:is_member(Scope, TokenScopeSet) end,
+                                    ScopeList) of
+                         true -> {ok, user, US};
+                         false -> {false, no_matching_scope}
+                     end;
+                 true ->
+                     {false, expired}
              end;
          _ ->
-             false
+             {false, not_found}
      end.