Rename routes and update docs

hashicorp · Nov 9, 2021 · b4d0ed6 · b4d0ed6
1 parent 8d89b15
commit b4d0ed6
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/internal/auth/oidc/provider.go b/internal/auth/oidc/provider.go
@@ -49,7 +49,7 @@ func ProviderConfig(am *pb.AuthMethod_OIDC, sc *pb.ServerConfig) (*oidc.Config,
  if !addr.Tls {
  u.Scheme = "http"
  }
- u.Path = "/oidc/callback"
+ u.Path = "/auth/oidc-callback"
 
  allowedUris = append(allowedUris, u.String())
  }

diff --git a/ui/app/components/oidc-auth-buttons/index.ts b/ui/app/components/oidc-auth-buttons/index.ts
@@ -36,7 +36,7 @@ export default class OIDCAuthButtonsComponent extends Component<OIDCAuthButtonsA
  urlRequest.setNonce(nonce);
  window.localStorage.setItem('waypointOIDCNonce', nonce);
  window.localStorage.setItem('waypointOIDCAuthMethod', authMethodProviderName);
- let redirectUri = `${window.location.origin}/auth/oidc-redirect`;
+ let redirectUri = `${window.location.origin}/auth/oidc-callback`;
  urlRequest.setRedirectUri(redirectUri);
  let authUrl = await this.api.client.getOIDCAuthURL(urlRequest, this.api.WithMeta());
  await window.location.replace(authUrl.getUrl());

diff --git a/ui/app/router.js b/ui/app/router.js
@@ -10,7 +10,7 @@ Router.map(function () {
  this.route('auth', function () {
  this.route('invite');
  this.route('token');
- this.route('oidc-redirect');
+ this.route('oidc-callback');
  });
  this.route('onboarding', function () {
  this.route('install', function () {

diff --git a/ui/app/routes/auth/oidc-redirect.ts → ui/app/routes/auth/oidc-callback.ts b/ui/app/routes/auth/oidc-redirect.ts → ui/app/routes/auth/oidc-callback.ts
diff --git a/ui/app/styles/pages/auth-page.scss b/ui/app/styles/pages/auth-page.scss
@@ -68,7 +68,7 @@
  .button, .pds-button {
  width: 100%;
  }
- .oidc-redirect {
+ .oidc-callback {
  .spinner {
  font-size: 48px;
  margin: 24px 80px;

diff --git a/.../templates/auth/oidc-redirect-loading.hbs → .../templates/auth/oidc-callback-loading.hbs b/.../templates/auth/oidc-redirect-loading.hbs → .../templates/auth/oidc-callback-loading.hbs
@@ -1,4 +1,4 @@
-<div class="oidc-redirect">
+<div class="oidc-callback">
  <h2>{{t 'auth.loading'}}</h2>
  <Spinner @size="48"/>
 </div>
diff --git a/ui/app/templates/auth/oidc-redirect.hbs → ui/app/templates/auth/oidc-callback.hbs b/ui/app/templates/auth/oidc-redirect.hbs → ui/app/templates/auth/oidc-callback.hbs
@@ -1,4 +1,4 @@
-<div class="oidc-redirect">
+<div class="oidc-callback">
  <h2>{{t 'auth.loading'}}</h2>
  <Spinner @size="48"/>
 </div>
diff --git a/website/content/docs/server/auth/oidc.mdx b/website/content/docs/server/auth/oidc.mdx
@@ -54,7 +54,7 @@ You should set the following redirect URLs:
  to work in the CLI. If you do not set this, the CLI login will not work.
  Note that non-TLS is expected here since it is a loopback call.
 
-- `https://<ui addr>/oidc/callback` - This must be set for UI-based
+- `https://<ui addr>/auth/oidc-callback` - This must be set for UI-based
  OIDC authentication to work. In this case, "ui addr" should be the
  routable UI address you visit. And note you SHOULD set TLS (`https`) for
  this.