Skip to content

Commit

Permalink
[#1592] switched grouping of different auth* methods based on "main /…
Browse files Browse the repository at this point in the history 
… devops" auth

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@beyonnex.io>
  • Loading branch information
@thjaeckle
thjaeckle authored and Stanchev Aleksandar committed Mar 13, 2023
1 parent 0e0241f commit a0fd0f1
Showing 1 changed file with 32 additions and 35 deletions.
67 changes: 32 additions & 35 deletions ui/modules/environments/authorization.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
</div>
<div class="modal-body">
<div class="row">
<h5>Basic Auth</h5>
<h5>Main authentication</h5>
<hr />
<div class="row">
<div class="col-md-5">
<input type="radio" id="main-userpass" name="main-auth" value="basic"></input>
<label for="main-userpass">Main User</label>
<label for="main-userpass">Basic</label>
</div>
<div class="col-md-7">
<div class="input-group input-group-sm mb-1">
Expand All @@ -37,42 +37,58 @@ <h5>Basic Auth</h5>
</div>
</div>
</div>
<div class="row">
<div class="row pt-2">
<div class="col-md-5">
<input type="radio" id="devops-userpass" name="devops-auth" value="basic"></input>
<label for="devops-userpass">DevOps User<br /><small>(for Connections, optional)</small></label>
<input type="radio" id="main-bearer" name="main-auth" value="bearer"></input>
<label for="main-bearer">Bearer<br /><small>(JWT OAuth2.0 Bearer token)</small></label>
</div>
<div class="col-md-7">
<div class="input-group input-group-sm mb-1">
<label for="devOpsUserName" class="input-group-text">DevOps Username</label>
<input type="text" class="form-control form-control-sm" id="devOpsUserName"></input>
<label for="bearer" class="input-group-text">Bearer</label>
<input type="password" class="form-control form-control-sm" id="bearer"></input>
</div>
</div>
</div>
<div class="row pt-2">
<div class="col-md-5">
<input type="radio" id="main-pre" name="main-auth" value="pre"></input>
<label for="main-pre">Pre authenticated<br />
<small>(via HTTP header 'x-ditto-pre-authenticated', must take the form
<code>prefix:suffix</code>)</small>
</label>
</div>
<div class="col-md-7">
<div class="input-group input-group-sm mb-1">
<label for="devOpsPassword" class="input-group-text">DevOps Password</label>
<input type="password" class="form-control form-control-sm" id="devOpsPassword"></input>
<label for="dittoPreAuthenticatedUsername" class="input-group-text">prefix:suffix</label>
<input type="text" class="form-control form-control-sm" id="dittoPreAuthenticatedUsername"></input>
</div>
</div>
</div>
</div>
<div class="row mt-3">
<h5>Bearer</h5>
<h5>DevOps authentication</h5>
<small>(for Connections and administrative tasks, optional)</small>
<hr />
<div class="row">
<div class="col-md-5">
<input type="radio" id="main-bearer" name="main-auth" value="bearer"></input>
<label for="main-bearer">Main User<br /><small>(JWT OAuth2.0 Bearer token)</small></label>
<input type="radio" id="devops-userpass" name="devops-auth" value="basic"></input>
<label for="devops-userpass">Basic<br /></label>
</div>
<div class="col-md-7">
<div class="input-group input-group-sm mb-1">
<label for="bearer" class="input-group-text">Bearer</label>
<input type="password" class="form-control form-control-sm" id="bearer"></input>
<label for="devOpsUserName" class="input-group-text">DevOps Username</label>
<input type="text" class="form-control form-control-sm" id="devOpsUserName"></input>
</div>
<div class="input-group input-group-sm mb-1">
<label for="devOpsPassword" class="input-group-text">DevOps Password</label>
<input type="password" class="form-control form-control-sm" id="devOpsPassword"></input>
</div>
</div>
</div>
<div class="row">
<div class="row pt-2">
<div class="col-md-5">
<input type="radio" id="devops-bearer" name="devops-auth" value="bearer"></input>
<label for="devops-bearer">DevOps User<br /><small>(JWT OAuth2.0 Bearer token, optional)</small></label>
<label for="devops-bearer">Bearer<br /><small>(JWT OAuth2.0 Bearer token)</small></label>
</div>
<div class="col-md-7">
<div class="input-group input-group-sm mb-1">
Expand All @@ -84,25 +100,6 @@ <h5>Bearer</h5>
</div>
</div>
</div>
<div class="row mt-3">
<h5>Ditto Pre Authenticated</h5>
<hr />
<div class="row">
<div class="col-md-5">
<input type="radio" id="main-pre" name="main-auth" value="pre"></input>
<label for="main-pre">Main User<br />
<small>(via HTTP header 'x-ditto-pre-authenticated', must take the form
<code>prefix:suffix</code>)</small>
</label>
</div>
<div class="col-md-7">
<div class="input-group input-group-sm mb-1">
<label for="dittoPreAuthenticatedUsername" class="input-group-text">prefix:suffix</label>
<input type="text" class="form-control form-control-sm" id="dittoPreAuthenticatedUsername"></input>
</div>
</div>
</div>
</div>
<div class="input-group input-group-sm" style="flex-direction: row-reverse;">
<button class="btn btn-outline-secondary btn-sm" data-bs-dismiss="modal"
id="authorizeSubmit">Authorize</button>
Expand Down

0 comments on commit a0fd0f1

Please sign in to comment.