Issue/25 default auth not working (#28)

* Fixed basic auth for SimpleTenantApp to include the tenant ID in the username.

* Minor cleanup.

Author: chsou

CHANGELOG.md

@@ -3,6 +3,10 @@
 
 ## Work in progress
 
+* Fixed https://github.com/SoftwareAG/cumulocity-python-api/issues/25
+  The SimpleTenantApp did not include the tenant ID into the username which is not supported 
+  by all Cumulocity instances.
+
 * Adding class _QueryUtil, bundling query encoding related functionality.
 
 * Added tests for special character parsing.

c8y_api/app/__init__.py

@@ -134,7 +134,7 @@ def __init__(self, application_key: str = None, cache_size: int = 100, cache_ttl
         username = self._get_env('C8Y_USER')
         password = self._get_env('C8Y_PASSWORD')
         super().__init__(log=self._log, cache_size=cache_size, cache_ttl=cache_ttl,
-                         base_url=baseurl, tenant_id=tenant_id, auth=HTTPBasicAuth(username, password),
+                         base_url=baseurl, tenant_id=tenant_id, auth=HTTPBasicAuth(f'{tenant_id}/{username}', password),
                          application_key=application_key)
 
     def _build_user_instance(self, auth) -> CumulocityApi:

samples/build.sh

@@ -39,7 +39,6 @@ sed -e "s/{SAMPLE}/$NAME/g" ./samples/Dockerfile > "$BUILD_DIR/Dockerfile"
 
 docker build -t "$NAME" "$BUILD_DIR"
 docker save -o "$DIST_DIR/image.tar" "$NAME"
-ARCHIVE = 
 zip -j "$DIST_DIR/$IMG_NAME.zip" "$BUILD_DIR/cumulocity.json" "$DIST_DIR/image.tar"
 
 echo ""

samples/cumulocity.json

@@ -6,7 +6,9 @@
   },
   "isolation": "MULTI_TENANT",
   "requiredRoles": [
-    "ROLE_INVENTORY_READ"
+    "ROLE_INVENTORY_ADMIN",
+    "ROLE_USER_MANAGEMENT_READ",
+    "ROLE_MEASUREMENT_ADMIN"
   ],
   "livenessProbe": {
     "httpGet": {

samples/user_sessions.py

@@ -5,7 +5,7 @@
 # as specifically provided for in your License Agreement with Software AG.
 
 """
-This sample code demonstates how to obtain Cumulocity user sessions (sessions
+This sample code demonstrates how to obtain Cumulocity user sessions (sessions
 that are run within the context of a named user).
 
 When writing a micro service for Cumulocity you always have two options to