Handle scope conjunctions properly

Author: Clément Denis

endpoints-framework/src/main/java/com/google/api/server/spi/config/model/AuthScopeRepository.java

@@ -41,17 +41,13 @@ private static ImmutableMap<String, String> loadScopeDescriptions(String fileNam
 
   public AuthScopeRepository() {
     //userinfo.email should always be requested, as it is required for authentication
-    add(Constant.API_EMAIL_SCOPE);
-  }
-
-  public void add(String scope) {
-    descriptionsByScope
-        .put(scope, MoreObjects.firstNonNull(GOOGLE_SCOPE_DESCRIPTIONS.get(scope), scope));
+    add(AuthScopeExpressions.interpret(Constant.API_EMAIL_SCOPE));
   }
 
   public void add(AuthScopeExpression scopeExpression) {
-    for (String scope : AuthScopeExpressions.encode(scopeExpression)) {
-      add(scope);
+    for (String scope : scopeExpression.getAllScopes()) {
+      String description = MoreObjects.firstNonNull(GOOGLE_SCOPE_DESCRIPTIONS.get(scope), scope);
+      descriptionsByScope.put(scope, description);
     }
   }
 

endpoints-framework/src/test/resources/com/google/api/server/spi/discovery/custom_scopes.json

@@ -98,6 +98,15 @@
             "email"
           ]
         },
+        "complexScopeExpression": {
+          "httpMethod": "POST",
+          "id": "customScopes.customScopesEndpoint.complexScopeExpression",
+          "path": "complexScopeExpression",
+          "scopes": [
+            "email profile",
+            "https://mail.google.com/"
+          ]
+        },
         "foo": {
           "httpMethod": "POST",
           "id": "customScopes.customScopesEndpoint.foo",
@@ -108,16 +117,6 @@
           "scopes": [
             "https://mail.google.com/"
           ]
-        },
-        "multipleScopes": {
-          "httpMethod": "POST",
-          "id": "customScopes.customScopesEndpoint.multipleScopes",
-          "path": "multipleScopes",
-          "scopes": [
-            "email",
-            "profile",
-            "https://mail.google.com/"
-          ]
         }
       }
     }

test-utils/src/main/java/com/google/api/server/spi/testing/CustomScopesEndpoint.java

@@ -20,6 +20,6 @@ public Foo foo() {
     public Bar bar() {
         return null;
     }
-    @ApiMethod(scopes = {"email", "profile", "https://mail.google.com/"})
-    public void multipleScopes() {}
+    @ApiMethod(scopes = {"email profile", "https://mail.google.com/"})
+    public void complexScopeExpression() {}
 }