Merge pull request 'Use the server's renamed registry capability and web interface client' (#12) from fork/rename-upstream-identifiers into main
Reviewed-on: #12
This commit was merged in pull request #12.
This commit is contained in:
@@ -36,17 +36,17 @@ describe('getOAuthClientId', () => {
|
|||||||
|
|
||||||
it('falls back to the built-in default when the placeholder is empty', async () => {
|
it('falls back to the built-in default when the placeholder is empty', async () => {
|
||||||
const getOAuthClientId = await loadWithMeta('<meta name="oauth-client-id" content="" />');
|
const getOAuthClientId = await loadWithMeta('<meta name="oauth-client-id" content="" />');
|
||||||
expect(getOAuthClientId()).toBe('stalwart-webui');
|
expect(getOAuthClientId()).toBe('inbuxa-webui');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('falls back to the built-in default when the placeholder is only whitespace', async () => {
|
it('falls back to the built-in default when the placeholder is only whitespace', async () => {
|
||||||
const getOAuthClientId = await loadWithMeta('<meta name="oauth-client-id" content=" " />');
|
const getOAuthClientId = await loadWithMeta('<meta name="oauth-client-id" content=" " />');
|
||||||
expect(getOAuthClientId()).toBe('stalwart-webui');
|
expect(getOAuthClientId()).toBe('inbuxa-webui');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('falls back to the built-in default when the placeholder is absent', async () => {
|
it('falls back to the built-in default when the placeholder is absent', async () => {
|
||||||
const getOAuthClientId = await loadWithMeta('');
|
const getOAuthClientId = await loadWithMeta('');
|
||||||
expect(getOAuthClientId()).toBe('stalwart-webui');
|
expect(getOAuthClientId()).toBe('inbuxa-webui');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('is inbuxa-admin when hosted apart from the server', async () => {
|
it('is inbuxa-admin when hosted apart from the server', async () => {
|
||||||
|
|||||||
@@ -9,10 +9,10 @@
|
|||||||
|
|
||||||
// INBUXA requires OAuth clients to be registered, and registers these two on
|
// INBUXA requires OAuth clients to be registered, and registers these two on
|
||||||
// every start (inbuxa-server contract C-6). Served by the server itself, this
|
// every start (inbuxa-server contract C-6). Served by the server itself, this
|
||||||
// is the web interface at /admin, registered as `stalwart-webui`. Hosted
|
// is the web interface at /admin, registered as `inbuxa-webui`. Hosted
|
||||||
// anywhere else, with the server's address in <meta name="api-base-url">, it
|
// anywhere else, with the server's address in <meta name="api-base-url">, it
|
||||||
// is INBUXA Admin, registered as `inbuxa-admin` from INBUXA_ADMIN_URL.
|
// is INBUXA Admin, registered as `inbuxa-admin` from INBUXA_ADMIN_URL.
|
||||||
const SERVED_BY_SERVER_CLIENT_ID = 'stalwart-webui';
|
const SERVED_BY_SERVER_CLIENT_ID = 'inbuxa-webui';
|
||||||
const HOSTED_ELSEWHERE_CLIENT_ID = 'inbuxa-admin';
|
const HOSTED_ELSEWHERE_CLIENT_ID = 'inbuxa-admin';
|
||||||
|
|
||||||
let cached: string | undefined;
|
let cached: string | undefined;
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import type { Schema } from '@/types/schema';
|
|||||||
|
|
||||||
const JMAP_USING = [
|
const JMAP_USING = [
|
||||||
'urn:ietf:params:jmap:core',
|
'urn:ietf:params:jmap:core',
|
||||||
'urn:stalwart:jmap',
|
'urn:inbuxa:jmap:registry',
|
||||||
'urn:ietf:params:jmap:blob',
|
'urn:ietf:params:jmap:blob',
|
||||||
'urn:ietf:params:jmap:mail',
|
'urn:ietf:params:jmap:mail',
|
||||||
'urn:ietf:params:jmap:calendars',
|
'urn:ietf:params:jmap:calendars',
|
||||||
|
|||||||
Reference in New Issue
Block a user