Disable console whois (#2741)

2026-01-08 07:11:44 +00:00 · 2025-04-11 11:32:34 -04:00
parent 70010886b1
commit 04a0659197
28 changed files with 121 additions and 221 deletions
--- a/console-webapp/src/app/app-routing.module.ts
+++ b/console-webapp/src/app/app-routing.module.ts
@@ -24,8 +24,8 @@ import { ResourcesComponent } from './resources/resources.component';
 import ContactComponent from './settings/contact/contact.component';
 import SecurityComponent from './settings/security/security.component';
 import { SettingsComponent } from './settings/settings.component';
-import WhoisComponent from './settings/whois/whois.component';
 import { SupportComponent } from './support/support.component';
+import RdapComponent from './settings/rdap/rdap.component';

 export interface RouteWithIcon extends Route {
  iconName?: string;
@@ -83,9 +83,9 @@ export const routes: RouteWithIcon[] = [
        title: 'Contacts',
      },
      {
-        path: WhoisComponent.PATH,
-        component: WhoisComponent,
-        title: 'WHOIS Info',
+        path: RdapComponent.PATH,
+        component: RdapComponent,
+        title: 'RDAP Info',
      },
      {
        path: SecurityComponent.PATH,
--- a/console-webapp/src/app/app.module.ts
+++ b/console-webapp/src/app/app.module.ts
@@ -47,8 +47,6 @@ import EppPasswordEditComponent from './settings/security/eppPasswordEdit.compon
 import SecurityComponent from './settings/security/security.component';
 import SecurityEditComponent from './settings/security/securityEdit.component';
 import { SettingsComponent } from './settings/settings.component';
-import WhoisComponent from './settings/whois/whois.component';
-import WhoisEditComponent from './settings/whois/whoisEdit.component';
 import { NotificationsComponent } from './shared/components/notifications/notifications.component';
 import { SelectedRegistrarWrapper } from './shared/components/selectedRegistrarWrapper/selectedRegistrarWrapper.component';
 import { LocationBackDirective } from './shared/directives/locationBack.directive';
@@ -60,6 +58,8 @@ import { SnackBarModule } from './snackbar.module';
 import { SupportComponent } from './support/support.component';
 import { TldsComponent } from './tlds/tlds.component';
 import { ForceFocusDirective } from './shared/directives/forceFocus.directive';
+import RdapComponent from './settings/rdap/rdap.component';
+import RdapEditComponent from './settings/rdap/rdapEdit.component';

@NgModule({
  declarations: [SelectedRegistrarWrapper],
@@ -76,30 +76,30 @@ export class SelectedRegistrarModule {}
    ContactDetailsComponent,
    DomainListComponent,
    EppPasswordEditComponent,
+    ForceFocusDirective,
    HeaderComponent,
    HomeComponent,
    LocationBackDirective,
-    ForceFocusDirective,
-    UserLevelVisibility,
    NavigationComponent,
    NewRegistrarComponent,
    NotificationsComponent,
+    RdapComponent,
+    RdapEditComponent,
+    ReasonDialogComponent,
    RegistrarComponent,
    RegistrarDetailsComponent,
-    RegistryLockComponent,
    RegistrarSelectorComponent,
+    RegistryLockComponent,
    RegistryLockVerifyComponent,
    ResourcesComponent,
+    ResponseDialogComponent,
    SecurityComponent,
    SecurityEditComponent,
    SettingsComponent,
    SettingsContactComponent,
    SupportComponent,
    TldsComponent,
-    WhoisComponent,
-    WhoisEditComponent,
-    ReasonDialogComponent,
-    ResponseDialogComponent,
+    UserLevelVisibility,
  ],
  bootstrap: [AppComponent],
  imports: [
@@ -108,8 +108,8 @@ export class SelectedRegistrarModule {}
    BrowserModule,
    FormsModule,
    MaterialModule,
-    SnackBarModule,
    SelectedRegistrarModule,
+    SnackBarModule,
  ],
  providers: [
    BackendService,
--- a/console-webapp/src/app/registrar/newRegistrar.component.ts
+++ b/console-webapp/src/app/registrar/newRegistrar.component.ts
@@ -48,7 +48,6 @@ export default class NewRegistrarComponent {
    this.newRegistrar = {
      registrarId: '',
      url: '',
-      whoisServer: '',
      registrarName: '',
      icannReferralEmail: '',
      localizedAddress: {
--- a/console-webapp/src/app/registrar/registrar.service.ts
+++ b/console-webapp/src/app/registrar/registrar.service.ts
@@ -50,17 +50,16 @@ export interface SecuritySettings
  ipAddressAllowList?: Array<IpAllowListItem>;
 }

-export interface WhoisRegistrarFields {
+export interface RdapRegistrarFields {
  ianaIdentifier?: number;
  icannReferralEmail: string;
  localizedAddress: Address;
  registrarId: string;
  url: string;
-  whoisServer: string;
 }

 export interface Registrar
-  extends WhoisRegistrarFields,
+  extends RdapRegistrarFields,
    SecuritySettingsBackendModel {
  allowedTlds?: string[];
  billingAccountMap?: object;
--- a/console-webapp/src/app/settings/contact/contact.service.ts
+++ b/console-webapp/src/app/settings/contact/contact.service.ts
@@ -24,7 +24,7 @@ export type contactType =
  | 'LEGAL'
  | 'MARKETING'
  | 'TECH'
-  | 'WHOIS';
+  | 'RDAP';

 type contactTypesToUserFriendlyTypes = { [type in contactType]: string };

@@ -35,7 +35,7 @@ export const contactTypeToTextMap: contactTypesToUserFriendlyTypes = {
  LEGAL: 'Legal contact',
  MARKETING: 'Marketing contact',
  TECH: 'Technical contact',
-  WHOIS: 'WHOIS-Inquiry contact',
+  RDAP: 'RDAP-Inquiry contact',
 };

 type UserFriendlyType = (typeof contactTypeToTextMap)[contactType];
--- a/console-webapp/src/app/settings/contact/contactDetails.component.html
+++ b/console-webapp/src/app/settings/contact/contactDetails.component.html
@@ -97,12 +97,12 @@
    </section>

    <section>
-      <h1>WHOIS Preferences</h1>
+      <h1>RDAP Preferences</h1>
      <div>
        <mat-checkbox
          [(ngModel)]="contactService.contactInEdit.visibleInWhoisAsAdmin"
          [ngModelOptions]="{ standalone: true }"
-          >Show in Registrar WHOIS record as admin contact</mat-checkbox
+          >Show in Registrar RDAP record as admin contact</mat-checkbox
        >
      </div>

@@ -110,7 +110,7 @@
        <mat-checkbox
          [(ngModel)]="contactService.contactInEdit.visibleInWhoisAsTech"
          [ngModelOptions]="{ standalone: true }"
-          >Show in Registrar WHOIS record as technical contact</mat-checkbox
+          >Show in Registrar RDAP record as technical contact</mat-checkbox
        >
      </div>

@@ -118,8 +118,8 @@
        <mat-checkbox
          [(ngModel)]="contactService.contactInEdit.visibleInDomainWhoisAsAbuse"
          [ngModelOptions]="{ standalone: true }"
-          >Show Phone and Email in Domain WHOIS Record as registrar abuse
-          contact (per CL&D requirements)</mat-checkbox
+          >Show Phone and Email in Domain RDAP Record as registrar abuse contact
+          (per CL&D requirements)</mat-checkbox
        >
      </div>
    </section>
@@ -176,13 +176,13 @@
    <mat-card-content>
      <mat-list role="list">
        <mat-list-item role="listitem">
-          <h2>WHOIS Preferences</h2>
+          <h2>RDAP Preferences</h2>
        </mat-list-item>
        @if(contactService.contactInEdit.visibleInWhoisAsAdmin) {
        <mat-divider></mat-divider>
        <mat-list-item role="listitem">
          <span class="console-app__list-value"
-            >Show in Registrar WHOIS record as admin contact</span
+            >Show in Registrar RDAP record as admin contact</span
          >
        </mat-list-item>
        } @if(contactService.contactInEdit.visibleInWhoisAsTech) {
@@ -192,14 +192,14 @@
          *ngIf="contactService.contactInEdit.visibleInWhoisAsTech"
        >
          <span class="console-app__list-value"
-            >Show in Registrar WHOIS record as technical contact</span
+            >Show in Registrar RDAP record as technical contact</span
          >
        </mat-list-item>
        } @if(contactService.contactInEdit.visibleInDomainWhoisAsAbuse) {
        <mat-divider></mat-divider>
        <mat-list-item role="listitem">
          <span class="console-app__list-value"
-            >Show Phone and Email in Domain WHOIS Record as registrar abuse
+            >Show Phone and Email in Domain RDAP Record as registrar abuse
            contact (per CL&D requirements)</span
          >
        </mat-list-item>
--- a/console-webapp/src/app/settings/whois/whois.component.html
+++ b/console-webapp/src/app/settings/whois/whois.component.html
@@ -1,18 +1,18 @@
-@if(whoisService.editing) {
-<app-whois-edit></app-whois-edit>
+@if(rdapService.editing) {
+<app-rdap-edit></app-rdap-edit>
 } @else {
-<div class="console-app__whois">
-  <div class="console-app__whois-controls">
+<div class="console-app__rdap">
+  <div class="console-app__rdap-controls">
    <span>
-      General registrar information for your WHOIS record. This information is
-      always visible in WHOIS.
+      General registrar information for your RDAP record. This information is
+      always visible in RDAP.
    </span>
    <div class="spacer"></div>
    <button
      mat-flat-button
      color="primary"
-      aria-label="Edit WHOIS record"
-      (click)="whoisService.editing = true"
+      aria-label="Edit RDAP record"
+      (click)="rdapService.editing = true"
    >
      <mat-icon>edit</mat-icon>
      Edit
@@ -61,45 +61,5 @@
      </mat-list>
    </mat-card-content>
  </mat-card>
-
-  <mat-card appearance="outlined">
-    <mat-card-content>
-      <mat-list role="list">
-        <mat-list-item role="listitem">
-          <h2>Technical Info</h2>
-        </mat-list-item>
-        <mat-divider></mat-divider>
-        <mat-list-item role="listitem">
-          <span class="console-app__list-key">IANA Identifier</span>
-          <span class="console-app__list-value">{{
-            registrarService.registrar()?.ianaIdentifier
-          }}</span>
-        </mat-list-item>
-        <mat-divider></mat-divider>
-        <mat-list-item role="listitem">
-          <div>
-            <span class="console-app__list-key">ICANN Referral Email</span>
-            <span class="console-app__list-value">{{
-              registrarService.registrar()?.icannReferralEmail
-            }}</span>
-          </div>
-        </mat-list-item>
-        <mat-divider></mat-divider>
-        <mat-list-item role="listitem">
-          <span class="console-app__list-key">WHOIS server</span>
-          <span class="console-app__list-value">{{
-            registrarService.registrar()?.whoisServer
-          }}</span>
-        </mat-list-item>
-        <mat-divider></mat-divider>
-        <mat-list-item role="listitem">
-          <span class="console-app__list-key">Referral URL</span>
-          <span class="console-app__list-value">{{
-            registrarService.registrar()?.url
-          }}</span>
-        </mat-list-item>
-      </mat-list>
-    </mat-card-content>
-  </mat-card>
 </div>
 }
--- a/console-webapp/src/app/settings/whois/whois.component.scss
+++ b/console-webapp/src/app/settings/whois/whois.component.scss
@@ -1,4 +1,4 @@
-.console-app__whois {
+.console-app__rdap {
  max-width: 616px;

  &-controls {
--- a/console-webapp/src/app/settings/whois/whois.component.spec.ts
+++ b/console-webapp/src/app/settings/whois/whois.component.spec.ts
@@ -20,15 +20,15 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { MaterialModule } from 'src/app/material.module';
 import { RegistrarService } from 'src/app/registrar/registrar.service';
 import { BackendService } from 'src/app/shared/services/backend.service';
-import WhoisComponent from './whois.component';
+import RdapComponent from './rdap.component';

-describe('WhoisComponent', () => {
-  let component: WhoisComponent;
-  let fixture: ComponentFixture<WhoisComponent>;
+describe('RdapComponent', () => {
+  let component: RdapComponent;
+  let fixture: ComponentFixture<RdapComponent>;

  beforeEach(async () => {
    await TestBed.configureTestingModule({
-      declarations: [WhoisComponent],
+      declarations: [RdapComponent],
      imports: [MaterialModule, BrowserAnimationsModule],
      providers: [
        BackendService,
@@ -45,7 +45,7 @@ describe('WhoisComponent', () => {
      ],
    }).compileComponents();

-    fixture = TestBed.createComponent(WhoisComponent);
+    fixture = TestBed.createComponent(RdapComponent);
    component = fixture.componentInstance;
    fixture.detectChanges();
  });
--- a/console-webapp/src/app/settings/whois/whois.component.ts
+++ b/console-webapp/src/app/settings/whois/whois.component.ts
@@ -14,17 +14,16 @@

 import { Component, computed } from '@angular/core';
 import { RegistrarService } from 'src/app/registrar/registrar.service';
-
-import { WhoisService } from './whois.service';
+import { RdapService } from './rdap.service';

@Component({
-  selector: 'app-whois',
-  templateUrl: './whois.component.html',
-  styleUrls: ['./whois.component.scss'],
+  selector: 'app-rdap',
+  templateUrl: './rdap.component.html',
+  styleUrls: ['./rdap.component.scss'],
  standalone: false,
 })
-export default class WhoisComponent {
-  public static PATH = 'whois';
+export default class RdapComponent {
+  public static PATH = 'rdap';
  formattedAddress = computed(() => {
    let result = '';
    const registrar = this.registrarService.registrar();
@@ -47,7 +46,7 @@ export default class WhoisComponent {
  });

  constructor(
-    public whoisService: WhoisService,
+    public rdapService: RdapService,
    public registrarService: RegistrarService
  ) {}
 }
--- a/console-webapp/src/app/settings/whois/whois.service.ts
+++ b/console-webapp/src/app/settings/whois/whois.service.ts
@@ -16,14 +16,14 @@ import { Injectable } from '@angular/core';
 import { switchMap } from 'rxjs';
 import {
  RegistrarService,
-  WhoisRegistrarFields,
+  RdapRegistrarFields,
 } from 'src/app/registrar/registrar.service';
 import { BackendService } from 'src/app/shared/services/backend.service';

@Injectable({
  providedIn: 'root',
 })
-export class WhoisService {
+export class RdapService {
  editing: boolean = false;

  constructor(
@@ -31,8 +31,8 @@ export class WhoisService {
    private registrarService: RegistrarService
  ) {}

-  saveChanges(newWhoisRegistrarFields: WhoisRegistrarFields) {
-    return this.backend.postWhoisRegistrarFields(newWhoisRegistrarFields).pipe(
+  saveChanges(newRdapRegistrarFields: RdapRegistrarFields) {
+    return this.backend.postRdapRegistrarFields(newRdapRegistrarFields).pipe(
      switchMap(() => {
        return this.registrarService.loadRegistrars();
      })
--- a/console-webapp/src/app/settings/whois/whoisEdit.component.html
+++ b/console-webapp/src/app/settings/whois/whoisEdit.component.html
@@ -1,27 +1,27 @@
 <div
-  class="console-app__whois-edit"
+  class="console-app__rdap-edit"
  *ngIf="registrarInEdit"
  cdkTrapFocus
  [cdkTrapFocusAutoCapture]="true"
 >
  <button
    mat-icon-button
-    class="console-app__whois-edit-back"
-    aria-label="Back to whois view"
-    (click)="whoisService.editing = false"
+    class="console-app__rdap-edit-back"
+    aria-label="Back to rdap view"
+    (click)="rdapService.editing = false"
  >
    <mat-icon>arrow_back</mat-icon>
  </button>

-  <div class="console-app__whois-edit-controls">
+  <div class="console-app__rdap-edit-controls">
    <span>
-      General registrar information for your WHOIS record. This information is
-      always visible in WHOIS.
+      General registrar information for your RDAP record. This information is
+      always visible in RDAP.
    </span>
    <div class="spacer"></div>
  </div>

-  <div class="console-app__whois-edit">
+  <div class="console-app__rdap-edit">
    <h1>Personal info</h1>

    <form (ngSubmit)="save($event)">
@@ -115,45 +115,11 @@
        />
      </mat-form-field>

-      <h1>Technical info</h1>
-
-      <mat-form-field appearance="outline">
-        <mat-label>WHOIS server: </mat-label>
-        <input
-          matInput
-          type="text"
-          [(ngModel)]="registrarInEdit.whoisServer"
-          [ngModelOptions]="{ standalone: true }"
-        />
-      </mat-form-field>
-
-      <mat-form-field appearance="outline">
-        <mat-label>Referral URL: </mat-label>
-        <input
-          matInput
-          type="text"
-          [(ngModel)]="registrarInEdit.url"
-          [ngModelOptions]="{ standalone: true }"
-        />
-      </mat-form-field>
-
-      @if((userDataService.userData()?.globalRole || 'NONE') !== "NONE") {
-      <mat-form-field appearance="outline">
-        <mat-label>ICANN Referral Email: </mat-label>
-        <input
-          matInput
-          type="text"
-          [(ngModel)]="registrarInEdit.icannReferralEmail"
-          [ngModelOptions]="{ standalone: true }"
-        />
-      </mat-form-field>
-      }
-
      <button
        mat-flat-button
        color="primary"
        type="submit"
-        aria-label="Save WHOIS settings"
+        aria-label="Save RDAO settings"
      >
        Save
      </button>
--- a/console-webapp/src/app/settings/whois/whoisEdit.component.scss
+++ b/console-webapp/src/app/settings/whois/whoisEdit.component.scss
@@ -1,4 +1,4 @@
-.console-app__whois-edit {
+.console-app__rdap-edit {
  max-width: 616px;

  &-controls {
--- a/console-webapp/src/app/settings/whois/whoisEdit.component.ts
+++ b/console-webapp/src/app/settings/whois/whoisEdit.component.ts
@@ -20,20 +20,20 @@ import {
  RegistrarService,
 } from 'src/app/registrar/registrar.service';
 import { UserDataService } from 'src/app/shared/services/userData.service';
-import { WhoisService } from './whois.service';
+import { RdapService } from './rdap.service';

@Component({
-  selector: 'app-whois-edit',
-  templateUrl: './whoisEdit.component.html',
-  styleUrls: ['./whoisEdit.component.scss'],
+  selector: 'app-rdap-edit',
+  templateUrl: './rdapEdit.component.html',
+  styleUrls: ['./rdapEdit.component.scss'],
  standalone: false,
 })
-export default class WhoisEditComponent {
+export default class RdapEditComponent {
  registrarInEdit: Registrar | undefined;

  constructor(
    public userDataService: UserDataService,
-    public whoisService: WhoisService,
+    public rdapService: RdapService,
    public registrarService: RegistrarService,
    private _snackBar: MatSnackBar
  ) {
@@ -49,9 +49,9 @@ export default class WhoisEditComponent {
    e.preventDefault();
    if (!this.registrarInEdit) return;

-    this.whoisService.saveChanges(this.registrarInEdit).subscribe({
+    this.rdapService.saveChanges(this.registrarInEdit).subscribe({
      complete: () => {
-        this.whoisService.editing = false;
+        this.rdapService.editing = false;
      },
      error: (err: HttpErrorResponse) => {
        this._snackBar.open(err.error);
--- a/console-webapp/src/app/settings/settings.component.html
+++ b/console-webapp/src/app/settings/settings.component.html
@@ -19,13 +19,13 @@
      >
      <a
        mat-tab-link
-        routerLink="whois"
+        routerLink="rdap"
        routerLinkActive
        queryParamsHandling="merge"
        #rla2="routerLinkActive"
        [active]="rla2.isActive"
-        aria-label="Access whois settings"
-        >WHOIS Info</a
+        aria-label="Access rdap settings"
+        >RDAP Info</a
      >
      <a
        mat-tab-link
--- a/console-webapp/src/app/shared/services/backend.service.ts
+++ b/console-webapp/src/app/shared/services/backend.service.ts
@@ -25,7 +25,7 @@ import { User } from 'src/app/users/users.service';
 import {
  Registrar,
  SecuritySettingsBackendModel,
-  WhoisRegistrarFields,
+  RdapRegistrarFields,
 } from '../../registrar/registrar.service';
 import { Contact } from '../../settings/contact/contact.service';
 import { EppPasswordBackendModel } from '../../settings/security/security.service';
@@ -209,12 +209,12 @@ export class BackendService {
      .pipe(catchError((err) => this.errorCatcher<UserData>(err)));
  }

-  postWhoisRegistrarFields(
-    whoisRegistrarFields: WhoisRegistrarFields
-  ): Observable<WhoisRegistrarFields> {
-    return this.http.post<WhoisRegistrarFields>(
-      '/console-api/settings/whois-fields',
-      whoisRegistrarFields
+  postRdapRegistrarFields(
+    rdapRegistrarFields: RdapRegistrarFields
+  ): Observable<RdapRegistrarFields> {
+    return this.http.post<RdapRegistrarFields>(
+      '/console-api/settings/rdap-fields',
+      rdapRegistrarFields
    );
  }