From e5d5790c9403c5cd10a4b9b933725c703a6d7424 Mon Sep 17 00:00:00 2001 From: Oleksandr Kovalov Date: Fri, 28 Jul 2017 12:03:32 +0300 Subject: [PATCH 1/3] oath-redirect --- _includes/pd-side-menu.html | 5 +- _layouts/documentation-single.html | 1 + _layouts/documentation.html | 1 + _sass/components/aside-menu.scss | 3 + scripts/components/user-roles.js | 101 +++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+), 3 deletions(-) create mode 100644 scripts/components/user-roles.js diff --git a/_includes/pd-side-menu.html b/_includes/pd-side-menu.html index 63be938af..6b2df86e9 100644 --- a/_includes/pd-side-menu.html +++ b/_includes/pd-side-menu.html @@ -212,8 +212,7 @@

--> - +
  • International Discovery API {% if page.categories[0] == "documentation" and page.categories[1] == "international-discovery" %}
      diff --git a/_layouts/documentation-single.html b/_layouts/documentation-single.html index 82cbdebb9..807ba5627 100644 --- a/_layouts/documentation-single.html +++ b/_layouts/documentation-single.html @@ -60,6 +60,7 @@

      {{ file.release_date | date_to_long_string }}

      {{ file.content | markdow {% if page.categories[0] == "documentation" and page.categories[1] == "changelog" %} + {% endif %} diff --git a/_layouts/documentation.html b/_layouts/documentation.html index beba47019..04d15df8a 100755 --- a/_layouts/documentation.html +++ b/_layouts/documentation.html @@ -64,6 +64,7 @@ + {% include disqus.html %} diff --git a/_sass/components/aside-menu.scss b/_sass/components/aside-menu.scss index 2a6b2daef..d426bece4 100644 --- a/_sass/components/aside-menu.scss +++ b/_sass/components/aside-menu.scss @@ -305,6 +305,9 @@ h3.menu-header { list-style: none; line-height: 1em; margin-bottom: 1em; + &.off { + display: none; + } } .sections { padding-left: 12px; diff --git a/scripts/components/user-roles.js b/scripts/components/user-roles.js new file mode 100644 index 000000000..152ff92a2 --- /dev/null +++ b/scripts/components/user-roles.js @@ -0,0 +1,101 @@ +var apiKeyService = {}; + +(function () { + + var LIVE_KEYS = { + apiExplore: '7elxdku9GGG5k8j0Xm8KWdANDgecHMV0', + widgets: '5QGCEXAsJowiCI4n1uAwMlCGAcSNAEmG' + }; + + var STAGING_KEYS = { + apiExplore: '2Qa4W67WwEiu8ZNXpMbmVX2IGvTMJtIG', + widgets: 'y61xDc5xqUSIOz4ISjgCe5E9Lh0hfUH1' + }; + + var LOCAL_KEYS = { + apiExplore: 'B0JQHemR4Q569W9GcjHfhygRBRU3RvrL', + widgets: 'TQMbqzKDBbcCjAxC9SaKS1lg9D5Eousb' + }; + + var stagingPattern = /(ticketmaster-api-staging.github.io)+/ig; + var livePattern = /(developer.ticketmaster.com)+/ig; + var host = window.location.host; + var tmApiKeys = LOCAL_KEYS; + + if(livePattern.test(host)){ + tmApiKeys = LIVE_KEYS; + } else if (stagingPattern.test(host)){ + tmApiKeys = STAGING_KEYS; + } + + apiKeyService.getApiKeys = function () { + return tmApiKeys; + }; + + apiKeyService.getApiExploreKey = function () { + return tmApiKeys.apiExplore; + }; + + apiKeyService.getApiWidgetsKey = function () { + return tmApiKeys.widgets; + }; + + apiKeyService.checkApiKeyCookie = function () { + var key = getCookie("tk-api-key"); + if (!key) {return;} + + var userApiKey; + var apiKeys = JSON.parse("[" + window.atob(key) + "]"); //decode and convert string to array + if (apiKeys && apiKeys.length && apiKeys[0].length) { + userApiKey = apiKeys[0][apiKeys[0].length - 1]; + } + return userApiKey; + }; + + apiKeyService.getApiKeysCookie = function (coockieName) { + var key = getCookie(coockieName);//"tk-api-apps" + if (!key) {return;} + + var userApiKey; + var apiKeys = JSON.parse("[" + window.atob(key) + "]"); //decode and convert string to array + if (apiKeys && apiKeys.length && apiKeys[0].length) { + userApiKey = apiKeys[0]; + } + return userApiKey; + }; + + //get Cookie by name + function getCookie(cname) { + var name = cname + "="; + var ca = document.cookie.split(';'); + for(var i = 0; i Date: Fri, 28 Jul 2017 13:48:05 +0300 Subject: [PATCH 2/3] oath-mod --- scripts/components/user-roles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/components/user-roles.js b/scripts/components/user-roles.js index 152ff92a2..df7d729f2 100644 --- a/scripts/components/user-roles.js +++ b/scripts/components/user-roles.js @@ -86,7 +86,7 @@ var apiKeyService = {}; // Oauth API redirect if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) { - if (document.querySelector('.aside-menu li').classList.contains('off')) document.querySelector('.aside-menu li.off').classList.remove('off'); + document.querySelector('.aside-menu li.off').classList.remove('off'); } if (location.href.indexOf('oauth') !== -1) { From b327e42a56f89977859537ede646967c0debcff0 Mon Sep 17 00:00:00 2001 From: Oleksandr Kovalov Date: Fri, 28 Jul 2017 18:11:15 +0300 Subject: [PATCH 3/3] oauth-mod-all --- _layouts/documentation-single.html | 3 +-- _layouts/documentation.html | 2 +- _sass/pages/documentation.scss | 4 ++++ scripts/components/user-roles.js | 7 ++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/_layouts/documentation-single.html b/_layouts/documentation-single.html index 807ba5627..5870eabc5 100644 --- a/_layouts/documentation-single.html +++ b/_layouts/documentation-single.html @@ -60,8 +60,6 @@

      {{ file.release_date | date_to_long_string }}

      {{ file.content | markdow {% if page.categories[0] == "documentation" and page.categories[1] == "changelog" %} - - {% endif %} {% if page.categories contains "replace_apikey" %} @@ -69,6 +67,7 @@

      {{ file.release_date | date_to_long_string }}

      {{ file.content | markdow {%else%} + {%endif%}