auth_service: Fetch revisions of all configs (for UI) at once.

appengine/auth_service/handlers_frontend.py

 # Copyright 2014 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """This module defines Auth Server frontend url handlers."""
 
 import os
 import base64
 
 import webapp2
@@ skipping 52 matching lines @@
 
 class ServicesHandler(ui.UINavbarTabHandler):
   """Page with management UI for linking services."""
   navbar_tab_url = '/auth/services'
   navbar_tab_id = 'services'
   navbar_tab_title = 'Services'
   js_file_url = '/auth_service/static/js/services.js'
   template_file = 'auth_service/services.html'
 
 
-def get_additional_ui_environment(handler):
+def get_additional_ui_data():
   """Gets injected into Jinja and Javascript environment."""
-  # See config._CONFIG_SCHEMAS for where these paths are defined.
-  if isinstance(handler, ConfigHandler):
-    path = 'imports.cfg'
-  elif isinstance(handler, ui.IPWhitelistsHandler):
-    path = 'ip_whitelist.cfg'
-  elif isinstance(handler, ui.OAuthConfigHandler):
-    path = 'oauth.cfg'
-  else:
-    return {'auth_service_config_locked': config.is_remote_configured()}
-  rev = config.get_config_revision(path)
+  if not config.is_remote_configured():
+    return {'auth_service_config_locked': False}
+  config_revisions = {}
+  for path, rev in config.get_revisions().iteritems():
+    config_revisions[path] = {
+      'rev': rev.revision if rev else 'none',
+      'url': rev.url if rev else 'about:blank',
+    }
   return {
-    'auth_service_config_locked': config.is_remote_configured(),
+    'auth_service_config_locked': True,
     'auth_service_config_remote_url': config.get_remote_url(),
-    'auth_service_config_rev': rev.revision if rev else 'none',
-    'auth_service_config_url': rev.url if rev else 'about:blank',
+    'auth_service_config_revisions': config_revisions,

[nodir, 2017/04/28 17:49:24]

`auth_service_configs`?
because there is URL and you can add more stuff later

[Vadim Sh., 2017/04/29 01:59:10]

Done.

   }
 
 
 ################################################################################
 ## API handlers.
 
 
 class LinkTicketToken(auth.TokenKind):
   """Parameters for ServiceLinkTicket.ticket token."""
   expiration_sec = 24 * 3600
@@ skipping 333 matching lines @@
       app_name='Auth Service',
       ui_tabs=[
         ui.GroupsHandler,
         ui.ChangeLogHandler,
         ServicesHandler,
         ui.OAuthConfigHandler,
         ui.IPWhitelistsHandler,
         ConfigHandler,
         ui.ApiDocHandler,
       ],
-      env_callback=get_additional_ui_environment)
+      ui_data_callback=get_additional_ui_data)
   template.bootstrap({'auth_service': TEMPLATES_DIR})
 
   # Add a fake admin for local dev server.
   if utils.is_local_dev_server():
     auth.bootstrap_group(
         auth.ADMIN_GROUP,
         [auth.Identity(auth.IDENTITY_USER, 'test@example.com')],
         'Users that can manage groups')
   return webapp2.WSGIApplication(get_routes(), debug=debug)