Skip to content

Commit

Permalink
fix(jans-auth-server): replace Gluu branding with jans branding (#7225)
Browse files Browse the repository at this point in the history
* fix(jans-auth-server): replace gluu inc with Janssen Project

Signed-off-by: ossdhaval <343411+ossdhaval@users.noreply.github.com>

* fix(jans-auth-server): remove Gluu license and privacy policy

Signed-off-by: ossdhaval <343411+ossdhaval@users.noreply.github.com>

* fix(jans-auth-server): replace Gluu Inc with Janssen Project

Signed-off-by: ossdhaval <343411+ossdhaval@users.noreply.github.com>

* fix(jans-auth-server): replace Gluu Inc with Janssen Project

Signed-off-by: ossdhaval <343411+ossdhaval@users.noreply.github.com>

* fix(jans-auth-server): remove commented references

Signed-off-by: ossdhaval <343411+ossdhaval@users.noreply.github.com>

* fix(jans-auth-server): replace logo

Signed-off-by: ossdhaval <343411+ossdhaval@users.noreply.github.com>

---------

Signed-off-by: ossdhaval <343411+ossdhaval@users.noreply.github.com>
  • Loading branch information
ossdhaval committed Jan 2, 2024
1 parent c47dce0 commit e11f454
Show file tree
Hide file tree
Showing 31 changed files with 43 additions and 72 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<f:viewAction action="#{authenticator.prepareAuthenticationForStep}" />
</f:metadata>
<ui:define name="head">
<meta name="description" content="Gluu, Inc." />
<meta name="description" content="Janssen Project" />
</ui:define>
<ui:define name="pageTitle">
<h:outputText value="#{msgs['login.pageTitle']}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<f:viewParam name="login_hint" value="#{loginAction.loginHint}" />
</f:metadata>
<ui:define name="head">
<meta name="description" content="Gluu, Inc." />
<meta name="description" content="Janssen Project" />

</ui:define>
<ui:define name="pageTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</f:metadata>

<ui:define name="head">
<meta name="description" content="Gluu, Inc."/>
<meta name="description" content="Janssen Project"/>
</ui:define>

<ui:define name="pageTitle">
Expand Down Expand Up @@ -119,9 +119,9 @@
<div class="col-md-12">
<div class="padding_spc">
<p>
<h:outputText value="#{msgs['common.gluuInc']}"/>
<h:outputText value="#{msgs['common.janssenProject']}"/>
|
<a target="_blank" href="https://github.com/GluuFederation/oxAuth/blob/master/LICENSE">
<a target="_blank" href="https://jans.io">
<h:outputText value="#{msgs['common.caution']}" escape="false"/>
</a>
<h:panelGroup rendered='#{!empty client.policyUri}'>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</f:metadata>

<ui:define name="head">
<meta name="description" content="Gluu, Inc." />
<meta name="description" content="Janssen Project" />
</ui:define>

<ui:define name="pageTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
}

