community - fix token page expiration notice when auth provider is gi…

…thub (#3879) (#3900) allow for null token expiration, but also don't treat github as SSO Issue: AAH-2324 (cherry picked from commit 1976e22) Co-authored-by: Martin Hradil <mhradil@redhat.com>
ansible · Jun 28, 2023 · dcd9b23 · dcd9b23
1 parent b498124
commit dcd9b23
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/CHANGES/2324.bug b/CHANGES/2324.bug
@@ -0,0 +1 @@
+community - fix token page expiration notice when auth provider is github
diff --git a/src/containers/token/token-standalone.tsx b/src/containers/token/token-standalone.tsx
@@ -39,7 +39,12 @@ class TokenStandalone extends React.Component<RouteProps, IState> {
     const { token, alerts, loadingToken } = this.state;
     const unauthorised = !this.context.user || this.context.user.is_anonymous;
     const expiration = this.context.settings.GALAXY_TOKEN_EXPIRATION;
-    const expirationDate = new Date(Date.now() + 1000 * 60 * expiration);
+    const expirationDate = expiration
+      ? new Date(Date.now() + 1000 * 60 * expiration)
+      : null;
+    const isSSO =
+      !this.context.user.auth_provider.includes('django') &&
+      !this.context.user.auth_provider.includes('github');
 
     return (
       <React.Fragment>
@@ -64,14 +69,22 @@ class TokenStandalone extends React.Component<RouteProps, IState> {
                       <code>ansible-galaxy</code> client.
                     </Trans>
                   </p>
-                  {!this.context.user.auth_provider.includes('django') && (
+                  {isSSO && (
                     <div>
                       <h2>{t`Expiration`}</h2>
                       <p>
-                        <Trans>
-                          You are an SSO user. Your token will expire{' '}
-                          <DateComponent date={expirationDate.toISOString()} />.
-                        </Trans>
+                        <Trans>You are an SSO user.</Trans>{' '}
+                        {expirationDate ? (
+                          <Trans>
+                            Your token will expire{' '}
+                            <DateComponent
+                              date={expirationDate.toISOString()}
+                            />
+                            .
+                          </Trans>
+                        ) : (
+                          <Trans>Your token will not expire.</Trans>
+                        )}
                       </p>
                     </div>
                   )}