Some refactoring

datahub-project · Sep 22, 2022 · bac61e0 · bac61e0
1 parent d12e162
commit bac61e0
Show file tree

Hide file tree

Showing 15 changed files with 138 additions and 330 deletions.
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
@@ -202,9 +202,7 @@
 import com.linkedin.datahub.graphql.resolvers.type.PlatformSchemaUnionTypeResolver;
 import com.linkedin.datahub.graphql.resolvers.type.ResultsTypeResolver;
 import com.linkedin.datahub.graphql.resolvers.type.TimeSeriesAspectInterfaceTypeResolver;
-import com.linkedin.datahub.graphql.resolvers.user.CreateNativeUserInviteTokenResolver;
 import com.linkedin.datahub.graphql.resolvers.user.CreateNativeUserResetTokenResolver;
-import com.linkedin.datahub.graphql.resolvers.user.GetNativeUserInviteTokenResolver;
 import com.linkedin.datahub.graphql.resolvers.user.ListUsersResolver;
 import com.linkedin.datahub.graphql.resolvers.user.RemoveUserResolver;
 import com.linkedin.datahub.graphql.resolvers.user.UpdateUserStatusResolver;
@@ -674,7 +672,6 @@ private void configureQueryResolvers(final RuntimeWiring.Builder builder) {
             .dataFetcher("getRootGlossaryTerms", new GetRootGlossaryTermsResolver(this.entityClient))
             .dataFetcher("getRootGlossaryNodes", new GetRootGlossaryNodesResolver(this.entityClient))
             .dataFetcher("entityExists", new EntityExistsResolver(this.entityService))
-            .dataFetcher("getNativeUserInviteToken", new GetNativeUserInviteTokenResolver(this.inviteTokenService))
             .dataFetcher("entity", getEntityResolver())
             .dataFetcher("entities", getEntitiesResolver())
             .dataFetcher("listRoles", new ListRolesResolver(this.entityClient))
@@ -794,8 +791,6 @@ private void configureMutationResolvers(final RuntimeWiring.Builder builder) {
             .dataFetcher("updateName", new UpdateNameResolver(entityService))
             .dataFetcher("addRelatedTerms", new AddRelatedTermsResolver(this.entityService))
             .dataFetcher("removeRelatedTerms", new RemoveRelatedTermsResolver(this.entityService))
-            .dataFetcher("createNativeUserInviteToken",
-                new CreateNativeUserInviteTokenResolver(this.inviteTokenService))
             .dataFetcher("createNativeUserResetToken", new CreateNativeUserResetTokenResolver(this.nativeUserService))
             .dataFetcher("batchUpdateSoftDeleted", new BatchUpdateSoftDeletedResolver(this.entityService))
             .dataFetcher("updateUserSetting", new UpdateUserSettingResolver(this.entityService))

diff --git a/...java/com/linkedin/datahub/graphql/resolvers/user/CreateNativeUserInviteTokenResolver.java b/...java/com/linkedin/datahub/graphql/resolvers/user/CreateNativeUserInviteTokenResolver.java
diff --git a/...in/java/com/linkedin/datahub/graphql/resolvers/user/GetNativeUserInviteTokenResolver.java b/...in/java/com/linkedin/datahub/graphql/resolvers/user/GetNativeUserInviteTokenResolver.java
diff --git a/datahub-graphql-core/src/main/resources/entity.graphql b/datahub-graphql-core/src/main/resources/entity.graphql
@@ -164,11 +164,6 @@ type Query {
     """
     entityExists(urn: String!): Boolean
 
-    """
-    Gets the current invite token. If the optional regenerate param is set to true, generate a new invite token.
-    """
-    getNativeUserInviteToken: InviteToken @deprecated(reason: "Use getInviteToken instead")
-
     """
     Gets an entity based on its urn
     """
@@ -494,11 +489,6 @@ type Mutation {
     """
     removeRelatedTerms(input: RelatedTermsInput!): Boolean
 
-    """
-    Generates an invite token that can be shared with prospective users to create their accounts.
-    """
-    createNativeUserInviteToken: InviteToken @deprecated(reason: "Use createInviteToken instead")
-
     """
     Generates a token that can be shared with existing native users to reset their credentials.
     """

diff --git a/.../com/linkedin/datahub/graphql/resolvers/user/CreateNativeUserInviteTokenResolverTest.java b/.../com/linkedin/datahub/graphql/resolvers/user/CreateNativeUserInviteTokenResolverTest.java
diff --git a/...ava/com/linkedin/datahub/graphql/resolvers/user/GetNativeUserInviteTokenResolverTest.java b/...ava/com/linkedin/datahub/graphql/resolvers/user/GetNativeUserInviteTokenResolverTest.java
diff --git a/datahub-web-react/src/app/auth/SignUp.tsx b/datahub-web-react/src/app/auth/SignUp.tsx
@@ -1,9 +1,10 @@
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { Input, Button, Form, message, Image, Select } from 'antd';
 import { UserOutlined, LockOutlined } from '@ant-design/icons';
 import { useReactiveVar } from '@apollo/client';
 import styled, { useTheme } from 'styled-components/macro';
-import { Redirect } from 'react-router';
+// import { Redirect } from 'react-router';
+import { useHistory } from 'react-router-dom';
 import styles from './login.module.css';
 import { Message } from '../shared/Message';
 import { isLoggedInVar } from './checkAuthStatus';
@@ -57,6 +58,7 @@ const TitleSelector = styled(Select)`
 export type SignUpProps = Record<string, never>;
 
 export const SignUp: React.VFC<SignUpProps> = () => {
+    const history = useHistory();
     const isLoggedIn = useReactiveVar(isLoggedInVar);
     const inviteToken = useGetInviteTokenFromUrlParams();
 
@@ -66,7 +68,7 @@ export const SignUp: React.VFC<SignUpProps> = () => {
     const { refreshContext } = useAppConfig();
 
     const [acceptRoleMutation] = useAcceptRoleMutation();
-    const acceptRole = useCallback(() => {
+    const acceptRole = () => {
         acceptRoleMutation({
             variables: {
                 input: {
@@ -89,7 +91,7 @@ export const SignUp: React.VFC<SignUpProps> = () => {
                     duration: 3,
                 });
             });
-    }, [acceptRoleMutation, inviteToken]);
+    };
 
     const handleSignUp = useCallback(
         (values: FormValues) => {
@@ -114,7 +116,6 @@ export const SignUp: React.VFC<SignUpProps> = () => {
                     }
                     isLoggedInVar(true);
                     refreshContext();
-                    acceptRole();
                     analytics.event({ type: EventType.SignUpEvent, title: values.title });
                     return Promise.resolve();
                 })
@@ -123,12 +124,15 @@ export const SignUp: React.VFC<SignUpProps> = () => {
                 })
                 .finally(() => setLoading(false));
         },
-        [refreshContext, inviteToken, acceptRole],
+        [refreshContext, inviteToken],
     );
 
-    if (isLoggedIn && !loading) {
-        return <Redirect to={`${PageRoutes.ROOT}`} />;
-    }
+    useEffect(() => {
+        if (isLoggedIn && !loading) {
+            acceptRole();
+            history.push(PageRoutes.ROOT);
+        }
+    });
 
     return (
         <div className={styles.login_page}>
@@ -140,10 +144,10 @@ export const SignUp: React.VFC<SignUpProps> = () => {
                     {loading && <Message type="loading" content="Signing up..." />}
                     <Form onFinish={handleSignUp} layout="vertical">
                         <Form.Item
-                            rules={[{ required: true, message: 'Please fill in your email!' }]}
+                            rules={[{ required: true, message: 'Please fill in your username!' }]}
                             name="email"
                             // eslint-disable-next-line jsx-a11y/label-has-associated-control
-                            label={<label style={{ color: 'white' }}>Email</label>}
+                            label={<label style={{ color: 'white' }}>Username</label>}
                         >
                             <FormInput prefix={<UserOutlined />} data-testid="email" />
                         </Form.Item>