Skip to content

Odev 31 07 2017#252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
al-kabanera merged 7 commits into from
Jul 31, 2017
Merged

Odev 31 07 2017 #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e5d5790
oath-redirect
Jul 28, 2017
87b11c3
Merge pull request #1738 from ticketmaster-api-staging/oauth-api-redi…
al-kabanera Jul 28, 2017
7a4789d
oath-mod
Jul 28, 2017
13229d6
Merge pull request #1739 from ticketmaster-api-staging/oauth-mod
al-kabanera Jul 28, 2017
b327e42
oauth-mod-all
Jul 28, 2017
3e64257
Merge pull request #1740 from ticketmaster-api-staging/oauth-mod
al-kabanera Jul 28, 2017
6f98a24
Merge branch 'pdev-31-07-2017' into odev-31-07-2017
Jul 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions _includes/pd-side-menu.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
{% endif %}
</li>-->
<!--END automenu-->
<!--
<li><a href="/products-and-docs/apis/oauth/">OAuth API</a>
<li class="off"><a href="/products-and-docs/apis/oauth/">OAuth API</a>
{% if page.categories[0] == "documentation" and page.categories[1] == "oauth" %}
<ul class="sections menu-highlight">
<li><a href="#overview">Overview</a></li>
Expand All@@ -234,7 +233,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
<li><a href="#disqus_thread">Disqus</a></li>
</ul>
{% endif %}
</li>-->
</li>
<li><a href="/products-and-docs/apis/international-discovery/">International Discovery API</a>
{% if page.categories[0] == "documentation" and page.categories[1] == "international-discovery" %}
<ul class="sections menu-highlight">
Expand Down
2 changes: 1 addition & 1 deletion _layouts/documentation-single.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,14 +60,14 @@ <h4>{{ file.release_date | date_to_long_string }}</h4>{{ file.content | markdow
{% if page.categories[0] == "documentation" and page.categories[1] == "changelog" %}
<script src="{{'/scripts/vendors/jstree.min.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>

{% endif %}

{% if page.categories contains "replace_apikey" %}
{%if site.local_test_apikeys == 'true' %}
<script src="{{'/scripts/components/api-key-service-testKeys.js' | prepend: site.baseurl }}"></script>
{%else%}
<script src="{{'/scripts/components/api-key-service.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>
{%endif%}
<script>
var userKey = apiKeyService.checkApiKeyCookie();
Expand Down
3 changes: 2 additions & 1 deletion _layouts/documentation.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

{% include home-header.html %}

<div class="documentation">
<div class="documentation {{page.categories[1]}}">

<div class="maincontent">
<div class="row" style="position: relative;">
Expand DownExpand Up@@ -64,6 +64,7 @@ <h2 id="modal-title" class="modal-title"></h2>
<script src="{{"/scripts/components/request-response.js" | prepend: site.baseurl }}"></script>
<script src="{{"/scripts/vendors/jstree.min.js" | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>

{% include disqus.html %}

Expand Down
3 changes: 3 additions & 0 deletions _sass/components/aside-menu.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,9 @@ h3.menu-header {
list-style: none;
line-height: 1em;
margin-bottom: 1em;
&.off {
display: none;
}
}
.sections {
padding-left: 12px;
Expand Down
4 changes: 4 additions & 0 deletions _sass/pages/documentation.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
padding-top: $fixed-header-height; /*header height*/
position: relative;

&.oauth {
display: none;
}

#disqus_thread {
margin: $base-margin*2 0 $base-margin*3;
}
Expand Down
102 changes: 102 additions & 0 deletions scripts/components/user-roles.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
(function () {

var apiKeyService = {};

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 <ca.length; i++) {
var c = ca[i];
while (c.charAt(0)==' ') {
c = c.substring(1);
}
if (c.indexOf(name) === 0) {
return c.substring(name.length, c.length);
}
}
return "";
}

// Oauth check

var listApiKeys = apiKeyService.getApiKeysCookie("tk-user-roles");

// Oauth API redirect
if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
document.querySelector('.aside-menu li.off').classList.remove('off');
}

if (location.href.indexOf('oauth') !== -1) {
if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
if (document.querySelector('.documentation').classList.contains('oauth')) document.querySelector('.documentation.oauth').classList.remove('oauth');
if (document.querySelector('.aside-menu li').classList.contains('off')) document.querySelector('.aside-menu li.off').classList.remove('off');
}
else {
location.assign('/products-and-docs/apis/getting-started/');
}
}

})();
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Odev 31 07 2017 by al-kabanera · Pull Request #252 · ticketmaster-api/ticketmaster-api.github.io · GitHub
Skip to content
Odev 31 07 2017#252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

al-kabanera
merged 7 commits into

from

Jul 31, 2017
 Merged


Odev 31 07 2017
#252
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e5d5790

oath-redirect

Jul 28, 2017
87b11c3

