Merge pull request #582 from IABTechLab/ans-UID2-4386-remove-request-account-feature

Remove request account feature

Author: ashleysmithTTD

keycloak/realm/realm-export.json

@@ -29,7 +29,7 @@
   "oauth2DevicePollingInterval": 5,
   "enabled": true,
   "sslRequired": "external",
-  "registrationAllowed": true,
+  "registrationAllowed": false,
   "registrationEmailAsUsername": true,
   "rememberMe": true,
   "verifyEmail": true,

keycloak/themes/uid2-theme/login/messages/messages_en.properties

@@ -1,12 +1,7 @@
 # encoding: UTF-8
 doLogIn=Log In
-noAccount=Don’t have an account?
-doRegister=Request Account
 doForgotPassword=Forgot Password
 loginAccountTitle=Log In
-registerTitle=Request Account
-registerInfo=To request an account, provide the following information.
-infoTitle=Your Information
 passwordTitle=Create a Password
 doRegisterButton=Continue
 errorPatternNoMatch=We’re sorry, but we only accept sign-ups from company email addresses. Please use your official company email to register and try again.

keycloak/themes/uid2-theme/login/register.ftl

@@ -343,4 +343,10 @@ div.kc-logo-text {
   list-style-type: disc;
 }
 
+#request-account {
+  color: #000;
+  font-size: 16px;
+  margin-top: 20px;
+}
+
 /* End Recovery codes */

keycloak/themes/uid2-theme/login/resources/css/login.css

@@ -140,13 +140,9 @@
             </div>
         </div>
     </div>
-    <#if displayInfo>
-        <div id="kc-info" class="${properties.kcSignUpClass!}">
-            <div id="kc-info-wrapper" class="${properties.kcInfoAreaWrapperClass!}">
-                <#nested "info">
-            </div>
-        </div>
-    </#if>
+    <div id="request-account">
+        Don't have an account? Ask your UID2 contact or <a class="" href='https://unifiedid.com/docs/portal/portal-getting-started#request-an-account' target='_blank'>request access</a>.
+    </div>
     <br />
     <a class="report-vulnerability" href='https://www.thetradedesk.com/us/trust/report-a-vulnerability' target='_blank'>Report a Vulnerability</a>
     </div>

keycloak/themes/uid2-theme/login/template.ftl

@@ -5,7 +5,7 @@ import { ApiRole, ApiRoleDTO, ApiRoleSchema } from './ApiRole';
 import { BaseModel } from './BaseModel';
 import { ModelObjectOpt } from './ModelObjectOpt';
 import { ParticipantType, ParticipantTypeDTO, ParticipantTypeSchema } from './ParticipantType';
