Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Admin Authentication settings #75

Merged
merged 3 commits into from
Mar 1, 2023
Merged

Remove Admin Authentication settings #75

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df33332
Remove admin auth settings
pcustic Feb 14, 2023
a1bbb7d
Remove leftover Admin Authentication stuff
pcustic Feb 14, 2023
5764977
Remove leftover scss file
pcustic Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 0 additions & 54 deletions src/__tests__/actions-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,60 +702,6 @@ describe("actions", () => {
});
});

describe("fetchAdminAuthServices", () => {
it("dispatches request, load, and success", async () => {
const dispatch = stub();
const adminAuthServicesData = "adminAuthServices";
fetcher.testData = {
ok: true,
status: 200,
json: () =>
new Promise<any>((resolve, reject) => {
resolve(adminAuthServicesData);
}),
};
fetcher.resolve = true;

const data = await actions.fetchAdminAuthServices()(dispatch);
expect(dispatch.callCount).to.equal(3);
expect(dispatch.args[0][0].type).to.equal(
`${ActionCreator.ADMIN_AUTH_SERVICES}_${ActionCreator.REQUEST}`
);
expect(dispatch.args[1][0].type).to.equal(
`${ActionCreator.ADMIN_AUTH_SERVICES}_${ActionCreator.SUCCESS}`
);
expect(dispatch.args[2][0].type).to.equal(
`${ActionCreator.ADMIN_AUTH_SERVICES}_${ActionCreator.LOAD}`
);
expect(data).to.deep.equal(adminAuthServicesData);
});
});

describe("editAdminAuthService", () => {
it("dispatches request and success", async () => {
const editAdminAuthServiceUrl = "/admin/admin_auth_services";
const dispatch = stub();
const formData = new (window as any).FormData();
formData.append("name", "new name");

fetchMock.mock(editAdminAuthServiceUrl, "server response");
const fetchArgs = fetchMock.calls();

await actions.editAdminAuthService(formData)(dispatch);
expect(dispatch.callCount).to.equal(3);
expect(dispatch.args[0][0].type).to.equal(
`${ActionCreator.EDIT_ADMIN_AUTH_SERVICE}_${ActionCreator.REQUEST}`
);
expect(dispatch.args[1][0].type).to.equal(
`${ActionCreator.EDIT_ADMIN_AUTH_SERVICE}_${ActionCreator.SUCCESS}`
);
expect(fetchMock.called()).to.equal(true);
expect(fetchArgs[0][0]).to.equal(editAdminAuthServiceUrl);
expect(fetchArgs[0][1].method).to.equal("POST");
expect(fetchArgs[0][1].body).to.equal(formData);
});
});