Merge pull request #1738 from ticketmaster-api-staging/oauth-api-redi…


al-kabanera Jul 28, 2017
7a4789d

oath-mod

Jul 28, 2017
13229d6

Merge pull request #1739 from ticketmaster-api-staging/oauth-mod


al-kabanera Jul 28, 2017
b327e42

oauth-mod-all

Jul 28, 2017
3e64257

Merge pull request #1740 from ticketmaster-api-staging/oauth-mod


al-kabanera Jul 28, 2017
6f98a24

Merge branch 'pdev-31-07-2017' into odev-31-07-2017

Jul 31, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 2 additions & 3 deletions
_includes/pd-side-menu.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
 {% endif %}
 </li>-->
 <!--END automenu-->
 <!--
 <li><a href="/products-and-docs/apis/oauth/">OAuth API</a>
 <li class="off"><a href="/products-and-docs/apis/oauth/">OAuth API</a>
 {% if page.categories[0] == "documentation" and page.categories[1] == "oauth" %}
 <ul class="sections menu-highlight">
 <li><a href="#overview">Overview</a></li>
Expand All@@ -234,7 +233,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
 <li><a href="#disqus_thread">Disqus</a></li>
 </ul>
 {% endif %}
 </li>-->
 </li>
 <li><a href="/products-and-docs/apis/international-discovery/">International Discovery API</a>
 {% if page.categories[0] == "documentation" and page.categories[1] == "international-discovery" %}
 <ul class="sections menu-highlight">
Expand Down

2 changes: 1 addition & 1 deletion
_layouts/documentation-single.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,14 +60,14 @@ <h4>{{ file.release_date | date_to_long_string }}</h4>{{ file.content | markdow
{% if page.categories[0] == "documentation" and page.categories[1] == "changelog" %}
<script src="{{'/scripts/vendors/jstree.min.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>

{% endif %}

{% if page.categories contains "replace_apikey" %}
{%if site.local_test_apikeys == 'true' %}
	<script src="{{'/scripts/components/api-key-service-testKeys.js' | prepend: site.baseurl }}"></script>
{%else%}
	<script src="{{'/scripts/components/api-key-service.js' | prepend: site.baseurl }}"></script>
 <script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>
{%endif%}
<script>
 var userKey = apiKeyService.checkApiKeyCookie();
Expand Down

3 changes: 2 additions & 1 deletion
_layouts/documentation.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

{% include home-header.html %}

<div class="documentation">
<div class="documentation {{page.categories[1]}}">

 <div class="maincontent">
 <div class="row" style="position: relative;">
Expand DownExpand Up@@ -64,6 +64,7 @@ <h2 id="modal-title" class="modal-title"></h2>
<script src="{{"/scripts/components/request-response.js" | prepend: site.baseurl }}"></script>
<script src="{{"/scripts/vendors/jstree.min.js" | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>

{% include disqus.html %}

Expand Down

3 changes: 3 additions & 0 deletions
_sass/components/aside-menu.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,9 @@ h3.menu-header {
 list-style: none;
 line-height: 1em;
 margin-bottom: 1em;
 &.off {
 display: none;
 }
 }
 .sections {
 padding-left: 12px;
Expand Down

4 changes: 4 additions & 0 deletions
_sass/pages/documentation.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
 padding-top: $fixed-header-height; /*header height*/
 position: relative;

	&.oauth {
 display: none;
	}

 #disqus_thread {
 margin: $base-margin*2 0 $base-margin*3;
 }
Expand Down

102 changes: 102 additions & 0 deletions
scripts/components/user-roles.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
(function () {

var apiKeyService = {};

	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 <ca.length; i++) {
 var c = ca[i];
 while (c.charAt(0)==' ') {
 c = c.substring(1);
 }
 if (c.indexOf(name) === 0) {
 return c.substring(name.length, c.length);
 }
 }
 return "";
	}

	// Oauth check

	var listApiKeys = apiKeyService.getApiKeysCookie("tk-user-roles");

	// Oauth API redirect
	if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
 document.querySelector('.aside-menu li.off').classList.remove('off');
	}

	if (location.href.indexOf('oauth') !== -1) {
 if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
 if (document.querySelector('.documentation').classList.contains('oauth')) document.querySelector('.documentation.oauth').classList.remove('oauth');
 if (document.querySelector('.aside-menu li').classList.contains('off')) document.querySelector('.aside-menu li.off').classList.remove('off');
 }
 else {
 location.assign('/products-and-docs/apis/getting-started/');
 }
	}

})();

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Odev 31 07 2017 by al-kabanera · Pull Request #252 · ticketmaster-api/ticketmaster-api.github.io · GitHub
Skip to content
Odev 31 07 2017#252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

al-kabanera
merged 7 commits into

from

Jul 31, 2017
 Merged


Odev 31 07 2017
#252
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e5d5790

oath-redirect

Jul 28, 2017
87b11c3

