Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
bc9dbbd
Added oncall.html
gmsdelmundo Jan 23, 2024
8962873
Changed single- to double-quotes for consistency in main.js
gmsdelmundo Jan 23, 2024
1410bf1
Added Integ/Prod to site header depending on URL
gmsdelmundo Jan 23, 2024
68aa5a3
Renamed oncall.html to oncall-support-workflow.html
gmsdelmundo Jan 23, 2024
8c4c680
Updated admin UI page titles
gmsdelmundo Jan 23, 2024
e0fdb3b
Refactored main.js
gmsdelmundo Jan 23, 2024
67c6188
Set generate API key/secret into its own file
gmsdelmundo Jan 23, 2024
85fff6e
Moved key/secret search to oncall folder
gmsdelmundo Jan 23, 2024
2315573
Updated participant search in generate API key/secret flow
gmsdelmundo Jan 23, 2024
561aef7
Added multiple checkboxes for site client type in oncall workflow
gmsdelmundo Jan 23, 2024
86e7b94
Combined search site and search client into shared function
gmsdelmundo Jan 23, 2024
4f03e80
Finished create site flow
gmsdelmundo Jan 23, 2024
4a4e273
Added create client in oncall workflow
gmsdelmundo Jan 23, 2024
9c5af4a
Enhanced output message for site/client key creation in support workflow
gmsdelmundo Jan 24, 2024
09148f9
Enhanced client key creation in support workflow
gmsdelmundo Jan 24, 2024
55fc7c5
Added tab system for create site/client workflow
gmsdelmundo Jan 24, 2024
ad45676
Added update site in support workflow
gmsdelmundo Jan 24, 2024
d866e8a
Updated create client layout
gmsdelmundo Jan 24, 2024
bc09f0b
Added generate-cstg-keypair flow
gmsdelmundo Jan 24, 2024
fcac114
Removed empty newlines
gmsdelmundo Jan 24, 2024
5622241
Added domain name field in CSTG keypair workflow
gmsdelmundo Jan 24, 2024
d4c0bd1
Added update site for CSTG flow
gmsdelmundo Jan 24, 2024
c11d0b8
Added CSTG create keypair inputs
gmsdelmundo Jan 24, 2024
5816599
Updated ID naming for support workflows
gmsdelmundo Jan 24, 2024
49a8577
Added message and alert after updating site
gmsdelmundo Jan 24, 2024
f7ef3e5
Added CSTG keypair creation API call
gmsdelmundo Jan 24, 2024
66a514d
Added CSTG keypair search in workflow
gmsdelmundo Jan 24, 2024
d878277
Added hidden CSS class
gmsdelmundo Jan 24, 2024
b60141b
Added geo support
gmsdelmundo Jan 25, 2024
19698f0
Updated texts
gmsdelmundo Jan 30, 2024
867c9f7
Completed the api page
thomasm-ttd May 27, 2024
98a2637
Styling and fixed some bugs
thomasm-ttd May 27, 2024
5bea8a0
Styled search page
thomasm-ttd May 28, 2024
b604b4f
Updated the buttons to show the selected one
thomasm-ttd May 30, 2024
9b11aef
Clear the table before adding new rows
thomasm-ttd May 31, 2024
33978e0
update file
thomasm-ttd May 31, 2024
831f33e
remove
thomasm-ttd May 31, 2024
6605306
add
thomasm-ttd May 31, 2024
475b037
Reapplied search changes
thomasm-ttd May 31, 2024
ec3bb54
Reverted to main version
thomasm-ttd May 31, 2024
3e6f660
Replace " with ' for consistency
thomasm-ttd May 31, 2024
7c19144
Replace ' with " for consistency
thomasm-ttd May 31, 2024
d7d396a
Reapplied: Added Integ/Prod to site header depending on URL
thomasm-ttd May 31, 2024
bf2f680
Reapplied: Updated admin UI page titles
thomasm-ttd May 31, 2024
9c5d8a3
Reapplied: Refactored main.js
thomasm-ttd May 31, 2024
432a7c2
Reapplied: Updated texts
thomasm-ttd May 31, 2024
a90e592
Merge branch 'main' into tjm-UID2-3488-oncall-improvements-admin
thomasm-ttd May 31, 2024
36bb5ad
Fixed typo
thomasm-ttd May 31, 2024
25f9831
Added some missing javascript deleted in the merge
thomasm-ttd Jun 2, 2024
08bb528
Removed unused files
thomasm-ttd Jun 2, 2024
eee5953
[CI Pipeline] Released Snapshot version: 5.5.1-alpha-52-SNAPSHOT
Jun 2, 2024
82ce3b5
Added the ability to click on a site and populate the id
thomasm-ttd Jun 3, 2024
3c83e97
[CI Pipeline] Released Snapshot version: 5.5.2-alpha-53-SNAPSHOT
Jun 3, 2024
89e0077
Bug fixes, use CDN for bootstrap
thomasm-ttd Jun 4, 2024
a1a7356
Merge branch 'tjm-UID2-3488-oncall-improvements-admin' of github.com:…
thomasm-ttd Jun 4, 2024
5227faa
[CI Pipeline] Released Snapshot version: 5.5.3-alpha-54-SNAPSHOT
Jun 4, 2024
5087219
Consistent naming of Client API Key
thomasm-ttd Jun 4, 2024
5175e3c
Merge branch 'tjm-UID2-3488-oncall-improvements-admin' of github.com:…
thomasm-ttd Jun 4, 2024
44ba912
[CI Pipeline] Released Snapshot version: 5.5.4-alpha-55-SNAPSHOT
Jun 4, 2024
1f93d0b
Added AppNames to cstg
thomasm-ttd Jun 5, 2024
db69cf0
Merge branch 'tjm-UID2-3488-oncall-improvements-admin' of github.com:…
thomasm-ttd Jun 5, 2024
748f8a4
[CI Pipeline] Released Snapshot version: 5.5.5-alpha-56-SNAPSHOT
Jun 5, 2024
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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.uid2</groupId>
<artifactId>uid2-admin</artifactId>
<version>5.5.0</version>
<version>5.5.5-alpha-56-SNAPSHOT</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion webroot/adm/client-key.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link href="/css/style.css" rel="stylesheet" />
</head>
<body>
<h1>UID2 Admin - Client Key Management</h1>
<h1>UID2 Env - Client Key Management</h1>

