Merge pull request #1073 from bprize15/refresh-expired-tokens

Enable user to refresh the expired token when there is a valid one
oncokb · Jan 9, 2024 · 715db38 · 715db38
2 parents b5bd6e6 + 66de310
commit 715db38
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 9 deletions.
diff --git a/screenshot-test/__baseline_snapshots__/Account Settings Page-snap.png b/screenshot-test/__baseline_snapshots__/Account Settings Page-snap.png
diff --git a/screenshot-test/__baseline_snapshots__/Company User Details Page-snap.png b/screenshot-test/__baseline_snapshots__/Company User Details Page-snap.png
diff --git a/screenshot-test/__baseline_snapshots__/User Details Page-snap.png b/screenshot-test/__baseline_snapshots__/User Details Page-snap.png
diff --git a/src/main/java/org/mskcc/cbio/oncokb/security/uuid/TokenProvider.java b/src/main/java/org/mskcc/cbio/oncokb/security/uuid/TokenProvider.java
@@ -47,7 +47,7 @@ public void afterPropertiesSet() throws Exception {
     }
 
     public List<Token> getUserTokens(User userLogin) {
-        return tokenService.findValidByUser(userLogin);
+        return tokenService.findByUser(userLogin);
     }
 
     private Token getNewToken(Set<Authority> authorities, Optional<Instant> definedExpirationTime) {

diff --git a/src/main/webapp/app/components/tokenInputGroups/TokenInputGroups.tsx b/src/main/webapp/app/components/tokenInputGroups/TokenInputGroups.tsx
@@ -65,6 +65,43 @@ export default class TokenInputGroups extends React.Component<
                     Expires in {this.getDuration(expirationDay, expirationHour)}
                   </InputGroup.Text>
                 </InputGroup.Append>
+                <DefaultTooltip
+                  placement={'top'}
+                  overlay={
+                    token.renewable
+                      ? token.expiration ===
+                        this.sortedTokens[this.sortedTokens.length - 1]
+                          .expiration
+                        ? 'Token is up-to-date'
+                        : 'Renew the token'
+                      : 'Token is not renewable'
+                  }
+                >
+                  <InputGroup.Append>
+                    <Button
+                      variant={'primary'}
+                      onClick={() => {
+                        if (this.props.extendExpirationDate) {
+                          this.props.extendExpirationDate(
+                            token,
+                            this.sortedTokens[this.sortedTokens.length - 1]
+                              .expiration
+                          );
+                        }
+                      }}
+                      disabled={
+                        !this.props.extendExpirationDate ||
+                        !token.renewable ||
+                        token.expiration ===
+                          this.sortedTokens[this.sortedTokens.length - 1]
+                            .expiration
+                      }
+                      style={!token.renewable ? { pointerEvents: 'none' } : {}}
+                    >
+                      <i className={classnames('fa fa-refresh')}></i>
+                    </Button>
+                  </InputGroup.Append>
+                </DefaultTooltip>
                 {this.props.changeTokenExpirationDate && (
                   <CalendarButton
                     currentDate={token.expiration}

diff --git a/src/main/webapp/app/pages/AccountPage.tsx b/src/main/webapp/app/pages/AccountPage.tsx
@@ -81,15 +81,10 @@ export class AccountPage extends React.Component<IRegisterProps> {
       });
   }
 
-  @action
+  @action.bound
   extendExpirationDate(token: Token, newDate: string) {
-    client
-      .updateTokenUsingPUT({
-        token: {
-          ...token,
-          expiration: newDate,
-        },
-      })
+    this.props.authenticationStore
+      .extendTokenExpirationDate(token, newDate)
       .then(
         () => {
           notifySuccess('Updated Token');
@@ -165,6 +160,7 @@ export class AccountPage extends React.Component<IRegisterProps> {
           changeTokenExpirationDate={false}
           tokens={this.tokens}
           onDeleteToken={this.deleteToken}
+          extendExpirationDate={this.extendExpirationDate}
         />
       </InfoRow>
     );

diff --git a/src/main/webapp/app/store/AuthenticationStore.ts b/src/main/webapp/app/store/AuthenticationStore.ts
@@ -156,6 +156,31 @@ class AuthenticationStore {
     });
   }
 
+  @action
+  extendTokenExpirationDate(token: Token, newDate: string) {
+    return new Promise((resolve, reject) => {
+      client
+        .updateTokenUsingPUT({
+          token: {
+            ...token,
+            expiration: newDate,
+          },
+        })
+        .then((updatedToken: Token) => {
+          this.getAccountTokens()
+            .then(() => {
+              resolve(updatedToken);
+            })
+            .catch(error => {
+              reject(error);
+            });
+        })
+        .catch((error: Error) => {
+          reject(error);
+        });
+    });
+  }
+
   @computed
   get isAuthenticated() {
     return !!this.idToken;