Merge pull request #1738 from ticketmaster-api-staging/oauth-api-redi…


al-kabanera Jul 28, 2017
7a4789d

oath-mod

Jul 28, 2017
13229d6

Merge pull request #1739 from ticketmaster-api-staging/oauth-mod


al-kabanera Jul 28, 2017
b327e42

oauth-mod-all

Jul 28, 2017
3e64257

Merge pull request #1740 from ticketmaster-api-staging/oauth-mod


al-kabanera Jul 28, 2017
6f98a24

Merge branch 'pdev-31-07-2017' into odev-31-07-2017

Jul 31, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 2 additions & 3 deletions
_includes/pd-side-menu.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
 {% endif %}
 </li>-->
 <!--END automenu-->
 <!--
 <li><a href="/products-and-docs/apis/oauth/">OAuth API</a>
 <li class="off"><a href="/products-and-docs/apis/oauth/">OAuth API</a>
 {% if page.categories[0] == "documentation" and page.categories[1] == "oauth" %}
 <ul class="sections menu-highlight">
 <li><a href="#overview">Overview</a></li>
Expand All@@ -234,7 +233,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
 <li><a href="#disqus_thread">Disqus</a></li>
 </ul>
 {% endif %}
 </li>-->
 </li>
 <li><a href="/products-and-docs/apis/international-discovery/">International Discovery API</a>
 {% if page.categories[0] == "documentation" and page.categories[1] == "international-discovery" %}
 <ul class="sections menu-highlight">
Expand Down

2 changes: 1 addition & 1 deletion
_layouts/documentation-single.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,14 +60,14 @@ <h4>{{ file.release_date | date_to_long_string }}</h4>{{ file.content | markdow
{% if page.categories[0] == "documentation" and page.categories[1] == "changelog" %}
<script src="{{'/scripts/vendors/jstree.min.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>

{% endif %}

{% if page.categories contains "replace_apikey" %}
{%if site.local_test_apikeys == 'true' %}
	<script src="{{'/scripts/components/api-key-service-testKeys.js' | prepend: site.baseurl }}"></script>
{%else%}
	<script src="{{'/scripts/components/api-key-service.js' | prepend: site.baseurl }}"></script>
 <script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>
{%endif%}
<script>
 var userKey = apiKeyService.checkApiKeyCookie();
Expand Down

3 changes: 2 additions & 1 deletion
_layouts/documentation.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

{% include home-header.html %}

<div class="documentation">
<div class="documentation {{page.categories[1]}}">

 <div class="maincontent">
 <div class="row" style="position: relative;">
Expand DownExpand Up@@ -64,6 +64,7 @@ <h2 id="modal-title" class="modal-title"></h2>
<script src="{{"/scripts/components/request-response.js" | prepend: site.baseurl }}"></script>
<script src="{{"/scripts/vendors/jstree.min.js" | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>

{% include disqus.html %}

Expand Down

3 changes: 3 additions & 0 deletions
_sass/components/aside-menu.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,9 @@ h3.menu-header {
 list-style: none;
 line-height: 1em;
 margin-bottom: 1em;
 &.off {
 display: none;
 }
 }
 .sections {
 padding-left: 12px;
Expand Down

4 changes: 4 additions & 0 deletions
_sass/pages/documentation.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
 padding-top: $fixed-header-height; /*header height*/
 position: relative;

	&.oauth {
 display: none;
	}

 #disqus_thread {
 margin: $base-margin*2 0 $base-margin*3;
 }
Expand Down

102 changes: 102 additions & 0 deletions
scripts/components/user-roles.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
(function () {

var apiKeyService = {};

	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 <ca.length; i++) {
 var c = ca[i];
 while (c.charAt(0)==' ') {
 c = c.substring(1);
 }
 if (c.indexOf(name) === 0) {
 return c.substring(name.length, c.length);
 }
 }
 return "";
	}

	// Oauth check

	var listApiKeys = apiKeyService.getApiKeysCookie("tk-user-roles");

	// Oauth API redirect
	if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
 document.querySelector('.aside-menu li.off').classList.remove('off');
	}

	if (location.href.indexOf('oauth') !== -1) {
 if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
 if (document.querySelector('.documentation').classList.contains('oauth')) document.querySelector('.documentation.oauth').classList.remove('oauth');
 if (document.querySelector('.aside-menu li').classList.contains('off')) document.querySelector('.aside-menu li.off').classList.remove('off');
 }
 else {
 location.assign('/products-and-docs/apis/getting-started/');
 }
	}

})();

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Odev 31 07 2017 by al-kabanera · Pull Request #252 · ticketmaster-api/ticketmaster-api.github.io · GitHub
Skip to content
Odev 31 07 2017#252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

al-kabanera
merged 7 commits into

from

Jul 31, 2017
 Merged


Odev 31 07 2017
#252
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e5d5790

oath-redirect

Jul 28, 2017
87b11c3

