Skip to content
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

DEVOPS-1665: Minor mustache template updates #423

Closed
wants to merge 1 commit into from
Closed

DEVOPS-1665: Minor mustache template updates #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def TEMPLATE_LIST_FILE_NAME = "templates.manifest"
task buildGitCommitFile {
doLast {
def commitId = grgit.head().id
// is there a variable for builddir/classe/java/main?
// is there a variable for builddir/classes/java/main?
file("$buildDir/classes/java/main/us/kbase/auth2/gitcommit").text = commitId
}
}
Expand Down
16 changes: 8 additions & 8 deletions templates/adminconfig.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,24 @@ The stack trace is always logged.
</p>

<p>Allowed post-login redirect URL prefix:
<input type="text" name="allowedloginredirect"
<input type="text" name="allowedloginredirect" size=50
{{#allowedloginredirect}}value="{{.}}"{{/allowedloginredirect}}/>
</p>

<p>Redirect URL when a user cannot be logged in immediately after return from 3rd party provider,
e.g. a choice of accounts is required or an account must be created.
<input type="text" name="completeloginredirect"
<input type="text" name="completeloginredirect" size=50
{{#completeloginredirect}}value="{{.}}"{{/completeloginredirect}}/>
</p>

<p>Redirect URL after an account link (usually to a user page showing their identities).
<input type="text" name="postlinkredirect"
<input type="text" name="postlinkredirect" size=50
{{#postlinkredirect}}value="{{.}}"{{/postlinkredirect}}/>
</p>

<p>Redirect URL when a user account cannot be linked immediately after return from 3rd party
provider, e.g. a choice of accounts is required.
<input type="text" name="completelinkredirect"
<input type="text" name="completelinkredirect" size=50
{{#completelinkredirect}}value="{{.}}"{{/completelinkredirect}}/>
</p>

Expand Down Expand Up @@ -87,24 +87,24 @@ provider, e.g. a choice of accounts is required.
<form action="{{environmenturl}}" method="post">
<input type="hidden" name="environment" value="{{environment}}"/>
<p>Allowed post-login redirect URL prefix:
<input type="text" name="allowedloginredirect"
<input type="text" name="allowedloginredirect" size=50
{{#allowedloginredirect}}value="{{.}}"{{/allowedloginredirect}}/>
</p>

<p>Redirect URL when a user cannot be logged in immediately after return from 3rd party provider,
e.g. a choice of accounts is required or an account must be created.
<input type="text" name="completeloginredirect"
<input type="text" name="completeloginredirect" size=50
{{#completeloginredirect}}value="{{.}}"{{/completeloginredirect}}/>
</p>

<p>Redirect URL after an account link (usually to a user page showing their identities).
<input type="text" name="postlinkredirect"
<input type="text" name="postlinkredirect" size=50
{{#postlinkredirect}}value="{{.}}"{{/postlinkredirect}}/>
</p>

<p>Redirect URL when a user account cannot be linked immediately after return from 3rd party
provider, e.g. a choice of accounts is required.
<input type="text" name="completelinkredirect"
<input type="text" name="completelinkredirect" size=50
{{#completelinkredirect}}value="{{.}}"{{/completelinkredirect}}/>
</p>
<input type="reset" value="Reset"/>
Expand Down
14 changes: 11 additions & 3 deletions templates/admingeneral.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
<form action="{{reseturl}}" method="post">
<input type="submit" value="Force password reset for all local users"/>
</form>
<form action="{{revokeallurl}}" method="post">
<input type="submit" value="Revoke ALL tokens for ALL users and log out"/>
</form>

<form action="{{tokenurl}}" method="post">
View token: <input type="text" name="token" /><br/>
Expand Down Expand Up @@ -34,5 +31,16 @@
<input type="checkbox" name="crole_{{id}}" /> {{id}}<br/>
{{/customroles}}
<input type="submit" value="Search"/>
</form>

<h3 style="color:red"><strong>WARNING</strong>: venturing beyond this point puts
your soul in mortal peril</h3>
<p>Revoke all tokens in the service, including agent tokens, service tokens, etc.
This will log all users out and cause any processes using any tokens whatsoever
to error out. No warning is given; if you click the button below it happens.</p>
<form action="{{revokeallurl}}" method="post">
<input style="background-color:red;color:white" type="submit"
value="REVOKE EVERY SINGLE TOKEN"/>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might benefit from an extra line or two to clarify things -- e.g. "IDGAF, REVOKE EVERY SINGLE TOKEN, MOFO!"; "REVOKE EVERY SINGLE TOKEN. MUAHAHAHAHA!"; "WHO NEEDS A SOUL ANYWAY? REVOKE EVERY SINGLE TOKEN!"

</form>
</body>
</html>
Loading