Fix tests

Author: simonkurtz-MSFT

samples/oauth-3rd-party/create.ipynb

@@ -168,33 +168,31 @@
     "from users import UserHelper\n",
     "from authfactory import AuthFactory\n",
     "\n",
-    "tests = ApimTesting(\"OAuth 3rd Party (Spotify) Sample Tests\")\n",
+    "tests = ApimTesting(\"OAuth 3rd Party (Spotify) Sample Tests\", sample_folder, deployment)\n",
     "\n",
     "# 1) Marketing Member Role\n",
     "# Create a JSON Web Token with a payload and sign it with the symmetric key from above.\n",
     "encoded_jwt_token_marketing_member = AuthFactory.create_symmetric_jwt_token_for_user(UserHelper.get_user_by_role(Role.MARKETING_MEMBER), nb_helper.jwt_key_value)\n",
     "print(f'\\nJWT token for Marketing Member:\\n{encoded_jwt_token_marketing_member}')  # this value is used to call the APIs via APIM\n",
     "\n",
-    "# 2) Issue a direct request to API Management\n",
-    "artist_id = '6XpaIBNiVzIetEPCWDvAFP'    # Whitney Houston's Spotify Artist ID\n",
-    "reqsApim = ApimRequests(apim_gateway_url)\n",
-    "reqsApim.headers['Authorization'] = f'Bearer {encoded_jwt_token_marketing_member}'\n",
-    "\n",
-    "output = reqsApim.singleGet(f'/oauth-3rd-party-spotify/artists/{artist_id}', msg = 'Calling the Spotify Artist API via API Management Gateway URL. Response codes 200 and 403 are both valid depending on the infrastructure used.')\n",
-    "artist = json.loads(output)\n",
-    "tests.verify(artist['name'], 'Whitney Houston')\n",
-    "utils.print_info(f'{artist[\"name\"]} has a popularity rating of {artist[\"popularity\"]} with {artist[\"followers\"][\"total\"]:,} followers on Spotify.')\n",
-    "\n",
-    "# 2) Issue requests against Front Door.\n",
-    "# Check if the infrastructure architecture deployment uses Azure Front Door.\n",
+    "# Issue requests against Front Door.\n",
     "utils.print_message('Checking if the infrastructure architecture deployment uses Azure Front Door.', blank_above = True)\n",
     "afd_endpoint_url = utils.get_frontdoor_url(deployment, rg_name)\n",
     "\n",
     "if afd_endpoint_url:\n",
-    "    artist_id = '2VSHKHBTiXWplO8lxcnUC9'    # Taylor Swift's Spotify Artist ID\n",
+    "    artist_id = '06HL4z0CvFAxyc27GXpf02'    # Taylor Swift's Spotify Artist ID\n",
     "    reqsAfd = ApimRequests(afd_endpoint_url)\n",
     "    reqsAfd.headers['Authorization'] = f'Bearer {encoded_jwt_token_marketing_member}'\n",
-    "    output = reqsAfd.singleGet(f'/oauth-3rd-party-spotify/artists/{artist_id}', msg = 'Calling the Spotify Artist API via API Management Gateway URL. Response codes 200 and 403 are both valid depending on the infrastructure used.')\n",
+    "    output = reqsAfd.singleGet(f'/oauth-3rd-party-spotify/artists/{artist_id}', msg = 'Calling the Spotify Artist API via API Management Gateway URL.')\n",
+    "    artist = json.loads(output)\n",
+    "    tests.verify(artist['name'], 'Taylor Swift')\n",
+    "    utils.print_info(f'{artist[\"name\"]} has a popularity rating of {artist[\"popularity\"]} with {artist[\"followers\"][\"total\"]:,} followers on Spotify.')\n",
+    "else:\n",
+    "    # Issue a direct request to API Management\n",
+    "    artist_id = '6XpaIBNiVzIetEPCWDvAFP'    # Whitney Houston's Spotify Artist ID\n",
+    "    reqsApim = ApimRequests(apim_gateway_url)\n",
+    "    reqsApim.headers['Authorization'] = f'Bearer {encoded_jwt_token_marketing_member}'\n",
+    "    output = reqsApim.singleGet(f'/oauth-3rd-party-spotify/artists/{artist_id}', msg = 'Calling the Spotify Artist API via API Management Gateway URL.')\n",
     "    artist = json.loads(output)\n",
     "    tests.verify(artist['name'], 'Whitney Houston')\n",
     "    utils.print_info(f'{artist[\"name\"]} has a popularity rating of {artist[\"popularity\"]} with {artist[\"followers\"][\"total\"]:,} followers on Spotify.')\n",