Skip to content

Commit

Permalink
N21-1890 remove iserv impl
Browse files Browse the repository at this point in the history
  • Loading branch information
GordonNicholasCap committed Feb 26, 2025
1 parent 0ba2656 commit 5631d9f
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 29 deletions.
6 changes: 3 additions & 3 deletions src/components/organisms/administration/AuthSystems.unit.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const syncedSystem = [
_id: "0000d186816abba584714c90",
type: "ldap",
ldapConfig: {
provider: "iserv-idm",
provider: "general",
},
},
];
Expand Down
60 changes: 51 additions & 9 deletions src/serverApi/v3/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1249,10 +1249,10 @@ export interface ComponentInternalPropsImpl {
export interface ComponentLernstorePropsImpl {
/**
* resources of a Lernstore component
* @type {Array<string>}
* @type {Array<LernstoreResources>}
* @memberof ComponentLernstorePropsImpl
*/
resources: Array<string>;
resources: Array<LernstoreResources>;
}
/**
*
Expand Down Expand Up @@ -1693,6 +1693,12 @@ export interface ConfigResponse {
* @memberof ConfigResponse
*/
FEATURE_VIDIS_MEDIA_ACTIVATIONS_ENABLED: boolean;
/**
*
* @type {object}
* @memberof ConfigResponse
*/
LICENSE_SUMMARY_URL: object;
}
/**
*
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -6784,7 +6827,7 @@ export interface ParentConsentResponse {
*/
export interface PassOwnershipBodyParams {
/**
* The IDs of the users
* The ID of the user
* @type {string}
* @memberof PassOwnershipBodyParams
*/
Expand Down Expand Up @@ -8998,7 +9041,6 @@ export enum SystemType {
TspBase = 'tsp-base',
TspSchool = 'tsp-school',
Local = 'local',
Iserv = 'iserv',
Lernsax = 'lernsax',
Itslearning = 'itslearning',
Moodle = 'moodle'
Expand Down Expand Up @@ -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}
*/
Expand Down Expand Up @@ -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}
*/
Expand Down Expand Up @@ -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}
*/
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/store/schools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
);
}
Expand Down
14 changes: 0 additions & 14 deletions src/store/schools.unit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down

0 comments on commit 5631d9f

Please sign in to comment.