@@ -221,8 +221,8 @@ private void updateScopeForClientIfNeeded(String clientId) {
221221 log .info ("updateScopeForClientIfNeeded() - 1 - client.getClientSecret():{} " , client .getClientSecret ());
222222 // Assign scope
223223 // Prepare scope array
224- List <String > scopes = getScopeWithDn (getAllScopes ());
225- log .debug ("updateScopeForClientIfNeeded() - All scopes :{}" , scopes );
224+ List <String > scopes = getScopeWithDn (getSuperScopes ());
225+ log .debug ("updateScopeForClientIfNeeded() - SuperScopes :{}" , scopes );
226226
227227 if (client .getScopes () != null ) {
228228 List <String > existingScopes = Arrays .asList (client .getScopes ());
@@ -253,21 +253,38 @@ private void updateScopeForClientIfNeeded(String clientId) {
253253 }
254254
255255 }
256+
257+ private List <String > getSuperScopes () {
258+ List <String > scopes = new ArrayList <>();
259+
260+ // Verify in cache
261+ Map <String , Scope > scopeMap = ApiProtectionCache .getSuperScopes ();
262+ Set <String > keys = scopeMap .keySet ();
263+ log .debug ("SuperScopes scopeMap:{}, keys:{}" , scopeMap , keys );
256264
257- private List <String > getAllScopes () {
265+ for (String id : keys ) {
266+ Scope scope = scopeMap .get (id );
267+ log .trace (" SuperScopes scopeMap:{}, keys:{}" , scopeMap , keys );
268+ scopes .add (scope .getInum ());
269+ }
270+ log .debug (" SuperScopes being returned scopes:{}" , scopes );
271+ return scopes ;
272+ }
273+
274+ private List <String > getAuthScopes () {
258275 List <String > scopes = new ArrayList <>();
259276
260277 // Verify in cache
261- Map <String , Scope > scopeMap = ApiProtectionCache .getAllTypesOfScopes ();
278+ Map <String , Scope > scopeMap = ApiProtectionCache .getSuperScopes ();
262279 Set <String > keys = scopeMap .keySet ();
263- log .debug (" All Scopes scopeMap:{}, keys:{}" , scopeMap , keys );
280+ log .debug ("SuperScopes scopeMap:{}, keys:{}" , scopeMap , keys );
264281
265282 for (String id : keys ) {
266283 Scope scope = scopeMap .get (id );
267- log .trace (" All Scopes scopeMap:{}, keys:{}" , scopeMap , keys );
284+ log .trace (" SuperScopes scopeMap:{}, keys:{}" , scopeMap , keys );
268285 scopes .add (scope .getInum ());
269286 }
270- log .debug (" All Scopes being returned scopes:{}" , scopes );
287+ log .debug (" SuperScopes being returned scopes:{}" , scopes );
271288 return scopes ;
272289 }
273290
0 commit comments