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.

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

fix: migrate certificateService to ts #13876

Merged
merged 2 commits into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/AdminSettings/TurnServer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ import NcPasswordField from '@nextcloud/vue/dist/Components/NcPasswordField.js'
import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'

import { isCertificateValid } from '../../services/certificateService.js'
import { isCertificateValid } from '../../services/certificateService.ts'

export default {
name: 'TurnServer',
Expand Down
53 changes: 0 additions & 53 deletions src/services/certificateService.js

This file was deleted.

54 changes: 54 additions & 0 deletions src/services/certificateService.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/**
* SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import axios from '@nextcloud/axios'
import { generateOcsUrl } from '@nextcloud/router'

import type { certificateExpirationParams, certificateExpirationResponse } from '../types/index.ts'

/**
* Retrieves the certificate expiration of the specified host
*
* @param host The host to check the certificate
*/
const getCertificateExpiration = async (host: certificateExpirationParams['host']): certificateExpirationResponse => {
return axios.get(generateOcsUrl('apps/spreed/api/v1/certificate/expiration'), {
params: {
host,
} as certificateExpirationParams,
})
}

/**
* Checks if the certificate of a host is valid
*
* @param host The host to check the certificate
* @return {boolean} true if the certificate is valid, false otherwise
*/
const isCertificateValid = async (host: certificateExpirationParams['host']): Promise<boolean> => {
try {
const response = await getCertificateExpiration(host)

// Null if unable to retrieve the certificates expiration, otherwise the expiration in days (negative if already expired)
const expiration = response.data.ocs.data.expiration_in_days

if (expiration == null) {
console.warn('Unable to check certificate of', host)
return false
} else if (expiration < 0) {
console.error('Certificate of', host, 'expired')
} else {
console.info('Certificate of', host, 'is valid for', expiration, 'days')
}
return expiration > 0
} catch (error) {
console.error(error)
return false
}
}

export {
getCertificateExpiration,
isCertificateValid,
}
4 changes: 4 additions & 0 deletions src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,10 @@ export type getBotsAdminResponse = ApiResponse<operations['bot-admin-list-bots']
export type enableBotResponse = ApiResponse<operations['bot-enable-bot']['responses'][201]['content']['application/json']>
export type disableBotResponse = ApiResponse<operations['bot-disable-bot']['responses'][200]['content']['application/json']>

// Certificate
export type certificateExpirationParams = operations['certificate-get-certificate-expiration']['parameters']['query']
export type certificateExpirationResponse = ApiResponse<operations['certificate-get-certificate-expiration']['responses'][200]['content']['application/json']>

// Federations
export type FederationInvite = components['schemas']['FederationInvite']
type FederationInviteRichParameters = {
Expand Down
Loading