describe("fetchIndividualAdmins", () => {
it("dispatches request, load, and success", async () => {
const dispatch = stub();
Expand Down
29 changes: 0 additions & 29 deletions src/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
StatsData,
LibrariesData,
CollectionsData,
AdminAuthServicesData,
IndividualAdminsData,
PatronAuthServicesData,
SitewideSettingsData,
Expand Down Expand Up @@ -75,9 +74,6 @@ export default class ActionCreator extends BaseActionCreator {
static readonly COLLECTIONS = "COLLECTIONS";
static readonly EDIT_COLLECTION = "EDIT_COLLECTION";
static readonly DELETE_COLLECTION = "DELETE_COLLECTION";
static readonly ADMIN_AUTH_SERVICES = "ADMIN_AUTH_SERVICES";
static readonly EDIT_ADMIN_AUTH_SERVICE = "EDIT_ADMIN_AUTH_SERVICE";
static readonly DELETE_ADMIN_AUTH_SERVICE = "DELETE_ADMIN_AUTH_SERVICE";
static readonly INDIVIDUAL_ADMINS = "INDIVIDUAL_ADMINS";
static readonly EDIT_INDIVIDUAL_ADMIN = "EDIT_INDIVIDUAL_ADMIN";
static readonly DELETE_INDIVIDUAL_ADMIN = "DELETE_INDIVIDUAL_ADMIN";
Expand Down Expand Up @@ -515,31 +511,6 @@ export default class ActionCreator extends BaseActionCreator {
).bind(this);
}

fetchAdminAuthServices() {
const url = "/admin/admin_auth_services";
return this.fetchJSON<AdminAuthServicesData>(
ActionCreator.ADMIN_AUTH_SERVICES,
url
).bind(this);
}

editAdminAuthService(data: FormData) {
const url = "/admin/admin_auth_services";
return this.postForm(ActionCreator.EDIT_ADMIN_AUTH_SERVICE, url, data).bind(
this
);
}

deleteAdminAuthService(identifier: string | number) {
const url = "/admin/admin_auth_service/" + identifier;
return this.postForm(
ActionCreator.DELETE_ADMIN_AUTH_SERVICE,
url,
null,
"DELETE"
).bind(this);
}

fetchIndividualAdmins() {
const url = "/admin/individual_admins";
return this.fetchJSON<IndividualAdminsData>(
Expand Down
69 changes: 0 additions & 69 deletions src/components/AdminAuthServices.tsx
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions src/components/ConfigTabContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import * as React from "react";
import * as PropTypes from "prop-types";
import Libraries from "./Libraries";
import Collections from "./Collections";
import AdminAuthServices from "./AdminAuthServices";
import IndividualAdmins from "./IndividualAdmins";
import PatronAuthServices from "./PatronAuthServices";
import SitewideAnnouncements from "./SitewideAnnouncements";
Expand Down Expand Up @@ -47,7 +46,6 @@ export default class ConfigTabContainer extends TabContainer<
libraries: Libraries,
individualAdmins: IndividualAdmins,
collections: Collections,
adminAuth: AdminAuthServices,
patronAuth: PatronAuthServices,
sitewideSettings: SitewideSettings,
logging: LoggingServices,
Expand All @@ -65,7 +63,6 @@ export default class ConfigTabContainer extends TabContainer<
SYSTEM_ADMIN_TABS = Object.keys(this.COMPONENT_CLASSES);

DISPLAY_NAMES = {
adminAuth: "Admin Authentication",
individualAdmins: "Admins",
patronAuth: "Patron Authentication",
sitewideAnnouncements: "Sitewide Announcements",
Expand Down
6 changes: 0 additions & 6 deletions src/components/__tests__/ConfigTabContainer-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import buildStore from "../../store";
import ConfigTabContainer from "../ConfigTabContainer";
import Libraries from "../Libraries";
import Collections from "../Collections";
import AdminAuthServices from "../AdminAuthServices";
import IndividualAdmins from "../IndividualAdmins";
import PatronAuthServices from "../PatronAuthServices";
import SitewideSettings from "../SitewideSettings";
Expand Down Expand Up @@ -56,7 +55,6 @@ describe("ConfigTabContainer", () => {
expect(linkTexts).to.contain("Libraries");
expect(linkTexts).to.contain("Admins");
expect(linkTexts).to.contain("Collections");
expect(linkTexts).to.contain("Admin Authentication");
expect(linkTexts).to.contain("Patron Authentication");
expect(linkTexts).to.contain("Sitewide Settings");
expect(linkTexts).to.contain("Metadata");
Expand All @@ -69,7 +67,6 @@ describe("ConfigTabContainer", () => {
Libraries,
IndividualAdmins,
Collections,
AdminAuthServices,
PatronAuthServices,
SitewideSettings,
MetadataServices,
Expand Down Expand Up @@ -123,7 +120,6 @@ describe("ConfigTabContainer", () => {
expect(linkTexts).to.contain("Admins");
expect(linkTexts).not.to.contain("Analytics");
expect(linkTexts).not.to.contain("Collections");
expect(linkTexts).not.to.contain("Admin Authentication");
expect(linkTexts).not.to.contain("Patron Authentication");
expect(linkTexts).not.to.contain("Sitewide Settings");
expect(linkTexts).not.to.contain("Metadata");
Expand All @@ -141,7 +137,6 @@ describe("ConfigTabContainer", () => {

const hiddenComponentClasses = [
Collections,
AdminAuthServices,
PatronAuthServices,
SitewideSettings,
MetadataServices,
Expand Down Expand Up @@ -195,7 +190,6 @@ describe("ConfigTabContainer", () => {
const hiddenComponentClasses = [
Collections,
IndividualAdmins,
AdminAuthServices,
PatronAuthServices,
SitewideSettings,
MetadataServices,
Expand Down
6 changes: 0 additions & 6 deletions src/interfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,12 +293,6 @@ export interface PathFor {
(collectionUrl: string, bookUrl: string, tab?: string): string;
}

export interface AdminAuthServiceData extends ServiceData {}

export interface AdminAuthServicesData extends ServicesData {
admin_auth_services: AdminAuthServiceData[];
}

export interface AdminRoleData {
library?: string;
role: string;
Expand Down
8 changes: 0 additions & 8 deletions src/reducers/adminAuthServices.ts
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/reducers/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import stats, { StatsState } from "./stats";
import diagnostics from "./diagnostics";
import libraries from "./libraries";
import collections from "./collections";
import adminAuthServices from "./adminAuthServices";
import individualAdmins from "./individualAdmins";
import patronAuthServices from "./patronAuthServices";
import sitewideAnnouncements from "./sitewideAnnouncements";
Expand Down Expand Up @@ -51,7 +50,6 @@ import patronManager from "./managePatrons";
import {
LibrariesData,
CollectionsData,
AdminAuthServicesData,
IndividualAdminsData,
PatronAuthServicesData,
SitewideAnnouncementsData,
Expand Down Expand Up @@ -87,7 +85,6 @@ export interface State {
diagnostics: FetchEditState<DiagnosticsData>;
libraries: FetchEditState<LibrariesData>;
collections: FetchEditState<CollectionsData>;
adminAuthServices: FetchEditState<AdminAuthServicesData>;
individualAdmins: FetchEditState<IndividualAdminsData>;
patronAuthServices: FetchEditState<PatronAuthServicesData>;
sitewideAnnouncements: FetchEditState<SitewideAnnouncementsData>;
Expand Down Expand Up @@ -134,7 +131,6 @@ export default combineReducers<State>({
diagnostics,
libraries,
collections,
adminAuthServices,
individualAdmins,
patronAuthServices,
sitewideAnnouncements,
Expand Down
1 change: 0 additions & 1 deletion src/stylesheets/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ $fontfamily: 'Open Sans', sans-serif;
@import "colors";
@import "global";

@import "admin_auth_service_edit_form";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't look like the corresponding admin_auth_service_edit_form.scss file has been removed. Do we need to keep that around for anything else?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch 👍 5764977

@import "advanced_search";
@import "announcements";
@import "badge";
Expand Down