fix #13660 - Replace mentions of 'oAuth', by more accurate 'OAuth'. (See https://oauth.net/) (#13664)
Signed-off-by: Fabrice Flore-Thébault <ffloreth@redhat.com>7.20.x
Fabrice Flore-Thébault
Sergii Kabashniuk
parent
44eff81281
commit
939dfbe016
|
|
@ -165,8 +165,8 @@ che.auth.access_denied_error_page=/error-oauth
|
|||
# Reserved user names
|
||||
che.auth.reserved_user_names=
|
||||
|
||||
# You can setup GitHub oAuth to automate authentication to remote repositories.
|
||||
# You need to first register this application with GitHub oAuth.
|
||||
# You can setup GitHub OAuth to automate authentication to remote repositories.
|
||||
# You need to first register this application with GitHub OAuth.
|
||||
che.oauth.github.clientid=NULL
|
||||
che.oauth.github.clientsecret=NULL
|
||||
che.oauth.github.authuri= https://github.com/login/oauth/authorize
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
/**
|
||||
* @ngdoc controller
|
||||
* @name projects.create-project.github.oauth-dialog.controller:NoGithubOauthDialogController
|
||||
* @description This class is handling the controller for the no Github oAuth dialog
|
||||
* @description This class is handling the controller for the no Github OAuth dialog
|
||||
* @author Florent Benoit
|
||||
*/
|
||||
export class NoGithubOauthDialogController {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<che-popup title="GitHub oAuth" on-close="noGithubOauthDialogController.hide()">
|
||||
<che-popup title="GitHub OAuth" on-close="noGithubOauthDialogController.hide()">
|
||||
<div class="no-github-oauth-content" flax>
|
||||
<div>GitHub oAuth is not configured. {{noGithubOauthDialogController.message}}</div>
|
||||
<div>GitHub OAuth is not configured. {{noGithubOauthDialogController.message}}</div>
|
||||
<che-button-notice che-button-title="Close"
|
||||
ng-click="noGithubOauthDialogController.hide()"></che-button-notice>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ export class CheAPI {
|
|||
}
|
||||
|
||||
/**
|
||||
* The Che oAuth Provider API
|
||||
* The Che OAuth Provider API
|
||||
* @returns {CheOAuthProvider}
|
||||
*/
|
||||
getOAuthProvider(): CheOAuthProvider {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
'use strict';
|
||||
|
||||
/**
|
||||
* This class is handling the registered oAuth providers.
|
||||
* This class is handling the registered OAuth providers.
|
||||
* @author Ann Shumilova
|
||||
*/
|
||||
export class CheOAuthProvider {
|
||||
|
|
|
|||
|
|
@ -540,7 +540,7 @@ Che server debug: ${CHE_DEBUG_SERVER}
|
|||
Image: ${CHE_IMAGE_REPO}
|
||||
Pull policy: ${IMAGE_PULL_POLICY}
|
||||
Update strategy: ${UPDATE_STRATEGY}
|
||||
Setup OpenShift oAuth: ${SETUP_OCP_OAUTH}
|
||||
Setup OpenShift OAuth: ${SETUP_OCP_OAUTH}
|
||||
Enable Jaeger based tracing: ${CHE_TRACING_ENABLED}
|
||||
Enable metrics collection: ${CHE_METRICS_ENABLED}
|
||||
Environment variables:
|
||||
|
|
@ -580,8 +580,8 @@ ${CHE_VAR_ARRAY}"
|
|||
wait_for_keycloak
|
||||
|
||||
if [ "${SETUP_OCP_OAUTH}" == "true" ]; then
|
||||
printInfo "Registering oAuth client in OpenShift"
|
||||
# register oAuth client in OpenShift
|
||||
printInfo "Registering OAuth client in OpenShift"
|
||||
# register OAuth client in OpenShift
|
||||
printInfo "Logging as \"system:admin\""
|
||||
$OC_BINARY login -u "system:admin"
|
||||
KEYCLOAK_ROUTE=$($OC_BINARY get route/keycloak --namespace=${CHE_OPENSHIFT_PROJECT} -o=jsonpath={'.spec.host'})
|
||||
|
|
@ -592,7 +592,7 @@ ${CHE_VAR_ARRAY}"
|
|||
-p OCP_OAUTH_CLIENT_SECRET=${OCP_OAUTH_CLIENT_SECRET} | oc apply -f -
|
||||
|
||||
# register OpenShift Identity Provider in Keycloak
|
||||
printInfo "Registering oAuth client in Keycloak"
|
||||
printInfo "Registering OAuth client in Keycloak"
|
||||
printInfo "Logging as \"${OPENSHIFT_USERNAME}\""
|
||||
$OC_BINARY login -u "${OPENSHIFT_USERNAME}" -p "${OPENSHIFT_PASSWORD}"
|
||||
KEYCLOAK_POD_NAME=$(${OC_BINARY} get pod --namespace=${CHE_OPENSHIFT_PROJECT} -l app=keycloak --no-headers | awk '{print $1}')
|
||||
|
|
@ -609,7 +609,7 @@ ${CHE_VAR_ARRAY}"
|
|||
-s config.defaultScope="user:full" \
|
||||
--no-config --server http://localhost:8080/auth --user ${KEYCLOAK_USER} --password ${KEYCLOAK_PASSWORD} --realm master
|
||||
|
||||
# setup Che variables related to oAuth identity provider
|
||||
# setup Che variables related to OAuth identity provider
|
||||
CHE_INFRA_OPENSHIFT_PROJECT=
|
||||
CHE_INFRA_OPENSHIFT_OAUTH__IDENTITY__PROVIDER=${OCP_IDENTITY_PROVIDER_ID}
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -321,11 +321,11 @@ parameters:
|
|||
value: 'true'
|
||||
- name: CHE_OAUTH_GITHUB_CLIENTID
|
||||
displayName: GitHub Client ID
|
||||
description: GitHub oAuth app client ID. Applicable to Che single user only!
|
||||
description: GitHub OAuth app client ID. Applicable to Che single user only!
|
||||
value: ''
|
||||
- name: CHE_OAUTH_GITHUB_CLIENTSECRET
|
||||
displayName: GitHub Client Secret
|
||||
description: GitHub oAuth app client servet. Applicable to Che single user only!
|
||||
description: GitHub OAuth app client servet. Applicable to Che single user only!
|
||||
value: ''
|
||||
- name: CHE_WORKSPACE_PLUGIN__REGISTRY__URL
|
||||
displayName: Eclipse Che plugin registry URL
|
||||
|
|
|
|||
|
|
@ -504,7 +504,7 @@ project.import.cloning.failed.title=Project: {0} Sources cannot be cloned
|
|||
project.import.configuring.failed=Failed to configure source code of {0}.
|
||||
project.already.imported=Project {0} already imported.
|
||||
project.import.ssh.key.upload.failed.title=Clone failed
|
||||
project.import.ssh.key.upload.failed.text=We are unable to clone your repository even though you\''ve configured oAuth access. \
|
||||
project.import.ssh.key.upload.failed.text=We are unable to clone your repository even though you\''ve configured OAuth access. \
|
||||
Some providers do not allow automatic upload of SSH keys. Please paste your SSH key manually in your provider account preferences.
|
||||
|
||||
import.config.view.name=Import From Che Config...
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ public class KeycloakServiceClient {
|
|||
} catch (BadRequestException e) {
|
||||
if (assotiateUserPattern.matcher(e.getMessage()).matches()) {
|
||||
// If user has no link with identity provider yet,
|
||||
// we should threat this as unauthorized and send to oAuth login page.
|
||||
// we should threat this as unauthorized and send to OAuth login page.
|
||||
throw new UnauthorizedException(e.getMessage());
|
||||
}
|
||||
throw e;
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ export OPENSHIFT_TOKEN=<openshift_web_console_bearer_auth_token>
|
|||
export OPENSHIFT_CHE_NAMESPACE=<namespace_of_eclipse_che_deployed_on_openshift>
|
||||
export OPENSHIFT_URL=<url_of_openshift_web_console>
|
||||
```
|
||||
where `OPENSHIFT_TOKEN` is optional and is aimed to replace username/password when OpenShift is configured with oAuth.
|
||||
where `OPENSHIFT_TOKEN` is optional and is aimed to replace username/password when OpenShift is configured with OAuth.
|
||||
|
||||
|
||||
Default values:
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ import javax.inject.Singleton;
|
|||
import org.eclipse.che.api.auth.shared.dto.OAuthToken;
|
||||
import org.eclipse.che.security.oauth.shared.OAuthTokenProvider;
|
||||
|
||||
/** Retrieves oAuth token with help of OAuthAuthenticatorProvider. */
|
||||
/** Retrieves OAuth token with help of OAuthAuthenticatorProvider. */
|
||||
@Singleton
|
||||
public class OAuthAuthenticatorTokenProvider implements OAuthTokenProvider {
|
||||
private final OAuthAuthenticatorProvider oAuthAuthenticatorProvider;
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public interface UserDto extends User {
|
|||
|
||||
UserDto withId(String id);
|
||||
|
||||
@ApiModelProperty("User alias which is used for oAuth")
|
||||
@ApiModelProperty("User alias which is used for OAuth")
|
||||
List<String> getAliases();
|
||||
|
||||
void setAliases(List<String> aliases);
|
||||
|
|
|
|||
Loading…
Reference in New Issue