Merge pull request #1738 from ticketmaster-api-staging/oauth-api-redi…


al-kabanera Jul 28, 2017
7a4789d

oath-mod

Jul 28, 2017
13229d6

Merge pull request #1739 from ticketmaster-api-staging/oauth-mod


al-kabanera Jul 28, 2017
b327e42

oauth-mod-all

Jul 28, 2017
3e64257

Merge pull request #1740 from ticketmaster-api-staging/oauth-mod


al-kabanera Jul 28, 2017
6f98a24

Merge branch 'pdev-31-07-2017' into odev-31-07-2017

Jul 31, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 2 additions & 3 deletions
_includes/pd-side-menu.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
 {% endif %}
 </li>-->
 <!--END automenu-->
 <!--
 <li><a href="/products-and-docs/apis/oauth/">OAuth API</a>
 <li class="off"><a href="/products-and-docs/apis/oauth/">OAuth API</a>
 {% if page.categories[0] == "documentation" and page.categories[1] == "oauth" %}
 <ul class="sections menu-highlight">
 <li><a href="#overview">Overview</a></li>
Expand All@@ -234,7 +233,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
 <li><a href="#disqus_thread">Disqus</a></li>
 </ul>
 {% endif %}
 </li>-->
 </li>
 <li><a href="/products-and-docs/apis/international-discovery/">International Discovery API</a>
 {% if page.categories[0] == "documentation" and page.categories[1] == "international-discovery" %}
 <ul class="sections menu-highlight">
Expand Down

2 changes: 1 addition & 1 deletion
_layouts/documentation-single.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,14 +60,14 @@ <h4>{{ file.release_date | date_to_long_string }}</h4>{{ file.content | markdow
{% if page.categories[0] == "documentation" and page.categories[1] == "changelog" %}
<script src="{{'/scripts/vendors/jstree.min.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>

{% endif %}

{% if page.categories contains "replace_apikey" %}
{%if site.local_test_apikeys == 'true' %}
	<script src="{{'/scripts/components/api-key-service-testKeys.js' | prepend: site.baseurl }}"></script>
{%else%}
	<script src="{{'/scripts/components/api-key-service.js' | prepend: site.baseurl }}"></script>
 <script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>
{%endif%}
<script>
 var userKey = apiKeyService.checkApiKeyCookie();
Expand Down

3 changes: 2 additions & 1 deletion
_layouts/documentation.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

{% include home-header.html %}

<div class="documentation">
<div class="documentation {{page.categories[1]}}">

 <div class="maincontent">
 <div class="row" style="position: relative;">
Expand DownExpand Up@@ -64,6 +64,7 @@ <h2 id="modal-title" class="modal-title"></h2>
<script src="{{"/scripts/components/request-response.js" | prepend: site.baseurl }}"></script>
<script src="{{"/scripts/vendors/jstree.min.js" | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>

{% include disqus.html %}

Expand Down

3 changes: 3 additions & 0 deletions
_sass/components/aside-menu.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,9 @@ h3.menu-header {
 list-style: none;
 line-height: 1em;
 margin-bottom: 1em;
 &.off {
 display: none;
 }
 }
 .sections {
 padding-left: 12px;
Expand Down

4 changes: 4 additions & 0 deletions
_sass/pages/documentation.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
 padding-top: $fixed-header-height; /*header height*/
 position: relative;

	&.oauth {
 display: none;
	}

 #disqus_thread {
 margin: $base-margin*2 0 $base-margin*3;
 }
Expand Down

102 changes: 102 additions & 0 deletions
scripts/components/user-roles.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
(function () {

var apiKeyService = {};

	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 <ca.length; i++) {
 var c = ca[i];
 while (c.charAt(0)==' ') {
 c = c.substring(1);
 }
 if (c.indexOf(name) === 0) {
 return c.substring(name.length, c.length);
 }
 }
 return "";
	}

	// Oauth check

	var listApiKeys = apiKeyService.getApiKeysCookie("tk-user-roles");

	// Oauth API redirect
	if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
 document.querySelector('.aside-menu li.off').classList.remove('off');
	}

	if (location.href.indexOf('oauth') !== -1) {
 if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
 if (document.querySelector('.documentation').classList.contains('oauth')) document.querySelector('.documentation.oauth').classList.remove('oauth');
 if (document.querySelector('.aside-menu li').classList.contains('off')) document.querySelector('.aside-menu li.off').classList.remove('off');
 }
 else {
 location.assign('/products-and-docs/apis/getting-started/');
 }
	}

})();

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Odev 31 07 2017 by al-kabanera · Pull Request #252 · ticketmaster-api/ticketmaster-api.github.io · GitHub
Skip to content
Odev 31 07 2017#252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

al-kabanera
merged 7 commits into

from

Jul 31, 2017
 Merged


Odev 31 07 2017
#252
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e5d5790

oath-redirect

Jul 28, 2017
87b11c3