<a href="/">Back</a>

Expand Down
2 changes: 1 addition & 1 deletion webroot/adm/client-side-keypairs.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<script src="/js/main.js"></script>
</head>
<body>
<h1>UID2 Admin - Client Side Keypair Management</h1>
<h1>UID2 Env - Client Side Keypair Management</h1>

<a href="/">Back</a>

Expand Down
2 changes: 1 addition & 1 deletion webroot/adm/enclave-gcp-v2.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</head>

<body>
<h1>UID2 Admin - GCP Enclave ID Tool(V2)</h1>
<h1>UID2 Env - GCP Enclave ID Tool(V2)</h1>

<a href="/">Back</a>

Expand Down
2 changes: 1 addition & 1 deletion webroot/adm/enclave-gcp.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</head>

<body>
<h1>UID2 Admin - GCP Enclave ID Tool</h1>
<h1>UID2 Env - GCP Enclave ID Tool</h1>

<a href="/">Back</a>

Expand Down
2 changes: 1 addition & 1 deletion webroot/adm/enclave-id.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<script src="/js/main.js"></script>
</head>
<body>
<h1>UID2 Admin - Enclave Identifier Management</h1>
<h1>UID2 Env - Enclave Identifier Management</h1>

<a href="/">Back</a>

Expand Down
2 changes: 1 addition & 1 deletion webroot/adm/encryption-key.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<script src="/js/main.js"></script>
</head>
<body>
<h1>UID2 Admin - Encryption Key Management</h1>
<h1>UID2 Env - Encryption Key Management</h1>

<a href="/">Back</a>

Expand Down
2 changes: 1 addition & 1 deletion webroot/adm/key-acl.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<script src="/js/main.js"></script>
</head>
<body>
<h1><b>Deprecated</b>: UID2 Admin - Key ACL Management</h1>
<h1><b>Deprecated</b>: UID2 Env - Key ACL Management</h1>

<h2 style="color: red"><a href="https://atlassian.thetradedesk.com/jira/browse/UID2-2758">UID2-2758</a>: Key ACL entries must no longer be created. Read only by legacy operators now.</h2>

Expand Down
2 changes: 1 addition & 1 deletion webroot/adm/keysets.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<script src="/js/main.js"></script>
</head>
<body>
<h1>UID2 Admin - Keyset Access Management</h1>
<h1>UID2 Env - Keyset Access Management</h1>

<a href="/">Back</a>

Expand Down
650 changes: 650 additions & 0 deletions webroot/adm/oncall/generate-api-key-secret.html

Large diffs are not rendered by default.

636 changes: 636 additions & 0 deletions webroot/adm/oncall/generate-cstg-keypair.html

Large diffs are not rendered by default.

75 changes: 75 additions & 0 deletions webroot/adm/oncall/search.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<html>

<head>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="/js/main.js"></script>
<link href="/css/bootstrap.min.css" rel="stylesheet">
<script src="/js/bootstrap.bundle.min.js"></script>
</head>

<body>
<div class="container-lg">
<div class="col-lg">
<div class="row">
<h1>UID2 Env - On-call - Key and Secret Search</h1>
</div>
<div class="row pt-3 pb-2">
<div class="col-sm">
<a href="/">Back</a>
</div>
</div>
<div class="row py-3">
<div class="card card-body">
<div class="row py-1">
<div class="col">
<h5>Search</h5>
</div>
</div>
<div class="row align-items-end">
<div class="col">
<div class="form-group">
<label for="key">Key, Hashed Key or Secret:</label>
<input type="text" class="form-control" id="key">
</div>
</div>
<div class="col">
<a href="#" class="btn btn-primary" id="doSearch">Search</a>
</div>
</div>
<div class="row pt-3">
<div class="col">
<h5>Search Results:</h5>
</div>
</div>
<div class="row px-2">
<pre id="errorOutput"></pre>
<pre id="standardOutput"></pre>
</div>
</div>
</div>

