+ content
+
+
+
+
+
+
+
+ 
+
+
@@ -228,8 +230,10 @@ exports[`Render properties.breadcrumb.list - value[0] 1`] = `
>
@@ -435,8 +439,10 @@ exports[`Render properties.content.style - value[0] 1`] = `
>
@@ -608,8 +614,10 @@ exports[`Render properties.footer.style - value[0] 1`] = `
>
@@ -796,8 +804,10 @@ exports[`Render properties.header.color - value[0] 1`] = `
>
@@ -1066,8 +1076,10 @@ exports[`Render properties.header.style - value[0] 1`] = `
>
@@ -1239,8 +1251,10 @@ exports[`Render properties.header.theme: light - value[0] 1`] = `
>
@@ -1499,8 +1513,10 @@ exports[`Render properties.logo.alt - value[0] 1`] = `
>
@@ -1704,6 +1720,268 @@ exports[`Render properties.logo.alt - value[0] 1`] = `
`;
+exports[`Render properties.logo.size - value[0] 1`] = `
+
+
+ 
@@ -1964,6 +2244,268 @@ exports[`Render properties.logo.src - value[0] 1`] = `
+
+
@@ -2192,8 +2736,10 @@ exports[`Render properties.menu - value[0] 1`] = `
>
@@ -2452,8 +2998,10 @@ exports[`Render properties.menu.selectedColor - value[0] 1`] = `
>
@@ -2712,8 +3260,10 @@ exports[`Render properties.sider.color - value[0] 1`] = `
>
@@ -2972,8 +3522,10 @@ exports[`Render properties.sider.initialCollapsed - value[0] 1`] = `
>
@@ -3156,8 +3708,10 @@ exports[`Render properties.sider.style - value[0] 1`] = `
>
@@ -3340,8 +3894,10 @@ exports[`Render properties.sider.theme: dark - value[0] 1`] = `
>
@@ -3513,8 +4069,10 @@ exports[`Render properties.style - value[0] 1`] = `
>
@@ -3686,8 +4244,10 @@ exports[`Render properties.toggleSiderButton.hide - value[0] 1`] = `
>
@@ -3870,8 +4430,10 @@ exports[`Render properties.toggleSiderButton.type - value[0] 1`] = `
>
@@ -4031,10 +4593,18 @@ exports[`Test Schema properties.logo.alt 1`] = `true`;
exports[`Test Schema properties.logo.alt 2`] = `null`;
+exports[`Test Schema properties.logo.size 1`] = `true`;
+
+exports[`Test Schema properties.logo.size 2`] = `null`;
+
exports[`Test Schema properties.logo.src 1`] = `true`;
exports[`Test Schema properties.logo.src 2`] = `null`;
+exports[`Test Schema properties.logo.srcset 1`] = `true`;
+
+exports[`Test Schema properties.logo.srcset 2`] = `null`;
+
exports[`Test Schema properties.logo.style 1`] = `true`;
exports[`Test Schema properties.logo.style 2`] = `null`;
diff --git a/packages/build/src/lowdefySchema.json b/packages/build/src/lowdefySchema.json
index 9f2f0237d..010a48d33 100644
--- a/packages/build/src/lowdefySchema.json
+++ b/packages/build/src/lowdefySchema.json
@@ -54,17 +54,9 @@
"type": "App \"config.auth.openId.rolesField\" should be a string."
}
},
- "logoutFromProvider": {
- "type": "boolean",
- "default": false,
- "description": "If true, the user will be directed to OpenID Connect provider's logout URL. This will log the user out of the provider.",
- "errorMessage": {
- "type": "App \"config.auth.openId.logoutFromProvider\" should be a boolean."
- }
- },
"logoutRedirectUri": {
"type": "string",
- "description": "The URI to redirect the user to after logout.",
+ "description": "The URI to redirect the user to after logout. Can be a Nunjucks template string with client_id, host, id_token_hint, and openid_domain as template data.",
"errorMessage": {
"type": "App \"config.auth.openId.logoutRedirectUri\" should be a string."
}
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8d8f320a5..44bc5f95f 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -59,7 +59,6 @@
"mysql": "2.18.1",
"opener": "1.5.2",
"ora": "5.3.0",
- "oracledb": "5.1.0",
"pg": "8.5.1",
"reload": "3.1.1",
"saslprep": "1.0.3",
diff --git a/packages/docs/menus.yaml b/packages/docs/menus.yaml
index ccbc80f75..3c49fb67d 100644
--- a/packages/docs/menus.yaml
+++ b/packages/docs/menus.yaml
@@ -419,11 +419,11 @@
- id: MySQL
type: MenuLink
pageId: MySQL
- - id: OracleDB
- type: MenuLink
- pageId: OracleDB
- properties:
- title: Oracle Database
+ # - id: OracleDB
+ # type: MenuLink
+ # pageId: OracleDB
+ # properties:
+ # title: Oracle Database
- id: PostgreSQL
type: MenuLink
pageId: PostgreSQL
diff --git a/packages/docs/pages.yaml b/packages/docs/pages.yaml
index 730007ea0..b0f98e527 100644
--- a/packages/docs/pages.yaml
+++ b/packages/docs/pages.yaml
@@ -115,7 +115,7 @@
- _ref: connections/MongoDB.yaml
- _ref: connections/MSSQL.yaml
- _ref: connections/MySQL.yaml
-- _ref: connections/OracleDB.yaml
+# - _ref: connections/OracleDB.yaml
- _ref: connections/PostgreSQL.yaml
- _ref: connections/SendGridMail.yaml
- _ref: connections/SQLite.yaml
diff --git a/packages/graphql/package.json b/packages/graphql/package.json
index d4d4548a3..aca1bae7b 100644
--- a/packages/graphql/package.json
+++ b/packages/graphql/package.json
@@ -62,7 +62,6 @@
"mssql": "6.3.1",
"mysql": "2.18.1",
"openid-client": "4.6.0",
- "oracledb": "5.1.0",
"pg": "8.5.1",
"saslprep": "1.0.3",
"sqlite3": "5.0.2"
diff --git a/packages/graphql/src/controllers/openIdController.js b/packages/graphql/src/controllers/openIdController.js
index 948313bc6..e8b3b2595 100644
--- a/packages/graphql/src/controllers/openIdController.js
+++ b/packages/graphql/src/controllers/openIdController.js
@@ -14,7 +14,8 @@
limitations under the License.
*/
-import { get } from '@lowdefy/helpers';
+import { get, type } from '@lowdefy/helpers';
+import { nunjucksFunction } from '@lowdefy/nunjucks';
import { Issuer } from 'openid-client';
import cookie from 'cookie';
@@ -22,13 +23,12 @@ import { AuthenticationError, ConfigurationError } from '../context/errors';
class OpenIdController {
constructor({ development, getController, getLoader, getSecrets, gqlUri, host, setHeader }) {
- const httpPrefix = development ? 'http' : 'https';
-
+ this.httpPrefix = development ? 'http' : 'https';
this.development = development;
this.componentLoader = getLoader('component');
this.getSecrets = getSecrets;
this.host = host;
- this.redirectUri = `${httpPrefix}://${host}/auth/openid-callback`;
+ this.redirectUri = `${this.httpPrefix}://${this.host}/auth/openid-callback`;
this.gqlUri = gqlUri || '/api/graphql';
this.setHeader = setHeader;
this.tokenController = getController('token');
@@ -63,7 +63,7 @@ class OpenIdController {
});
}
- async authorizationUrl({ input, pageId, urlQuery }) {
+ async authorizationUrl({ authUrlQueryParams, input, pageId, urlQuery }) {
try {
const config = await this.getOpenIdConfig();
if (!config) return null;
@@ -73,15 +73,16 @@ class OpenIdController {
pageId,
urlQuery,
});
- return this.getAuthorizationUrl({ config, state });
+ return this.getAuthorizationUrl({ authUrlQueryParams, config, state });
} catch (error) {
throw new ConfigurationError(error);
}
}
- async getAuthorizationUrl({ config, state }) {
+ async getAuthorizationUrl({ authUrlQueryParams, config, state }) {
const client = await this.getClient({ config });
const url = client.authorizationUrl({
+ ...authUrlQueryParams,
redirect_uri: this.redirectUri,
response_type: 'code',
scope: config.scope || 'openid profile email',
@@ -137,6 +138,17 @@ class OpenIdController {
};
}
+ parseLogoutUrlNunjucks({ config, idToken }) {
+ const template = nunjucksFunction(config.logoutRedirectUri);
+ const templateData = {
+ id_token_hint: idToken,
+ client_id: config.clientId,
+ openid_domain: config.domain,
+ host: encodeURIComponent(`${this.httpPrefix}://${this.host}`),
+ };
+ return template(templateData);
+ }
+
async logoutUrl({ idToken }) {
try {
const setCookieHeader = cookie.serialize('authorization', '', {
@@ -149,18 +161,8 @@ class OpenIdController {
this.setHeader('Set-Cookie', setCookieHeader);
const config = await this.getOpenIdConfig();
- if (!config) return null;
-
- if (config.logoutFromProvider !== true) {
- return config.logoutRedirectUri || null;
- }
-
- const client = await this.getClient({ config });
-
- return client.endSessionUrl({
- id_token_hint: idToken,
- post_logout_redirect_uri: config.logoutRedirectUri,
- });
+ if (!config || !type.isString(config.logoutRedirectUri)) return null;
+ return this.parseLogoutUrlNunjucks({ config, idToken });
} catch (error) {
throw new AuthenticationError(error);
}
diff --git a/packages/graphql/src/controllers/openIdController.test.js b/packages/graphql/src/controllers/openIdController.test.js
index df60e37a4..18c23a8f6 100644
--- a/packages/graphql/src/controllers/openIdController.test.js
+++ b/packages/graphql/src/controllers/openIdController.test.js
@@ -24,8 +24,8 @@ jest.mock('openid-client');
const mockOpenIdAuthorizationUrl = jest.fn(
// eslint-disable-next-line camelcase
- ({ redirect_uri, response_type, scope, state }) =>
- `${redirect_uri}:${response_type}:${scope}:${state}`
+ ({ redirect_uri, response_type, scope, state, ...additional }) =>
+ `${redirect_uri}:${response_type}:${scope}:${state}:${JSON.stringify(additional)}`
);
const mockOpenIdCallback = jest.fn(() => ({
@@ -33,14 +33,9 @@ const mockOpenIdCallback = jest.fn(() => ({
id_token: 'id_token',
}));
-const mockEndSessionUrl = jest.fn(
- ({ id_token_hint, post_logout_redirect_uri }) => `${id_token_hint}:${post_logout_redirect_uri}`
-);
-
const mockClient = jest.fn(() => ({
authorizationUrl: mockOpenIdAuthorizationUrl,
callback: mockOpenIdCallback,
- endSessionUrl: mockEndSessionUrl,
}));
// eslint-disable-next-line no-undef
@@ -189,7 +184,7 @@ describe('authorizationUrl', () => {
],
]);
expect(url).toEqual(
- 'https://host/auth/openid-callback:code:openid profile email:eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpbnB1dCI6eyJpIjp0cnVlfSwibG93ZGVmeV9vcGVuaWRfc3RhdGVfdG9rZW4iOnRydWUsInBhZ2VJZCI6InBhZ2VJZCIsInVybFF1ZXJ5Ijp7InUiOnRydWV9LCJpYXQiOjEsImV4cCI6MzAxLCJhdWQiOiJob3N0IiwiaXNzIjoiaG9zdCJ9.-GLdtCspyagMhdx9z1VootZXXbIdLY3cbzpn5UK8eGI'
+ 'https://host/auth/openid-callback:code:openid profile email:eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpbnB1dCI6eyJpIjp0cnVlfSwibG93ZGVmeV9vcGVuaWRfc3RhdGVfdG9rZW4iOnRydWUsInBhZ2VJZCI6InBhZ2VJZCIsInVybFF1ZXJ5Ijp7InUiOnRydWV9LCJpYXQiOjEsImV4cCI6MzAxLCJhdWQiOiJob3N0IiwiaXNzIjoiaG9zdCJ9.-GLdtCspyagMhdx9z1VootZXXbIdLY3cbzpn5UK8eGI:{}'
);
});
@@ -205,7 +200,7 @@ describe('authorizationUrl', () => {
const openIdController = createOpenIdController(context);
const url = await openIdController.authorizationUrl(authorizationUrlInput);
expect(url).toEqual(
- 'https://host/auth/openid-callback:code:custom scope:eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpbnB1dCI6eyJpIjp0cnVlfSwibG93ZGVmeV9vcGVuaWRfc3RhdGVfdG9rZW4iOnRydWUsInBhZ2VJZCI6InBhZ2VJZCIsInVybFF1ZXJ5Ijp7InUiOnRydWV9LCJpYXQiOjEsImV4cCI6MzAxLCJhdWQiOiJob3N0IiwiaXNzIjoiaG9zdCJ9.-GLdtCspyagMhdx9z1VootZXXbIdLY3cbzpn5UK8eGI'
+ 'https://host/auth/openid-callback:code:custom scope:eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpbnB1dCI6eyJpIjp0cnVlfSwibG93ZGVmeV9vcGVuaWRfc3RhdGVfdG9rZW4iOnRydWUsInBhZ2VJZCI6InBhZ2VJZCIsInVybFF1ZXJ5Ijp7InUiOnRydWV9LCJpYXQiOjEsImV4cCI6MzAxLCJhdWQiOiJob3N0IiwiaXNzIjoiaG9zdCJ9.-GLdtCspyagMhdx9z1VootZXXbIdLY3cbzpn5UK8eGI:{}'
);
});
@@ -230,6 +225,51 @@ describe('authorizationUrl', () => {
ConfigurationError
);
});
+
+ test('authorizationUrl, additional query params', async () => {
+ getSecrets.mockImplementation(() => secrets);
+ const openIdController = createOpenIdController(context);
+ const url = await openIdController.authorizationUrl({
+ authUrlQueryParams: { screen_hint: 'sign-up' },
+ });
+ expect(mockClient.mock.calls).toEqual([
+ [
+ {
+ client_id: 'OPENID_CLIENT_ID',
+ client_secret: 'OPENID_CLIENT_SECRET',
+ redirect_uris: ['https://host/auth/openid-callback'],
+ },
+ ],
+ ]);
+ expect(url).toEqual(
+ 'https://host/auth/openid-callback:code:openid profile email:eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb3dkZWZ5X29wZW5pZF9zdGF0ZV90b2tlbiI6dHJ1ZSwiaWF0IjoxLCJleHAiOjMwMSwiYXVkIjoiaG9zdCIsImlzcyI6Imhvc3QifQ.-UtxdTFvQW6pFFFHTO0EtmubPbkDl8EJQwBQA2pp_M4:{"screen_hint":"sign-up"}'
+ );
+ });
+
+ test('authorizationUrl, additional query do not overwrite fiexed params', async () => {
+ getSecrets.mockImplementation(() => secrets);
+ const openIdController = createOpenIdController(context);
+ const url = await openIdController.authorizationUrl({
+ authUrlQueryParams: {
+ redirect_uri: 'overwritten',
+ response_type: 'overwritten',
+ scope: 'overwritten',
+ state: 'overwritten',
+ },
+ });
+ expect(mockClient.mock.calls).toEqual([
+ [
+ {
+ client_id: 'OPENID_CLIENT_ID',
+ client_secret: 'OPENID_CLIENT_SECRET',
+ redirect_uris: ['https://host/auth/openid-callback'],
+ },
+ ],
+ ]);
+ expect(url).toEqual(
+ 'https://host/auth/openid-callback:code:openid profile email:eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb3dkZWZ5X29wZW5pZF9zdGF0ZV90b2tlbiI6dHJ1ZSwiaWF0IjoxLCJleHAiOjMwMSwiYXVkIjoiaG9zdCIsImlzcyI6Imhvc3QifQ.-UtxdTFvQW6pFFFHTO0EtmubPbkDl8EJQwBQA2pp_M4:{}'
+ );
+ });
});
describe('callback', () => {
@@ -344,7 +384,7 @@ describe('callback', () => {
});
describe('logout', () => {
- test('callback, no openId config', async () => {
+ test('logout, no openId config', async () => {
getSecrets.mockImplementation(() => ({}));
const openIdController = createOpenIdController(context);
const url = await openIdController.logoutUrl(logoutUrlInput);
@@ -357,144 +397,48 @@ describe('logout', () => {
]);
});
- test('callback, logoutFromProvider !== true, no logoutRedirectUri', async () => {
- getSecrets.mockImplementation(() => secrets);
- const openIdController = createOpenIdController(context);
- const url = await openIdController.logoutUrl(logoutUrlInput);
- expect(url).toEqual(null);
- expect(mockEndSessionUrl.mock.calls).toEqual([]);
- expect(setHeader.mock.calls).toEqual([
- [
- 'Set-Cookie',
- 'authorization=; Max-Age=0; Path=/api/graphql; HttpOnly; Secure; SameSite=Lax',
- ],
- ]);
- });
-
- test('callback, logoutFromProvider !== true, with logoutRedirectUri', async () => {
+ test('logout with logoutRedirectUri', async () => {
getSecrets.mockImplementation(() => secrets);
mockLoadComponent.mockImplementation(() => ({
auth: {
openId: {
- logoutRedirectUri: 'logoutRedirectUri',
+ logoutRedirectUri:
+ '{{ openid_domain }}/logout/?id_token_hint={{ id_token_hint }}&client_id={{ client_id }}&return_to={{ host }}%2Flogged-out',
},
},
}));
const openIdController = createOpenIdController(context);
const url = await openIdController.logoutUrl(logoutUrlInput);
- expect(url).toEqual('logoutRedirectUri');
- expect(mockEndSessionUrl.mock.calls).toEqual([]);
- expect(setHeader.mock.calls).toEqual([
- [
- 'Set-Cookie',
- 'authorization=; Max-Age=0; Path=/api/graphql; HttpOnly; Secure; SameSite=Lax',
- ],
- ]);
- });
-
- test('callback, logoutFromProvider, no logoutRedirectUri', async () => {
- getSecrets.mockImplementation(() => secrets);
- mockLoadComponent.mockImplementation(() => ({
- auth: {
- openId: {
- logoutFromProvider: true,
- },
- },
- }));
- const openIdController = createOpenIdController(context);
- const url = await openIdController.logoutUrl(logoutUrlInput);
- expect(mockClient.mock.calls).toEqual([
- [
- {
- client_id: 'OPENID_CLIENT_ID',
- client_secret: 'OPENID_CLIENT_SECRET',
- redirect_uris: ['https://host/auth/openid-callback'],
- },
- ],
- ]);
- expect(url).toEqual('idToken:undefined');
- expect(mockEndSessionUrl.mock.calls).toEqual([
- [
- {
- id_token_hint: 'idToken',
- },
- ],
- ]);
- expect(setHeader.mock.calls).toEqual([
- [
- 'Set-Cookie',
- 'authorization=; Max-Age=0; Path=/api/graphql; HttpOnly; Secure; SameSite=Lax',
- ],
- ]);
- });
-
- test('callback, logoutFromProvider, with logoutRedirectUri', async () => {
- getSecrets.mockImplementation(() => secrets);
- mockLoadComponent.mockImplementation(() => ({
- auth: {
- openId: {
- logoutFromProvider: true,
- logoutRedirectUri: 'logoutRedirectUri',
- },
- },
- }));
- const openIdController = createOpenIdController(context);
- const url = await openIdController.logoutUrl(logoutUrlInput);
- expect(mockClient.mock.calls).toEqual([
- [
- {
- client_id: 'OPENID_CLIENT_ID',
- client_secret: 'OPENID_CLIENT_SECRET',
- redirect_uris: ['https://host/auth/openid-callback'],
- },
- ],
- ]);
- expect(url).toEqual('idToken:logoutRedirectUri');
- expect(mockEndSessionUrl.mock.calls).toEqual([
- [
- {
- id_token_hint: 'idToken',
- post_logout_redirect_uri: 'logoutRedirectUri',
- },
- ],
- ]);
- expect(setHeader.mock.calls).toEqual([
- [
- 'Set-Cookie',
- 'authorization=; Max-Age=0; Path=/api/graphql; HttpOnly; Secure; SameSite=Lax',
- ],
- ]);
- });
-
- test('callback, logoutFromProvider, error', async () => {
- getSecrets.mockImplementation(() => secrets);
- mockLoadComponent.mockImplementation(() => ({
- auth: {
- openId: {
- logoutFromProvider: true,
- },
- },
- }));
- const openIdController = createOpenIdController(context);
- mockEndSessionUrl.mockImplementationOnce(() => {
- throw new Error('OpenId End Session Error');
- });
- await expect(openIdController.logoutUrl(logoutUrlInput)).rejects.toThrow(AuthenticationError);
- mockEndSessionUrl.mockImplementationOnce(() => {
- throw new Error('OpenId End Session Error');
- });
- await expect(openIdController.logoutUrl(logoutUrlInput)).rejects.toThrow(
- 'Error: OpenId End Session Error'
+ expect(url).toEqual(
+ 'OPENID_DOMAIN/logout/?id_token_hint=idToken&client_id=OPENID_CLIENT_ID&return_to=https%3A%2F%2Fhost%2Flogged-out'
);
expect(setHeader.mock.calls).toEqual([
[
'Set-Cookie',
'authorization=; Max-Age=0; Path=/api/graphql; HttpOnly; Secure; SameSite=Lax',
],
- [
- 'Set-Cookie',
- 'authorization=; Max-Age=0; Path=/api/graphql; HttpOnly; Secure; SameSite=Lax',
- ],
+ ]);
+ });
+
+ test('logout with logoutRedirectUri, development true', async () => {
+ getSecrets.mockImplementation(() => secrets);
+ mockLoadComponent.mockImplementation(() => ({
+ auth: {
+ openId: {
+ logoutRedirectUri:
+ '{{ openid_domain }}/logout/?id_token_hint={{ id_token_hint }}&client_id={{ client_id }}&return_to={{ host }}%2Flogged-out',
+ },
+ },
+ }));
+ const devOpenIdController = createOpenIdController(
+ testBootstrapContext({ getSecrets, host: 'host', loaders, development: true, setHeader })
+ );
+ const url = await devOpenIdController.logoutUrl(logoutUrlInput);
+ expect(url).toEqual(
+ 'OPENID_DOMAIN/logout/?id_token_hint=idToken&client_id=OPENID_CLIENT_ID&return_to=http%3A%2F%2Fhost%2Flogged-out'
+ );
+ expect(setHeader.mock.calls).toEqual([
+ ['Set-Cookie', 'authorization=; Max-Age=0; Path=/api/graphql; HttpOnly; SameSite=Lax'],
]);
});
@@ -516,4 +460,18 @@ describe('logout', () => {
],
]);
});
+
+ test('logout with logoutRedirectUri, invalid template', async () => {
+ getSecrets.mockImplementation(() => secrets);
+ mockLoadComponent.mockImplementation(() => ({
+ auth: {
+ openId: {
+ logoutRedirectUri: '{{ openid_domain ',
+ },
+ },
+ }));
+ const openIdController = createOpenIdController(context);
+ expect(openIdController.logoutUrl(logoutUrlInput)).rejects.toThrow(AuthenticationError);
+ expect(openIdController.logoutUrl(logoutUrlInput)).rejects.toThrow('Template render error');
+ });
});
diff --git a/packages/graphql/src/resolvers/queries/auth/openIdLogoutUrl.test.js b/packages/graphql/src/resolvers/queries/auth/openIdLogoutUrl.test.js
index f1a0296dc..f5a927443 100644
--- a/packages/graphql/src/resolvers/queries/auth/openIdLogoutUrl.test.js
+++ b/packages/graphql/src/resolvers/queries/auth/openIdLogoutUrl.test.js
@@ -17,7 +17,6 @@
// eslint-disable-next-line no-unused-vars
import { gql } from 'apollo-server';
import runTestQuery from '../../../test/runTestQuery';
-import { Issuer } from 'openid-client';
import openIdLogoutUrl from './openIdLogoutUrl';
@@ -33,19 +32,6 @@ const getController = jest.fn((name) => {
}
});
-// OpenID mocks
-const mockEndSessionUrl = jest.fn(
- ({ id_token_hint, post_logout_redirect_uri }) => `${id_token_hint}:${post_logout_redirect_uri}`
-);
-
-const mockClient = jest.fn(() => ({
- endSessionUrl: mockEndSessionUrl,
-}));
-
-Issuer.discover = jest.fn(() => ({
- Client: mockClient,
-}));
-
const secrets = {
OPENID_CLIENT_ID: 'OPENID_CLIENT_ID',
OPENID_CLIENT_SECRET: 'OPENID_CLIENT_SECRET',
@@ -56,8 +42,8 @@ const secrets = {
const mockLoadComponent = jest.fn(() => ({
auth: {
openId: {
- logoutFromProvider: true,
- logoutRedirectUri: 'logoutRedirectUri',
+ logoutRedirectUri:
+ '{{ openid_domain }}/logout/?id_token_hint={{ id_token_hint }}&client_id={{ client_id }}&return_to={{ host }}%2Flogged-out',
},
},
}));
@@ -97,7 +83,8 @@ test('openIdLogoutUrl graphql', async () => {
});
expect(res.errors).toBe(undefined);
expect(res.data).toEqual({
- openIdLogoutUrl: 'idToken:logoutRedirectUri',
+ openIdLogoutUrl:
+ 'OPENID_DOMAIN/logout/?id_token_hint=idToken&client_id=OPENID_CLIENT_ID&return_to=https%3A%2F%2Fhost%2Flogged-out',
});
expect(setHeader.mock.calls).toEqual([
['Set-Cookie', 'authorization=; Max-Age=0; Path=/api/graphql; HttpOnly; Secure; SameSite=Lax'],
diff --git a/packages/graphql/src/schema.js b/packages/graphql/src/schema.js
index 7ea707b8c..80ee73ad8 100644
--- a/packages/graphql/src/schema.js
+++ b/packages/graphql/src/schema.js
@@ -71,6 +71,7 @@ const typeDefs = gql`
}
input OpenIdAuthorizationUrlInput {
+ authUrlQueryParams: JSON
input: JSON
pageId: String
urlQuery: JSON
diff --git a/packages/renderer/src/utils/auth/createLogin.js b/packages/renderer/src/utils/auth/createLogin.js
index 1f556e163..cb8299783 100644
--- a/packages/renderer/src/utils/auth/createLogin.js
+++ b/packages/renderer/src/utils/auth/createLogin.js
@@ -24,13 +24,14 @@ const GET_LOGIN = gql`
`;
function createLogin({ client, window }) {
- async function login({ input, pageId, urlQuery } = {}) {
+ async function login({ authUrlQueryParams, input, pageId, urlQuery } = {}) {
try {
const { data } = await client.query({
query: GET_LOGIN,
fetchPolicy: 'network-only',
variables: {
openIdAuthorizationUrlInput: {
+ authUrlQueryParams,
input,
pageId,
urlQuery,
diff --git a/packages/renderer/src/utils/auth/createLogout.js b/packages/renderer/src/utils/auth/createLogout.js
index f9bece3af..1ab1f9f65 100644
--- a/packages/renderer/src/utils/auth/createLogout.js
+++ b/packages/renderer/src/utils/auth/createLogout.js
@@ -26,17 +26,17 @@ function createLogout(lowdefy) {
async function logout() {
try {
lowdefy.user = {};
+ const idToken = lowdefy.localStorage.getItem('idToken');
lowdefy.localStorage.setItem(`idToken`, '');
const { data } = await lowdefy.client.query({
query: GET_LOGOUT,
fetchPolicy: 'network-only',
variables: {
openIdLogoutUrlInput: {
- idToken: '',
+ idToken,
},
},
});
- // TODO: should we call link??
lowdefy.window.location.href = data.openIdLogoutUrl || lowdefy.window.location.origin;
} catch (error) {
throw new Error(error);
diff --git a/yarn.lock b/yarn.lock
index fda8df87f..aa1ca57b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3395,7 +3395,6 @@ __metadata:
mssql: 6.3.1
mysql: 2.18.1
openid-client: 4.6.0
- oracledb: 5.1.0
pg: 8.5.1
saslprep: 1.0.3
sqlite3: 5.0.2
@@ -14188,7 +14187,6 @@ fsevents@^1.2.7:
mysql: 2.18.1
opener: 1.5.2
ora: 5.3.0
- oracledb: 5.1.0
pg: 8.5.1
react: 17.0.2
react-dom: 17.0.2
@@ -16180,13 +16178,6 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
-"oracledb@npm:5.1.0":
- version: 5.1.0
- resolution: "oracledb@npm:5.1.0"
- checksum: c4dd2c6ac05b2c71f81ed61a17c71b694e9821f1ad2ca6b14ccc5681dd928e26fb0ba043fb0daf306b055329492186162b1aceddabd048eedd027645ed3afdaf
- languageName: node
- linkType: hard
-
"original@npm:^1.0.0":
version: 1.0.2
resolution: "original@npm:1.0.2"