Merge pull request #1738 from ticketmaster-api-staging/oauth-api-redi…


al-kabanera Jul 28, 2017
7a4789d

oath-mod

Jul 28, 2017
13229d6

Merge pull request #1739 from ticketmaster-api-staging/oauth-mod


al-kabanera Jul 28, 2017
b327e42

oauth-mod-all

Jul 28, 2017
3e64257

Merge pull request #1740 from ticketmaster-api-staging/oauth-mod


al-kabanera Jul 28, 2017
6f98a24

Merge branch 'pdev-31-07-2017' into odev-31-07-2017

Jul 31, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 2 additions & 3 deletions
_includes/pd-side-menu.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
 {% endif %}
 </li>-->
 <!--END automenu-->
 <!--
 <li><a href="/products-and-docs/apis/oauth/">OAuth API</a>
 <li class="off"><a href="/products-and-docs/apis/oauth/">OAuth API</a>
 {% if page.categories[0] == "documentation" and page.categories[1] == "oauth" %}
 <ul class="sections menu-highlight">
 <li><a href="#overview">Overview</a></li>
Expand All@@ -234,7 +233,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
 <li><a href="#disqus_thread">Disqus</a></li>
 </ul>
 {% endif %}
 </li>-->
 </li>
 <li><a href="/products-and-docs/apis/international-discovery/">International Discovery API</a>
 {% if page.categories[0] == "documentation" and page.categories[1] == "international-discovery" %}
 <ul class="sections menu-highlight">
Expand Down

2 changes: 1 addition & 1 deletion
_layouts/documentation-single.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,14 +60,14 @@ <h4>{{ file.release_date | date_to_long_string }}</h4>{{ file.content | markdow
{% if page.categories[0] == "documentation" and page.categories[1] == "changelog" %}
<script src="{{'/scripts/vendors/jstree.min.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>

{% endif %}

{% if page.categories contains "replace_apikey" %}
{%if site.local_test_apikeys == 'true' %}
	<script src="{{'/scripts/components/api-key-service-testKeys.js' | prepend: site.baseurl }}"></script>
{%else%}
	<script src="{{'/scripts/components/api-key-service.js' | prepend: site.baseurl }}"></script>
 <script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>
{%endif%}
<script>
 var userKey = apiKeyService.checkApiKeyCookie();
Expand Down

3 changes: 2 additions & 1 deletion
_layouts/documentation.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

{% include home-header.html %}

<div class="documentation">
<div class="documentation {{page.categories[1]}}">

 <div class="maincontent">
 <div class="row" style="position: relative;">
Expand DownExpand Up@@ -64,6 +64,7 @@ <h2 id="modal-title" class="modal-title"></h2>
<script src="{{"/scripts/components/request-response.js" | prepend: site.baseurl }}"></script>
<script src="{{"/scripts/vendors/jstree.min.js" | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>

{% include disqus.html %}

Expand Down

3 changes: 3 additions & 0 deletions
_sass/components/aside-menu.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,9 @@ h3.menu-header {
 list-style: none;
 line-height: 1em;
 margin-bottom: 1em;
 &.off {
 display: none;
 }
 }
 .sections {
 padding-left: 12px;
Expand Down

4 changes: 4 additions & 0 deletions
_sass/pages/documentation.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
 padding-top: $fixed-header-height; /*header height*/
 position: relative;

	&.oauth {
 display: none;
	}

 #disqus_thread {
 margin: $base-margin*2 0 $base-margin*3;
 }
Expand Down

102 changes: 102 additions & 0 deletions
scripts/components/user-roles.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
(function () {

var apiKeyService = {};

	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 <ca.length; i++) {
 var c = ca[i];
 while (c.charAt(0)==' ') {
 c = c.substring(1);
 }
 if (c.indexOf(name) === 0) {
 return c.substring(name.length, c.length);
 }
 }
 return "";
	}

	// Oauth check

	var listApiKeys = apiKeyService.getApiKeysCookie("tk-user-roles");

	// Oauth API redirect
	if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
 document.querySelector('.aside-menu li.off').classList.remove('off');
	}

	if (location.href.indexOf('oauth') !== -1) {
 if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
 if (document.querySelector('.documentation').classList.contains('oauth')) document.querySelector('.documentation.oauth').classList.remove('oauth');
 if (document.querySelector('.aside-menu li').classList.contains('off')) document.querySelector('.aside-menu li.off').classList.remove('off');
 }
 else {
 location.assign('/products-and-docs/apis/getting-started/');
 }
	}

})();

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Odev 31 07 2017 by al-kabanera · Pull Request #252 · ticketmaster-api/ticketmaster-api.github.io · GitHub
Skip to content
Odev 31 07 2017#252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

al-kabanera
merged 7 commits into

from

Jul 31, 2017
 Merged


Odev 31 07 2017
#252
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e5d5790

oath-redirect

Jul 28, 2017
87b11c3