</div>
</div>
<script language="JavaScript">
$(document).ready(function () {
$('#doSearch').on('click', function () {
var keyString = $('#key').val();
const url = '/api/search';

doApiCall('POST', url, '#standardOutput', '#errorOutput', keyString);
});
});

$(document).on("ajaxComplete", function () {
const text = $('#standardOutput').text();
if (text != '') {
const textToHighlight = $('#key').val();
const highlightedText = text.replaceAll(textToHighlight, '<span style="background-color: yellow;">' + textToHighlight + '</span>');
$('#standardOutput').html(highlightedText);
}
});
</script>

</body>

</html>
2 changes: 1 addition & 1 deletion webroot/adm/operator-key.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<script src="/js/main.js"></script>
</head>
<body>
<h1>UID2 Admin - Operator Key Management</h1>
<h1>UID2 Env - Operator Key Management</h1>

<a href="/">Back</a>

Expand Down
2 changes: 1 addition & 1 deletion webroot/adm/partner-config.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<script src="/js/main.js"></script>
</head>
<body>
<h1>UID2 Admin - Partner Config</h1>
<h1>UID2 Env - Partner Config</h1>

<a href="/">Back</a>

Expand Down
2 changes: 1 addition & 1 deletion webroot/adm/salt.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<script src="/js/main.js"></script>
</head>
<body>
<h1>UID2 Admin - Salt Management</h1>
<h1>UID2 Env - Salt Management</h1>

<a href="/">Back</a>

Expand Down
51 changes: 0 additions & 51 deletions webroot/adm/search.html

This file was deleted.

2 changes: 1 addition & 1 deletion webroot/adm/service-links.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<script src="/js/main.js"></script>
</head>
<body>
<h1>UID2 Admin - Service Link Management</h1>
<h1>UID2 Env - Service Link Management</h1>

<a href="/">Back</a>

Expand Down
2 changes: 1 addition & 1 deletion webroot/adm/services.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<script src="/js/main.js"></script>
</head>
<body>
<h1>UID2 Admin - Service Management</h1>
<h1>UID2 Env - Service Management</h1>

<a href="/">Back</a>

Expand Down
2 changes: 1 addition & 1 deletion webroot/adm/site.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link href="/css/style.css" rel="stylesheet" />
</head>
<body>
<h1>UID2 Admin - Site Management</h1>
<h1>UID2 Env - Site Management</h1>

<a href="/">Back</a>

Expand Down
3 changes: 3 additions & 0 deletions webroot/css/copy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion webroot/css/style.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.message {
font-weight: bold;
background-color: #FFFF00;
}
}
12 changes: 10 additions & 2 deletions webroot/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<script src="/js/main.js"></script>
</head>
<body>
<h1>UID2 Admin Site</h1>
<h1>UID2 Env Admin Site</h1>

<div class="notauthed" style="display: none">
<a href="/login">Login</a>
Expand All @@ -18,6 +18,15 @@ <h1>UID2 Admin Site</h1>
<br>
</div>

<h3 class="ro-adm" style="display: none">On-call Support Workflow</h3>
<ul>
<li class="ro-adm" style="display: none"><a href="/adm/oncall/generate-api-key-secret.html">Generate API Key/Secret</a></li>
<li class="ro-adm" style="display: none"><a href="/adm/oncall/generate-cstg-keypair.html">Generate CSTG Keypair</a></li>
<li class="ro-adm" style="display: none"><a href="/adm/oncall/search.html">Key and Secret Search</a></li>
</ul>

<hr>

<ul>
<li class="ro-cki ro-adm" style="display: none"><a href="/adm/site.html">Site Management</a></li>
<li class="ro-adm" style="display: none"><a href="/adm/client-side-keypairs.html">Client Side Keypair Management</a></li>
Expand All @@ -38,7 +47,6 @@ <h1>UID2 Admin Site</h1>
<li class="ro-opm ro-adm" style="display: none"><a href="/adm/enclave-gcp.html">GCP Enclave ID Tool</a></li>
<li class="ro-opm ro-adm" style="display: none"><a href="/adm/enclave-gcp-v2.html">GCP Enclave ID Tool(V2)</a></li>
<li class="ro-adm" style="display: none"><a href="/adm/partner-config.html">OptOut Partner Management</a></li>
<li class="ro-adm" style="display: none"><a href="/adm/search.html">Key and Secret Search</a></li>
<li class="ro-nil" style="display: none">No Admin Permissions</li>
</ul>
<br/>
Expand Down
Loading