-import { type User, UserCreationPartial, UserDTO, UserSchema } from './User';
+import { type User, UserDTO, UserSchema } from './User';
 import { UserToParticipantRole } from './UserToParticipantRole';
 
 export enum ParticipantStatus {
@@ -119,13 +119,6 @@ export const ParticipantSchema = z.object({
   crmAgreementNumber: z.string().nullable(),
 });
 
-export const ParticipantCreationPartial = ParticipantSchema.pick({
-  name: true,
-}).extend({
-  types: z.array(ParticipantTypeSchema.pick({ id: true })),
-  users: z.array(UserCreationPartial).optional(),
-});
-
 export const ParticipantApprovalPartial = ParticipantSchema.pick({
   siteId: true,
   name: true,

src/api/entities/Participant.ts

@@ -4,11 +4,7 @@ import { z } from 'zod';
 import { getRoleNamesByIds } from '../../../web/utils/apiRoles';
 import { ApiRole } from '../../entities/ApiRole';
 import { AuditAction, AuditTrailEvents } from '../../entities/AuditTrail';
-import {
-  Participant,
-  ParticipantCreationPartial,
-  ParticipantStatus,
-} from '../../entities/Participant';
+import { Participant, ParticipantStatus } from '../../entities/Participant';
 import { User, UserCreationPartial } from '../../entities/User';
 import { UserRoleId } from '../../entities/UserRole';
 import { UserToParticipantRole } from '../../entities/UserToParticipantRole';
@@ -25,11 +21,7 @@ import {
   performAsyncOperationWithAuditTrail,
 } from '../../services/auditTrailService';
 import { doesUserExistInKeycloak } from '../../services/kcUsersService';
-import {
-  getParticipantTypesByIds,
-  ParticipantRequest,
-  sendNewParticipantEmail,
-} from '../../services/participantsService';
+import { getParticipantTypesByIds, ParticipantRequest } from '../../services/participantsService';
 import {
   createAndInviteKeycloakUser,
   findUserByEmail,
@@ -179,54 +171,3 @@ export async function handleCreateParticipant(req: ParticipantRequest, res: Resp
 
   return res.sendStatus(200);
 }
-
-export const handleCreateParticipantFromRequest = async (
-  req: ParticipantRequest,
-  res: Response
-) => {
-  try {
-    const traceId = getTraceId(req);
-    const parsedRequest = ParticipantCreationPartial.parse(req.body);
-    const { users, ...rest } = parsedRequest;
-    const participantData = {
-      ...rest,
-      status: ParticipantStatus.AwaitingApproval,
-    };
-    const user = {
-      ...users![0],
-      acceptedTerms: false,
-    };
-
-    const participant = await User.transaction(async (trx) => {
-      // create user
-      const newPortalUser = await User.query(trx).insertAndFetch(user);
-
-      // create participant
-      const newParticipant = await Participant.query(trx)
-        .insertGraphAndFetch([participantData], {
-          relate: true,
-        })
-        .first();
-
-      // update user/participant/role mapping
-      await UserToParticipantRole.query(trx).insert({
-        userId: newPortalUser.id,
-        participantId: newParticipant?.id!,
-        userRoleId: UserRoleId.Admin,
-      });
-      return newParticipant;
-    });
-
-    sendNewParticipantEmail(
-      parsedRequest,
-      parsedRequest.types.map((t) => t.id),
-      traceId
-    );
-    return res.status(201).json(participant);
-  } catch (err) {
-    if (err instanceof z.ZodError) {
-      return res.status(400).send(err.issues);
-    }
-    return res.status(400).send([{ message: 'Unable to create participant' }]);
-  }
-};

src/api/routers/participants/participantsCreation.ts

@@ -25,10 +25,7 @@ import {
   handleGetParticipantsAwaitingApproval,
 } from './participantsApproval';
 import { handleGetAuditTrail } from './participantsAuditTrail';
-import {
-  handleCreateParticipant,
-  handleCreateParticipantFromRequest,
-} from './participantsCreation';
+import { handleCreateParticipant } from './participantsCreation';
 import {
   handleGetParticipantDomainNames,
   handleSetParticipantDomainNames,
@@ -52,7 +49,6 @@ export function createParticipantsRouter() {
   const participantsRouter = express.Router();
 
   participantsRouter.get('/signed', handleGetSignedParticipants);
-  participantsRouter.post('/', handleCreateParticipantFromRequest);
 
   participantsRouter.get(
     '/awaitingApproval',

src/api/routers/participants/participantsRouter.ts

@@ -8,7 +8,6 @@ import { AuditAction, AuditTrailEvents } from '../entities/AuditTrail';
 import {
   Participant,
   ParticipantApprovalPartial,
-  ParticipantCreationPartial,
   ParticipantDTO,
   ParticipantStatus,
 } from '../entities/Participant';
@@ -52,32 +51,6 @@ export const getParticipantTypesByIds = async (
   return ParticipantType.query().findByIds(participantTypeIds);
 };
 
-export const sendNewParticipantEmail = async (
-  newParticipant: z.infer<typeof ParticipantCreationPartial>,
-  typeIds: number[],
-  traceId: string
-) => {
-  const participantTypes = await getParticipantTypesByIds(typeIds);
-  const emailService = createEmailService();
-  const requestor = newParticipant.users![0];
-  const templateData = {
-    participant: newParticipant.name,
-    participantType: participantTypes.map((pt) => pt.typeName).join(', '),
-    requestor: `${requestor.firstName} ${requestor.lastName}`,
-    requestorEmail: requestor.email,
-    jobFunction: requestor.jobFunction,
-  };
-
-  const uid2SupportUsers = await getAllUid2SupportUsers();
-  const emailArgs: EmailArgs = {
-    subject: 'New Participant Request',
-    templateData,
-    template: 'newParticipantReadyForReview',
-    to: uid2SupportUsers.map((user) => ({ name: user!.firstName, email: user!.email })),
-  };
-  emailService.sendEmail(emailArgs, traceId);
-};
-
 export const mapParticipantToApprovalRequest = (
   participant: Participant
 ): ParticipantRequestDTO => {