Merge pull request #1738 from ticketmaster-api-staging/oauth-api-redi…


al-kabanera Jul 28, 2017
7a4789d

oath-mod

Jul 28, 2017
13229d6

Merge pull request #1739 from ticketmaster-api-staging/oauth-mod


al-kabanera Jul 28, 2017
b327e42

oauth-mod-all

Jul 28, 2017
3e64257

Merge pull request #1740 from ticketmaster-api-staging/oauth-mod


al-kabanera Jul 28, 2017
6f98a24

Merge branch 'pdev-31-07-2017' into odev-31-07-2017

Jul 31, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 2 additions & 3 deletions
_includes/pd-side-menu.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
 {% endif %}
 </li>-->
 <!--END automenu-->
 <!--
 <li><a href="/products-and-docs/apis/oauth/">OAuth API</a>
 <li class="off"><a href="/products-and-docs/apis/oauth/">OAuth API</a>
 {% if page.categories[0] == "documentation" and page.categories[1] == "oauth" %}
 <ul class="sections menu-highlight">
 <li><a href="#overview">Overview</a></li>
Expand All@@ -234,7 +233,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
 <li><a href="#disqus_thread">Disqus</a></li>
 </ul>
 {% endif %}
 </li>-->
 </li>
 <li><a href="/products-and-docs/apis/international-discovery/">International Discovery API</a>
 {% if page.categories[0] == "documentation" and page.categories[1] == "international-discovery" %}
 <ul class="sections menu-highlight">
Expand Down

2 changes: 1 addition & 1 deletion
_layouts/documentation-single.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,14 +60,14 @@ <h4>{{ file.release_date | date_to_long_string }}</h4>{{ file.content | markdow
{% if page.categories[0] == "documentation" and page.categories[1] == "changelog" %}
<script src="{{'/scripts/vendors/jstree.min.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>

{% endif %}

{% if page.categories contains "replace_apikey" %}
{%if site.local_test_apikeys == 'true' %}
	<script src="{{'/scripts/components/api-key-service-testKeys.js' | prepend: site.baseurl }}"></script>
{%else%}
	<script src="{{'/scripts/components/api-key-service.js' | prepend: site.baseurl }}"></script>
 <script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>
{%endif%}
<script>
 var userKey = apiKeyService.checkApiKeyCookie();
Expand Down

3 changes: 2 additions & 1 deletion
_layouts/documentation.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

{% include home-header.html %}

<div class="documentation">
<div class="documentation {{page.categories[1]}}">

 <div class="maincontent">
 <div class="row" style="position: relative;">
Expand DownExpand Up@@ -64,6 +64,7 @@ <h2 id="modal-title" class="modal-title"></h2>
<script src="{{"/scripts/components/request-response.js" | prepend: site.baseurl }}"></script>
<script src="{{"/scripts/vendors/jstree.min.js" | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>

{% include disqus.html %}

Expand Down

3 changes: 3 additions & 0 deletions
_sass/components/aside-menu.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,9 @@ h3.menu-header {
 list-style: none;
 line-height: 1em;
 margin-bottom: 1em;
 &.off {
 display: none;
 }
 }
 .sections {
 padding-left: 12px;
Expand Down

4 changes: 4 additions & 0 deletions
_sass/pages/documentation.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
 padding-top: $fixed-header-height; /*header height*/
 position: relative;

	&.oauth {
 display: none;
	}

 #disqus_thread {
 margin: $base-margin*2 0 $base-margin*3;
 }
Expand Down

102 changes: 102 additions & 0 deletions
scripts/components/user-roles.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
(function () {

var apiKeyService = {};

	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 <ca.length; i++) {
 var c = ca[i];
 while (c.charAt(0)==' ') {
 c = c.substring(1);
 }
 if (c.indexOf(name) === 0) {
 return c.substring(name.length, c.length);
 }
 }
 return "";
	}

	// Oauth check

	var listApiKeys = apiKeyService.getApiKeysCookie("tk-user-roles");

	// Oauth API redirect
	if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
 document.querySelector('.aside-menu li.off').classList.remove('off');
	}

	if (location.href.indexOf('oauth') !== -1) {
 if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
 if (document.querySelector('.documentation').classList.contains('oauth')) document.querySelector('.documentation.oauth').classList.remove('oauth');
 if (document.querySelector('.aside-menu li').classList.contains('off')) document.querySelector('.aside-menu li.off').classList.remove('off');
 }
 else {
 location.assign('/products-and-docs/apis/getting-started/');
 }
	}

})();

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Odev 31 07 2017 by al-kabanera · Pull Request #252 · ticketmaster-api/ticketmaster-api.github.io · GitHub
Skip to content
Odev 31 07 2017#252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

al-kabanera
merged 7 commits into

from

Jul 31, 2017
 Merged


Odev 31 07 2017
#252
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e5d5790

oath-redirect

Jul 28, 2017
87b11c3

