Fixing resource parsing (googleapis#343)

Author: Alejandro Casanovas

O365/utils/utils.py

@@ -12,6 +12,8 @@
 
 ME_RESOURCE = 'me'
 USERS_RESOURCE = 'users'
+GROUPS_RESOURCE = 'groups'
+SITES_RESOURCE = 'sites'
 
 NEXT_LINK_KEYWORD = '@odata.nextLink'
 
@@ -348,13 +350,26 @@ def __repr__(self):
     def _parse_resource(resource):
         """ Parses and completes resource information """
         resource = resource.strip() if resource else resource
-        if resource in {ME_RESOURCE, USERS_RESOURCE}:
+        if resource in {ME_RESOURCE, USERS_RESOURCE, GROUPS_RESOURCE, SITES_RESOURCE}:
             return resource
+        elif resource.startswith('user:'):
+            # user resource shorthand
+            resource = resource.replace('user:', '', 1)
+            return '{}/{}'.format(USERS_RESOURCE, resource)
         elif '@' in resource and not resource.startswith(USERS_RESOURCE):
+            # user resource backup
             # when for example accessing a shared mailbox the
             # resource is set to the email address. we have to prefix
             # the email with the resource 'users/' so --> 'users/email_address'
             return '{}/{}'.format(USERS_RESOURCE, resource)
+        elif resource.startswith('group:'):
+            # group resource shorthand
+            resource = resource.replace('group:', '', 1)
+            return '{}/{}'.format(GROUPS_RESOURCE, resource)
+        elif resource.startswith('site:'):
+            # sharepoint site resource shorthand
+            resource = resource.replace('site:', '', 1)
+            return '{}/{}'.format(SITES_RESOURCE, resource)
         else:
             return resource
 

README.md

@@ -537,8 +537,10 @@ Usually you will work with the default 'ME' resource, but you can also use one o
 
 - **'me'**: the user which has given consent. the default for every protocol. Overwritten when using "with your own identity" authentication method (Only available on the authorization auth_flow_type). 
 - **'user:user@domain.com'**: a shared mailbox or a user account for which you have permissions. If you don't provide 'user:' will be infered anyways.
-- **'sharepoint:sharepoint-site-id'**: a sharepoint site id.
-- **'group:group-site-id'**: a office365 group id.  
+- **'site:sharepoint-site-id'**: a sharepoint site id.
+- **'group:group-site-id'**: a office365 group id.
+
+By setting the resource prefix (such as **'user:'** or **'group:'**) you help the library understand the type of resource. You can also pass it like 'users/example@exampl.com'. Same applies to the other resource prefixes.
 
 
 ## Account Class and Modularity <a name="account"></a>