private boolean readDefaultLogo(HttpServletResponse response) {
String defaultLogoFileName = "/WEB-INF/static/logo.png";
String defaultLogoFileName = "/WEB-INF/static/janssen-logo.png";
try (InputStream in = getServletContext().getResourceAsStream(defaultLogoFileName);
OutputStream out = response.getOutputStream()) {
IOUtils.copy(in, out);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ common.agreePolicy=By proceeding, you agree with the
common.privacyPolicy=Privacy Policy
common.pleaseReadTheTos=Please read the
common.termsOfService=Terms of Service
common.gluuInc=Gluu, Inc
common.janssenProject=Janssen Project
common.caution=Use subject to MIT LICENSE

login.pageTitle=Jans Auth - Login
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ common.agreePolicy=By proceeding, you agree with the
common.privacyPolicy=Privacy Policy
common.pleaseReadTheTos=Please read the
common.termsOfService=Terms of Service
common.gluuInc=Gluu, Inc
common.janssenProject=Janssen Project
common.caution=Use subject to MIT LICENSE

login.pageTitle=Jans Auth - Login
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ common.agreePolicy=By proceeding, you agree with the
common.privacyPolicy=Privacy Policy
common.pleaseReadTheTos=Please read the
common.termsOfService=Terms of Service
common.gluuInc=Gluu, Inc
common.janssenProject=Janssen Project
common.caution=Use subject to MIT LICENSE


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ common.agreePolicy=Продолжая, вы соглашаетесь с #{client
common.privacyPolicy=Политика конфиденциальности
common.pleaseReadTheTos=Пожалуйста, прочитайте
common.termsOfService=Условия использования
common.gluuInc=Gluu, Inc
common.janssenProject=Janssen Project
common.caution=Использовать в соответствии с лицензией MIT LICENSE

login.pageTitle=Jans Auth - Вход
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ body {
<div class="col-sm-6 centered" style="text-align:center;">
<p class="centered">
&copy; <a target="_blank"
href="https://github.com/GluuFederation/oxAuth/blob/master/LICENSE"><h:outputText
value="#{msgs['common.gluuInc']}" escape="false" /></a> | <a
href="https://jans.io"><h:outputText
value="#{msgs['common.janssenProject']}" escape="false" /></a> | <a
target="_blank" href="#{client.policyUri}"><h:outputText
value="#{msgs['common.privacyPolicy']}" escape="false" /></a> | <a
target="_blank" href="#{client.tosUri}"><h:outputText
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,8 @@ body {
<div class="col-sm-6 centered" style="text-align: center;">
<p class="centered">
&copy; <a target="_blank"
href="https://github.com/GluuFederation/oxAuth/blob/master/LICENSE"><h:outputText
value="#{msgs['common.gluuInc']}" escape="false" /></a> | <a
target="_blank" href="#{client.policyUri}"><h:outputText
value="#{msgs['common.privacyPolicy']}" escape="false" /></a> | <a
target="_blank" href="#{client.tosUri}"><h:outputText
value="#{msgs['common.termsOfService']}" escape="false" /></a>
href="https://jans.io"><h:outputText
value="#{msgs['common.janssenProject']}" escape="false" /></a>
</p>
</div>
<div class="col-sm-3"></div>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<f:viewParam name="login_hint" value="#{authorizeAction.loginHint}" />
</f:metadata>
<ui:define name="head">
<meta name="description" content="Gluu, Inc." />
<meta name="description" content="Janssen Project" />
</ui:define>
<ui:define name="pageTitle">
<h:outputText value="#{msgs['login.pageTitle']}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</f:metadata>

<ui:define name="head">
<meta name="description" content="Gluu, Inc." />
<meta name="description" content="Janssen Project" />
</ui:define>

<ui:define name="pageTitle">
Expand Down Expand Up @@ -70,7 +70,7 @@
<div class="row">
<div class="col-md-12">
<div class="padding_spc">
<p><h:outputText value="#{msgs['common.gluuInc']}" /> | <a target="_blank" href="https://github.com/GluuFederation/oxAuth/blob/master/LICENSE"><h:outputText value="#{msgs['common.caution']}" escape="false" /></a>
<p><h:outputText value="#{msgs['common.janssenProject']}" /> | <a target="_blank" href="https://jans.io"><h:outputText value="#{msgs['common.caution']}" escape="false" /></a>
<h:panelGroup rendered='#{!empty client.policyUri}'>
| <a target="_blank" href="#{client.policyUri}"><h:outputText value="#{msgs['common.privacyPolicy']}" escape="false" /></a>
</h:panelGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<f:viewParam name="login_hint" value="#{loginAction.loginHint}" />
</f:metadata>
<ui:define name="head">
<meta name="description" content="Gluu, Inc." />
<meta name="description" content="Janssen Project" />
</ui:define>
<ui:define name="pageTitle">
<h:outputText value="#{msgs['login.pageTitle']}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,13 @@
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:h="http://xmlns.jcp.org/jsf/html"
template="/WEB-INF/incl/layout/template.xhtml">
<!-- This makes a call to this method:
https://github.com/GluuFederation/oxAuth/blob/version_3.1.4/Server/src/main/java/org/xdi/oxauth/auth/Authenticator.java#L524-L524
-->
<f:metadata>
<f:viewAction action="#{authenticator.prepareAuthenticationForStep}" if="#{not identity.loggedIn}"/>
</f:metadata>

<!-- defines a fragment called head - it's used to generate the HTML HEAD of resulting markup -->
<ui:define name="head">
<meta name="description" content="Gluu Inc." />
<meta name="description" content="Janssen Project" />
<!-- Here we use # {...} which are JSF EL expressions, they bind server values to this markup -->
<link href="#{webConfigurationService.getCssLocation()}/bootstrap.min.css" rel="stylesheet"/>
<link rel="stylesheet" href="#{webConfigurationService.getCssLocation()}/style.css"/>
Expand Down Expand Up @@ -51,14 +48,8 @@
<input class="form-control" id="ResetTokenForm:inputToken" name="ResetTokenForm:inputToken"
type="text" autocomplete="off" />


<!-- commandButton component makes the form to be submitted: it triggers this Java method to
https://github.com/GluuFederation/oxAuth/blob/version_3.1.4/Server/src/main/java/org/xdi/oxauth/auth/Authenticator.java#L117
which in turn ends up calling the authenticate method in script.
Usage of msgs[ ... ] is employed to lookup predefined UI labels you can find at
https://github.com/GluuFederation/oxAuth/blob/version_3.1.4/Server/src/main/resources/oxauth.properties
-->


<h:commandButton class="btn btn-done" value="Submit"
action="#{authenticator.authenticate}" />
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@
xmlns:h="http://xmlns.jcp.org/jsf/html"
template="/WEB-INF/incl/layout/template.xhtml">

<!-- This makes a call to this method:
https://github.com/GluuFederation/oxAuth/blob/version_3.1.4/Server/src/main/java/org/xdi/oxauth/auth/Authenticator.java#L524-L524
-->

<f:metadata>
<f:viewAction action="#{authenticator.prepareAuthenticationForStep}" if="#{not identity.loggedIn}"/>
</f:metadata>

<!-- defines a fragment called head - it's used to generate the HTML HEAD of resulting markup -->
<ui:define name="head">
<meta name="description" content="Gluu Inc." />
<meta name="description" content="Janssen Project" />
<!-- Here we use # {...} which are JSF EL expressions, they bind server values to this markup -->
<link href="#{webConfigurationService.getCssLocation()}/bootstrap.min.css" rel="stylesheet"/>
<link rel="stylesheet" href="#{webConfigurationService.getCssLocation()}/style.css"/>
Expand Down Expand Up @@ -73,13 +71,7 @@
<p id="mensagem"></p>


<!-- commandButton component makes the form to be submitted: it triggers this Java method to
https://github.com/GluuFederation/oxAuth/blob/version_3.1.4/Server/src/main/java/org/xdi/oxauth/auth/Authenticator.java#L117
which in turn ends up calling the authenticate method in script.
Usage of msgs[ ... ] is employed to lookup predefined UI labels you can find at
https://github.com/GluuFederation/oxAuth/blob/version_3.1.4/Server/src/main/resources/oxauth.properties
-->

<h:commandButton class="btn btn-done" value="Reset Password"
action="#{authenticator.authenticate}" type="submit" />
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,14 @@
xmlns:h="http://xmlns.jcp.org/jsf/html"
template="/WEB-INF/incl/layout/template.xhtml">

<!-- This makes a call to this method:
https://github.com/GluuFederation/oxAuth/blob/version_3.1.4/Server/src/main/java/org/xdi/oxauth/auth/Authenticator.java#L524-L524
-->

<f:metadata>
<f:viewAction action="#{authenticator.prepareAuthenticationForStep}" if="#{not identity.loggedIn}"/>
</f:metadata>

<!-- defines a fragment called head - it's used to generate the HTML HEAD of resulting markup -->
<ui:define name="head">
<meta name="description" content="Gluu Inc." />
<meta name="description" content="Janssen Project" />
<!-- Here we use # {...} which are JSF EL expressions, they bind server values to this markup -->
<link href="#{webConfigurationService.getCssLocation()}/bootstrap.min.css" rel="stylesheet"/>
<link rel="stylesheet" href="#{webConfigurationService.getCssLocation()}/style.css"/>
Expand Down Expand Up @@ -53,13 +51,7 @@



<!-- commandButton component makes the form to be submitted: it triggers this Java method to
https://github.com/GluuFederation/oxAuth/blob/version_3.1.4/Server/src/main/java/org/xdi/oxauth/auth/Authenticator.java#L117
which in turn ends up calling the authenticate method in script.
Usage of msgs[ ... ] is employed to lookup predefined UI labels you can find at
https://github.com/GluuFederation/oxAuth/blob/version_3.1.4/Server/src/main/resources/oxauth.properties
-->

<h:commandButton class="btn btn-done" value="Submit"
action="#{authenticator.authenticate}" />
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<f:viewAction action="#{authenticator.prepareAuthenticationForStep}" if="#{not identity.loggedIn}"/>
</f:metadata>
<ui:define name="head">
<meta name="description" content="Gluu, Inc." />
<meta name="description" content="Janssen Project" />
</ui:define>
<ui:define name="pageTitle">
<h:outputText value="Github Repository Path" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<f:viewAction action="#{authenticator.prepareAuthenticationForStep}" />
</f:metadata>
<ui:define name="head">
<meta name="description" content="Gluu, Inc." />
<meta name="description" content="Janssen Project" />
</ui:define>
<ui:define name="pageTitle">
<h:outputText value="#{msgs['login.pageTitle']}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<f:viewParam name="login_hint" value="#{authorizeAction.loginHint}" />
</f:metadata>
<ui:define name="head">
<meta name="description" content="Gluu, Inc." />
<meta name="description" content="Janssen Project" />
</ui:define>
<ui:define name="pageTitle">
<h:outputText value="#{msgs['login.pageTitle']}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ui:define name="head">
<script
src="#{webConfigurationService.getJsLocation()}/gluu-auth.js" />
<meta name="description" content="Gluu Inc." />
<meta name="description" content="Janssen Project" />
<script>
var helper = (function() {
var authResult = undefined;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</f:metadata>

<ui:define name="head">
<meta name="description" content="Gluu Inc." />
<meta name="description" content="Janssen Project" />

<link
href="#{webConfigurationService.getCssLocation()}/bootstrap.min.css"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ input.btn.btn-done {
<div class="padding_spc"
style="padding-bottom: 5px; padding-top: 5px;">
<p>
<h:outputText value="#{msgs['common.gluuInc']}" />
<h:outputText value="#{msgs['common.janssenProject']}" />
| <a target="_blank"
href="https://github.com/GluuFederation/oxAuth/blob/master/LICENSE"><h:outputText
href="https://jans.io"><h:outputText
value="#{msgs['common.caution']}" escape="false" /></a>
<h:panelGroup rendered='#{!empty client.policyUri}'>
| <a target="_blank" href="#{client.policyUri}"><h:outputText
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</f:metadata>

<ui:define name="head">
<meta name="description" content="Gluu Inc." />
<meta name="description" content="Janssen Project" />
<style type="text/css">
body {
padding: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</f:metadata>

<ui:define name="head">
<meta name="description" content="Gluu Inc." />
<meta name="description" content="Janssen Project" />
</ui:define>

<ui:define name="pageTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</f:metadata>

<ui:define name="head">
<meta name="description" content="Gluu, Inc." />
<meta name="description" content="Janssen Project" />
</ui:define>

<ui:define name="pageTitle">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<f:viewAction action="#{deviceAuthorizationAction.pageLoaded}" />
</f:metadata>
<ui:define name="head">
<meta name="description" content="Gluu, Inc." />
<meta name="description" content="Janssen Project" />
</ui:define>
<ui:define name="pageTitle">
<h:outputText value="#{msgs['device.authorization.pageTitle']}" />
Expand Down
4 changes: 2 additions & 2 deletions jans-auth-server/server/src/main/webapp/error.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
<div class="padding_spc"
style="padding-bottom: 5px; padding-top: 5px;">
<p>
<h:outputText value="#{msgs['common.gluuInc']}" />
<h:outputText value="#{msgs['common.janssenProject']}" />
| <a target="_blank"
href="https://github.com/GluuFederation/oxAuth/blob/master/LICENSE"><h:outputText
href="https://jans.io"><h:outputText
value="#{msgs['common.caution']}" escape="false" /></a>
<h:panelGroup rendered='#{!empty client.policyUri}'>
| <a target="_blank" href="#{client.policyUri}"><h:outputText
Expand Down
2 changes: 1 addition & 1 deletion jans-auth-server/server/src/main/webapp/login.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<f:viewAction action="#{authenticator.prepareAuthenticationForStep}" />
</f:metadata>
<ui:define name="head">
<meta name="description" content="Gluu, Inc." />
<meta name="description" content="Janssen Project" />
</ui:define>
<ui:define name="pageTitle">
<h:outputText value="#{msgs['login.pageTitle']}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<f:viewParam name="session_id" value="#{selectAccountAction.sessionId}"/>
</f:metadata>
<ui:define name="head">
<meta name="description" content="Gluu, Inc."/>
<meta name="description" content="Janssen Project"/>
</ui:define>
<ui:define name="pageTitle">
<h:outputText value="#{msgs['selectAccount.pageTitle']}"/>
Expand Down

0 comments on commit e11f454

Please sign in to comment.