From 5631d9f6275aa6f9c240d2b6ce10ff7fc7db7126 Mon Sep 17 00:00:00 2001 From: Gordon Nicholas Date: Wed, 26 Feb 2025 17:09:44 +0100 Subject: [PATCH] N21-1890 remove iserv impl --- .../administration/AuthSystems.unit.js | 6 +- .../administration/GeneralSettings.unit.js | 2 +- src/serverApi/v3/api.ts | 60 ++++++++++++++++--- src/store/schools.ts | 3 +- src/store/schools.unit.ts | 14 ----- 5 files changed, 56 insertions(+), 29 deletions(-) diff --git a/src/components/organisms/administration/AuthSystems.unit.js b/src/components/organisms/administration/AuthSystems.unit.js index a20bab37b1..2e112849d5 100644 --- a/src/components/organisms/administration/AuthSystems.unit.js +++ b/src/components/organisms/administration/AuthSystems.unit.js @@ -19,8 +19,8 @@ const generateProps = () => ({ schoolSystemResponseFactory.build({ id: "2", type: "ldap", - ldapConfig: { provider: "iserv-idm" }, - oauthConfig: { provider: "iserv-idm" }, + ldapConfig: { provider: "mock-idm" }, + oauthConfig: { provider: "mock-idm" }, }), // deletable: false, editable: false schoolSystemResponseFactory.build({ id: "3", @@ -215,7 +215,7 @@ describe("AuthSystems", () => { tableCell[2].find(searchStrings.editSystemButton).exists() ).toStrictEqual(false); - // { _id: "2", type: "ldap", ldapConfig: { provider: "iserv-idm" } }, // deletable: false, editable: false + // { _id: "2", type: "ldap", ldapConfig: { provider: "mock-idm" } }, // deletable: false, editable: false expect( tableCell[5].find(searchStrings.deleteSystemButton).exists() ).toStrictEqual(false); diff --git a/src/components/organisms/administration/GeneralSettings.unit.js b/src/components/organisms/administration/GeneralSettings.unit.js index 093cbee149..7ed4db4fde 100644 --- a/src/components/organisms/administration/GeneralSettings.unit.js +++ b/src/components/organisms/administration/GeneralSettings.unit.js @@ -58,7 +58,7 @@ const syncedSystem = [ _id: "0000d186816abba584714c90", type: "ldap", ldapConfig: { - provider: "iserv-idm", + provider: "general", }, }, ]; diff --git a/src/serverApi/v3/api.ts b/src/serverApi/v3/api.ts index 64adb382c4..b402e2ac81 100644 --- a/src/serverApi/v3/api.ts +++ b/src/serverApi/v3/api.ts @@ -1249,10 +1249,10 @@ export interface ComponentInternalPropsImpl { export interface ComponentLernstorePropsImpl { /** * resources of a Lernstore component - * @type {Array} + * @type {Array} * @memberof ComponentLernstorePropsImpl */ - resources: Array; + resources: Array; } /** * @@ -1693,6 +1693,12 @@ export interface ConfigResponse { * @memberof ConfigResponse */ FEATURE_VIDIS_MEDIA_ACTIVATIONS_ENABLED: boolean; + /** + * + * @type {object} + * @memberof ConfigResponse + */ + LICENSE_SUMMARY_URL: object; } /** * @@ -4256,6 +4262,43 @@ export interface LdapAuthorizationBodyParams { */ schoolId: string; } +/** + * + * @export + * @interface LernstoreResources + */ +export interface LernstoreResources { + /** + * client + * @type {string} + * @memberof LernstoreResources + */ + client: string; + /** + * description + * @type {string} + * @memberof LernstoreResources + */ + description: string; + /** + * merlinReference + * @type {string} + * @memberof LernstoreResources + */ + merlinReference?: string; + /** + * title + * @type {string} + * @memberof LernstoreResources + */ + title: string; + /** + * url + * @type {string} + * @memberof LernstoreResources + */ + url?: string; +} /** * * @export @@ -6784,7 +6827,7 @@ export interface ParentConsentResponse { */ export interface PassOwnershipBodyParams { /** - * The IDs of the users + * The ID of the user * @type {string} * @memberof PassOwnershipBodyParams */ @@ -8998,7 +9041,6 @@ export enum SystemType { TspBase = 'tsp-base', TspSchool = 'tsp-school', Local = 'local', - Iserv = 'iserv', Lernsax = 'lernsax', Itslearning = 'itslearning', Moodle = 'moodle' @@ -21177,7 +21219,7 @@ export const RoomApiAxiosParamCreator = function (configuration?: Configuration) * * @summary Get a list of rooms. * @param {number} [skip] Number of elements (not pages) to be skipped - * @param {number} [limit] Page limit, defaults to 10. + * @param {number} [limit] Page limit, defaults to 1000. * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -21448,7 +21490,7 @@ export const RoomApiFp = function(configuration?: Configuration) { * * @summary Get a list of rooms. * @param {number} [skip] Number of elements (not pages) to be skipped - * @param {number} [limit] Page limit, defaults to 10. + * @param {number} [limit] Page limit, defaults to 1000. * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -21588,7 +21630,7 @@ export const RoomApiFactory = function (configuration?: Configuration, basePath? * * @summary Get a list of rooms. * @param {number} [skip] Number of elements (not pages) to be skipped - * @param {number} [limit] Page limit, defaults to 10. + * @param {number} [limit] Page limit, defaults to 1000. * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -21723,7 +21765,7 @@ export interface RoomApiInterface { * * @summary Get a list of rooms. * @param {number} [skip] Number of elements (not pages) to be skipped - * @param {number} [limit] Page limit, defaults to 10. + * @param {number} [limit] Page limit, defaults to 1000. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof RoomApiInterface @@ -21874,7 +21916,7 @@ export class RoomApi extends BaseAPI implements RoomApiInterface { * * @summary Get a list of rooms. * @param {number} [skip] Number of elements (not pages) to be skipped - * @param {number} [limit] Page limit, defaults to 10. + * @param {number} [limit] Page limit, defaults to 1000. * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof RoomApi diff --git a/src/store/schools.ts b/src/store/schools.ts index 89de0b3868..666936246b 100644 --- a/src/store/schools.ts +++ b/src/store/schools.ts @@ -161,8 +161,7 @@ export default class SchoolsModule extends VuexModule { system.type === "tsp-school" || system.type === "oauth" || (system.type === "ldap" && - (system.ldapConfig?.provider === "iserv-idm" || - system.ldapConfig?.provider === "univention" || + (system.ldapConfig?.provider === "univention" || system.ldapConfig?.provider === "general")) ); } diff --git a/src/store/schools.unit.ts b/src/store/schools.unit.ts index 7c0152f184..1e3d46a136 100644 --- a/src/store/schools.unit.ts +++ b/src/store/schools.unit.ts @@ -544,20 +544,6 @@ describe("schools module", () => { }); describe("getIsSynced", () => { - it("should return correct sync status for iserv-idm schools", () => { - const schoolsModule = new SchoolsModule({}); - const systems = [ - schoolSystemResponseFactory.build({ - id: "id_1", - type: "ldap", - ldapConfig: { - provider: "iserv-idm", - }, - }), - ]; - schoolsModule.setSystems(systems); - expect(schoolsModule.schoolIsSynced).toStrictEqual(true); - }); it("should return correct sync status for univention schools", () => { const schoolsModule = new SchoolsModule({}); const systems = [