mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-13 14:44:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove gitlab api version option

Browse source 
Signed-off-by: Yannick Bungers <git@innay.de>
This commit is contained in:
Yannick Bungers 2023-10-07 13:32:28 +02:00 • committed by David Mehren
parent c34176ef85
commit 7a41cce94f
3 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
backend/src/config/auth.config.ts
View file

@ -7,7 +7,7 @@ import { registerAs } from '@nestjs/config';
import * as fs from 'fs'; import * as fs from 'fs';
import * as Joi from 'joi'; import * as Joi from 'joi';
import { GitlabScope, GitlabVersion } from './gitlab.enum'; import { GitlabScope} from './gitlab.enum';
import { import {
buildErrorMessage, buildErrorMessage,
ensureNoDuplicatesExist, ensureNoDuplicatesExist,
@ -57,7 +57,6 @@ export interface AuthConfig {
clientID: string; clientID: string;
clientSecret: string; clientSecret: string;
scope: GitlabScope; scope: GitlabScope;
version: GitlabVersion;
}[]; }[];
// ToDo: tlsOptions exist in config.json.example. See https://nodejs.org/api/tls.html#tls_tls_connect_options_callback // ToDo: tlsOptions exist in config.json.example. See https://nodejs.org/api/tls.html#tls_tls_connect_options_callback
ldap: LDAPConfig[]; ldap: LDAPConfig[];
@ -143,10 +142,6 @@ const authSchema = Joi.object({
.valid(...Object.values(GitlabScope)) .valid(...Object.values(GitlabScope))
.default(GitlabScope.READ_USER) .default(GitlabScope.READ_USER)
.optional(), .optional(),
version: Joi.string()
.valid(...Object.values(GitlabVersion))
.default(GitlabVersion.V4)
.optional(),
}).optional(), }).optional(),
) )
.optional(), .optional(),

6
backend/src/config/gitlab.enum.ts
View file

@ -8,9 +8,3 @@ export enum GitlabScope {
READ_USER = 'read_user', READ_USER = 'read_user',
API = 'api', API = 'api',
} }
// ToDo: Evaluate if V3 is really necessary anymore (it's deprecated since 2017)
export enum GitlabVersion {
V3 = 'v3',
V4 = 'v4',
}

3
backend/src/frontend-config/frontend-config.service.spec.ts
View file

@ -12,7 +12,7 @@ import { AuthConfig } from '../config/auth.config';
import { CustomizationConfig } from '../config/customization.config'; import { CustomizationConfig } from '../config/customization.config';
import { DefaultAccessLevel } from '../config/default-access-level.enum'; import { DefaultAccessLevel } from '../config/default-access-level.enum';
import { ExternalServicesConfig } from '../config/external-services.config'; import { ExternalServicesConfig } from '../config/external-services.config';
import { GitlabScope, GitlabVersion } from '../config/gitlab.enum'; import { GitlabScope } from '../config/gitlab.enum';
import { GuestAccess } from '../config/guest_access.enum'; import { GuestAccess } from '../config/guest_access.enum';
import { Loglevel } from '../config/loglevel.enum'; import { Loglevel } from '../config/loglevel.enum';
import { NoteConfig } from '../config/note.config'; import { NoteConfig } from '../config/note.config';
@ -70,7 +70,6 @@ describe('FrontendConfigService', () => {
clientID: 'gitlabTestId', clientID: 'gitlabTestId',
clientSecret: 'gitlabTestSecret', clientSecret: 'gitlabTestSecret',
scope: GitlabScope.API, scope: GitlabScope.API,
version: GitlabVersion.V4,
}, },
]; ];
const ldap: AuthConfig['ldap'] = [ const ldap: AuthConfig['ldap'] = [