Merge pull request #1738 from ticketmaster-api-staging/oauth-api-redi…


al-kabanera Jul 28, 2017
7a4789d

oath-mod

Jul 28, 2017
13229d6

Merge pull request #1739 from ticketmaster-api-staging/oauth-mod


al-kabanera Jul 28, 2017
b327e42

oauth-mod-all

Jul 28, 2017
3e64257

Merge pull request #1740 from ticketmaster-api-staging/oauth-mod


al-kabanera Jul 28, 2017
6f98a24

Merge branch 'pdev-31-07-2017' into odev-31-07-2017

Jul 31, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 2 additions & 3 deletions
_includes/pd-side-menu.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
 {% endif %}
 </li>-->
 <!--END automenu-->
 <!--
 <li><a href="/products-and-docs/apis/oauth/">OAuth API</a>
 <li class="off"><a href="/products-and-docs/apis/oauth/">OAuth API</a>
 {% if page.categories[0] == "documentation" and page.categories[1] == "oauth" %}
 <ul class="sections menu-highlight">
 <li><a href="#overview">Overview</a></li>
Expand All@@ -234,7 +233,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
 <li><a href="#disqus_thread">Disqus</a></li>
 </ul>
 {% endif %}
 </li>-->
 </li>
 <li><a href="/products-and-docs/apis/international-discovery/">International Discovery API</a>
 {% if page.categories[0] == "documentation" and page.categories[1] == "international-discovery" %}
 <ul class="sections menu-highlight">
Expand Down

2 changes: 1 addition & 1 deletion
_layouts/documentation-single.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,14 +60,14 @@ <h4>{{ file.release_date | date_to_long_string }}</h4>{{ file.content | markdow
{% if page.categories[0] == "documentation" and page.categories[1] == "changelog" %}
<script src="{{'/scripts/vendors/jstree.min.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>

{% endif %}

{% if page.categories contains "replace_apikey" %}
{%if site.local_test_apikeys == 'true' %}
	<script src="{{'/scripts/components/api-key-service-testKeys.js' | prepend: site.baseurl }}"></script>
{%else%}
	<script src="{{'/scripts/components/api-key-service.js' | prepend: site.baseurl }}"></script>
 <script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>
{%endif%}
<script>
 var userKey = apiKeyService.checkApiKeyCookie();
Expand Down

3 changes: 2 additions & 1 deletion
_layouts/documentation.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

{% include home-header.html %}

<div class="documentation">
<div class="documentation {{page.categories[1]}}">

 <div class="maincontent">
 <div class="row" style="position: relative;">
Expand DownExpand Up@@ -64,6 +64,7 @@ <h2 id="modal-title" class="modal-title"></h2>
<script src="{{"/scripts/components/request-response.js" | prepend: site.baseurl }}"></script>
<script src="{{"/scripts/vendors/jstree.min.js" | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>

{% include disqus.html %}

Expand Down

3 changes: 3 additions & 0 deletions
_sass/components/aside-menu.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,9 @@ h3.menu-header {
 list-style: none;
 line-height: 1em;
 margin-bottom: 1em;
 &.off {
 display: none;
 }
 }
 .sections {
 padding-left: 12px;
Expand Down

4 changes: 4 additions & 0 deletions
_sass/pages/documentation.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
 padding-top: $fixed-header-height; /*header height*/
 position: relative;

	&.oauth {
 display: none;
	}

 #disqus_thread {
 margin: $base-margin*2 0 $base-margin*3;
 }
Expand Down

102 changes: 102 additions & 0 deletions
scripts/components/user-roles.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
(function () {

var apiKeyService = {};

	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 <ca.length; i++) {
 var c = ca[i];
 while (c.charAt(0)==' ') {
 c = c.substring(1);
 }
 if (c.indexOf(name) === 0) {
 return c.substring(name.length, c.length);
 }
 }
 return "";
	}

	// Oauth check

	var listApiKeys = apiKeyService.getApiKeysCookie("tk-user-roles");

	// Oauth API redirect
	if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
 document.querySelector('.aside-menu li.off').classList.remove('off');
	}

	if (location.href.indexOf('oauth') !== -1) {
 if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
 if (document.querySelector('.documentation').classList.contains('oauth')) document.querySelector('.documentation.oauth').classList.remove('oauth');
 if (document.querySelector('.aside-menu li').classList.contains('off')) document.querySelector('.aside-menu li.off').classList.remove('off');
 }
 else {
 location.assign('/products-and-docs/apis/getting-started/');
 }
	}

})();

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Odev 31 07 2017 by al-kabanera · Pull Request #252 · ticketmaster-api/ticketmaster-api.github.io · GitHub
Skip to content
Odev 31 07 2017#252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

al-kabanera
merged 7 commits into

from

Jul 31, 2017
 Merged


Odev 31 07 2017
#252
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e5d5790

oath-redirect

Jul 28, 2017
87b11c3

Merge pull request #1738 from ticketmaster-api-staging/oauth-api-redi…


al-kabanera Jul 28, 2017
7a4789d

oath-mod

Jul 28, 2017
13229d6

Merge pull request #1739 from ticketmaster-api-staging/oauth-mod


al-kabanera Jul 28, 2017
b327e42

oauth-mod-all

Jul 28, 2017
3e64257

Merge pull request #1740 from ticketmaster-api-staging/oauth-mod


al-kabanera Jul 28, 2017
6f98a24

Merge branch 'pdev-31-07-2017' into odev-31-07-2017

Jul 31, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 2 additions & 3 deletions
_includes/pd-side-menu.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,8 +212,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
 {% endif %}
 </li>-->
 <!--END automenu-->
 <!--
 <li><a href="/products-and-docs/apis/oauth/">OAuth API</a>
 <li class="off"><a href="/products-and-docs/apis/oauth/">OAuth API</a>
 {% if page.categories[0] == "documentation" and page.categories[1] == "oauth" %}
 <ul class="sections menu-highlight">
 <li><a href="#overview">Overview</a></li>
Expand All@@ -234,7 +233,7 @@ <h4><a href="/products-and-docs/apis/getting-started/" {% if page.categories[0]
 <li><a href="#disqus_thread">Disqus</a></li>
 </ul>
 {% endif %}
 </li>-->
 </li>
 <li><a href="/products-and-docs/apis/international-discovery/">International Discovery API</a>
 {% if page.categories[0] == "documentation" and page.categories[1] == "international-discovery" %}
 <ul class="sections menu-highlight">
Expand Down

2 changes: 1 addition & 1 deletion
_layouts/documentation-single.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,14 +60,14 @@ <h4>{{ file.release_date | date_to_long_string }}</h4>{{ file.content | markdow
{% if page.categories[0] == "documentation" and page.categories[1] == "changelog" %}
<script src="{{'/scripts/vendors/jstree.min.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>

{% endif %}

{% if page.categories contains "replace_apikey" %}
{%if site.local_test_apikeys == 'true' %}
	<script src="{{'/scripts/components/api-key-service-testKeys.js' | prepend: site.baseurl }}"></script>
{%else%}
	<script src="{{'/scripts/components/api-key-service.js' | prepend: site.baseurl }}"></script>
 <script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>
{%endif%}
<script>
 var userKey = apiKeyService.checkApiKeyCookie();
Expand Down

3 changes: 2 additions & 1 deletion
_layouts/documentation.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

{% include home-header.html %}

<div class="documentation">
<div class="documentation {{page.categories[1]}}">

 <div class="maincontent">
 <div class="row" style="position: relative;">
Expand DownExpand Up@@ -64,6 +64,7 @@ <h2 id="modal-title" class="modal-title"></h2>
<script src="{{"/scripts/components/request-response.js" | prepend: site.baseurl }}"></script>
<script src="{{"/scripts/vendors/jstree.min.js" | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/list-collapse.js' | prepend: site.baseurl }}"></script>
<script src="{{'/scripts/components/user-roles.js' | prepend: site.baseurl }}"></script>

{% include disqus.html %}

Expand Down

3 changes: 3 additions & 0 deletions
_sass/components/aside-menu.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -305,6 +305,9 @@ h3.menu-header {
 list-style: none;
 line-height: 1em;
 margin-bottom: 1em;
 &.off {
 display: none;
 }
 }
 .sections {
 padding-left: 12px;
Expand Down

4 changes: 4 additions & 0 deletions
_sass/pages/documentation.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@
 padding-top: $fixed-header-height; /*header height*/
 position: relative;

	&.oauth {
 display: none;
	}

 #disqus_thread {
 margin: $base-margin*2 0 $base-margin*3;
 }
Expand Down

102 changes: 102 additions & 0 deletions
scripts/components/user-roles.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
(function () {

var apiKeyService = {};

	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 <ca.length; i++) {
 var c = ca[i];
 while (c.charAt(0)==' ') {
 c = c.substring(1);
 }
 if (c.indexOf(name) === 0) {
 return c.substring(name.length, c.length);
 }
 }
 return "";
	}

	// Oauth check

	var listApiKeys = apiKeyService.getApiKeysCookie("tk-user-roles");

	// Oauth API redirect
	if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
 document.querySelector('.aside-menu li.off').classList.remove('off');
	}

	if (location.href.indexOf('oauth') !== -1) {
 if (listApiKeys && listApiKeys.indexOf("Internal User") !== -1) {
 if (document.querySelector('.documentation').classList.contains('oauth')) document.querySelector('.documentation.oauth').classList.remove('oauth');
 if (document.querySelector('.aside-menu li').classList.contains('off')) document.querySelector('.aside-menu li.off').classList.remove('off');
 }
 else {
 location.assign('/products-and-docs/apis/getting-started/');
 }
	}

})();