Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
0625504
Merge branch 'master' into prod-release-07-03-2024
martin-trajanovski Mar 7, 2024
0cd50ff
Merge pull request #285 from UserOfficeProject/prod-release-07-03-2024
martin-trajanovski Mar 7, 2024
1b72a53
chore: cleanup removed user fields
yoganandaness Feb 2, 2026
0512020
Merge pull request #635 from UserOfficeProject/SWAP-5210-view-connect…
yoganandaness Feb 2, 2026
37f65a3
feat: implement retry logic for discovering persons in One Identity
yoganandaness Mar 5, 2026
e1cff59
fixed comments
yoganandaness Mar 9, 2026
923a6f6
fix: change error logging to warning for retry attempts in One Identi…
janosbabik Mar 12, 2026
2079cce
feat: enhance retry logic to include total attempts in One Identity i…
janosbabik Mar 12, 2026
13c48c9
Merge pull request #636 from UserOfficeProject/feat-oim-sync-retry
yoganandaness Mar 12, 2026
1a28e29
feat: update visitor handling in proposal and visit synchronisation l…
janosbabik Mar 16, 2026
632cfd6
Merge branch 'develop' into merge-back-v1-release
janosbabik Mar 16, 2026
148d36e
Merge pull request #639 from UserOfficeProject/merge-back-v1-release
janosbabik Mar 16, 2026
98d214d
Merge pull request #640 from UserOfficeProject/develop
janosbabik Mar 16, 2026
082c728
Merge pull request #641 from UserOfficeProject/master
janosbabik Mar 19, 2026
3edafcf
feat: enhance user-person connection handling in One Identity integra…
janosbabik Mar 20, 2026
80a6702
chore: bump packages and apply required compatibility changes (#643)
janosbabik Mar 20, 2026
8c3ad74
build(deps): bump lodash from 4.17.21 to 4.17.23
dependabot[bot] Mar 20, 2026
2da126f
Merge pull request #644 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Mar 20, 2026
b0500b6
build(deps): bump diff from 4.0.2 to 4.0.4
dependabot[bot] Mar 20, 2026
2c2cf94
Merge pull request #645 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Mar 20, 2026
a629878
Merge pull request #646 from UserOfficeProject/develop
janosbabik Mar 23, 2026
976ea83
Merge pull request #647 from UserOfficeProject/master
janosbabik Mar 23, 2026
7ced299
build(deps): bump knex from 3.1.0 to 3.2.4
dependabot[bot] Mar 23, 2026
80d9387
Merge pull request #650 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Mar 23, 2026
9b0dcb1
build(deps-dev): bump @typescript-eslint/parser from 8.57.1 to 8.57.2
dependabot[bot] Mar 23, 2026
880029f
Merge pull request #649 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Mar 23, 2026
1f03273
build(deps-dev): bump handlebars from 4.7.8 to 4.7.9
dependabot[bot] Mar 27, 2026
6e6aeae
Merge pull request #654 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Mar 27, 2026
486bfe0
build(deps-dev): bump picomatch from 2.3.1 to 2.3.2
dependabot[bot] Mar 27, 2026
1561bf4
Merge pull request #656 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Mar 27, 2026
5307f83
build(deps-dev): bump brace-expansion from 1.1.12 to 1.1.13
dependabot[bot] Mar 27, 2026
bfa1c82
Merge pull request #657 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Mar 27, 2026
4261175
build(deps): bump path-to-regexp from 8.3.0 to 8.4.0
dependabot[bot] Mar 28, 2026
6a75617
Merge pull request #658 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Mar 28, 2026
fe29c52
build(deps-dev): bump @types/pg from 8.18.0 to 8.20.0
dependabot[bot] Mar 30, 2026
3f27407
Merge pull request #659 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Mar 30, 2026
406f430
build(deps-dev): bump eslint-plugin-jest from 29.15.0 to 29.15.1
dependabot[bot] Apr 6, 2026
56c7607
Merge pull request #662 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Apr 6, 2026
0fb9108
build(deps): bump axios from 1.13.6 to 1.15.0
dependabot[bot] Apr 12, 2026
e6cd1eb
Merge pull request #664 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Apr 12, 2026
9be7317
build(deps-dev): bump @typescript-eslint/parser from 8.57.2 to 8.58.2
dependabot[bot] Apr 13, 2026
5e00ef3
Merge pull request #665 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Apr 13, 2026
801304f
build(deps): bump follow-redirects from 1.15.11 to 1.16.0
dependabot[bot] Apr 15, 2026
2f39ba6
Merge pull request #667 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Apr 15, 2026
3b9c4f4
build(deps-dev): bump @eslint/compat from 2.0.3 to 2.0.5
dependabot[bot] Apr 21, 2026
de59292
Merge pull request #668 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Apr 21, 2026
536335a
build(deps-dev): bump @typescript-eslint/parser from 8.58.2 to 8.59.1
dependabot[bot] Apr 28, 2026
67cd690
Merge pull request #672 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Apr 28, 2026
155efd9
feat: enforce serial message processing in OneIdentityIntegrationQueu…
janosbabik Apr 29, 2026
085e0b7
chore: release new image
janosbabik Apr 29, 2026
4933f77
chore: sync master back to develop after v2.2.0 release
janosbabik Apr 29, 2026
c0d878f
build(deps-dev): bump eslint-plugin-jest from 29.15.1 to 29.15.2
dependabot[bot] May 5, 2026
1dd5f65
Merge pull request #675 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] May 5, 2026
c972a78
build(deps): bump axios from 1.15.0 to 1.15.2
dependabot[bot] May 5, 2026
a9db280
Merge pull request #678 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] May 5, 2026
5daf495
feat: sync proposals, experiments and samples to SciCat from UOS
Junjiequan May 22, 2026
81944f2
build(deps): bump qs from 6.15.0 to 6.15.2
dependabot[bot] May 23, 2026
65318e6
Merge pull request #682 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] May 23, 2026
6bd9285
build(deps-dev): bump lint-staged from 16.4.0 to 17.0.5
dependabot[bot] May 23, 2026
000d534
feat(oneidentity): add VISIT_UPDATED flow for access sync
yoganandaness May 22, 2026
3a0fd9c
fix: apply buffer days to system access ValidUntil on update (same as…
Copilot May 26, 2026
e71e430
fix: update axios to 1.15.2 to address security vulnerabilities
Copilot May 26, 2026
c528579
fix: address review comments - fix updateEntity return type and rever…
Copilot May 26, 2026
58cf248
merge: resolve conflicts with origin/develop
Copilot May 26, 2026
9a80d14
Validate system access exists before updating site access in One Iden…
Copilot May 26, 2026
fa174e7
fix: remove unnecessary toString conversion for visitId in access han…
yoganandaness May 26, 2026
e2b3758
refactor: replace createPersonWantsOrg and updatePersonWantsOrg with …
yoganandaness May 26, 2026
4263c65
fix: mock Date.now for system access update and use it in upsertPerso…
yoganandaness May 26, 2026
a324bec
fix: use proposalId for permission check (#684)
Junjiequan May 26, 2026
ad5eadc
Merge branch 'develop' into feat-oim-sync-retry
janosbabik May 26, 2026
fe851de
fix: update getProposal graphQl query (#685)
Junjiequan May 27, 2026
aee4f05
Merge branch 'develop' into feat-oim-sync-retry
yoganandaness May 27, 2026
e045c07
Merge branch 'develop' into dependabot-npm_and_yarn-lint-staged-17.0.4
yoganandaness May 27, 2026
3f181e5
Merge pull request #679 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] May 27, 2026
bb55416
Merge branch 'develop' into feat-oim-sync-retry
yoganandaness May 28, 2026
55661d0
Merge pull request #681 from UserOfficeProject/feat-oim-sync-retry
yoganandaness May 28, 2026
7dd9e1c
fix: remove shortCode from UOStatus type (#686)
Junjiequan May 29, 2026
db29bf5
build(deps): bump axios from 1.15.2 to 1.16.0
dependabot[bot] May 29, 2026
5b15301
Merge pull request #687 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] May 29, 2026
75cde66
build(deps-dev): bump ts-jest from 29.4.6 to 29.4.11
dependabot[bot] Jun 3, 2026
da0d5e2
Merge pull request #688 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Jun 3, 2026
dc11b00
build(deps-dev): bump @typescript-eslint/eslint-plugin
dependabot[bot] Jun 3, 2026
dee1617
Merge pull request #689 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Jun 3, 2026
4b70a36
build(deps-dev): bump jest from 30.3.0 to 30.4.2
dependabot[bot] Jun 8, 2026
740e712
Merge pull request #692 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Jun 8, 2026
73ad87a
build(deps-dev): bump eslint-plugin-prettier from 5.5.5 to 5.5.6
dependabot[bot] Jun 8, 2026
abe67a9
Merge pull request #691 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Jun 8, 2026
1d58aaa
feat: add EXPERIMENT_ESF_SUBMITTED for experiment even type (#690)
Junjiequan Jun 9, 2026
0a8882f
build(deps): bump envalid from 8.1.1 to 8.2.0
dependabot[bot] Jun 15, 2026
4585ac7
Merge pull request #695 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Jun 15, 2026
5b77082
build(deps): bump form-data from 4.0.5 to 4.0.6
dependabot[bot] Jun 15, 2026
1a9d888
Merge pull request #696 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Jun 15, 2026
be78072
build(deps-dev): bump @eslint/compat from 2.0.5 to 2.1.0
dependabot[bot] Jun 15, 2026
5bb5482
Merge pull request #694 from UserOfficeProject/dependabot-npm_and_yar…
github-actions[bot] Jun 15, 2026
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
9 changes: 6 additions & 3 deletions .env.tests
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ KAFKA_PASSWORD=test
KAFKA_TOPIC=TestTopic

SCICAT_BASE_URL=http://localhost/some/api
SCICAT_LOGIN_ENDPOINT=/login
SCICAT_USERNAME=user
SCICAT_PASSWORD=pass
SCICAT_JWT=eyJhbGciOiJIUzI1NiIsInR5
SCICAT_PROPOSAL_TRIGGERING_STATUSES="SCHEDULING, ALLOCATED"
SCICAT_EXPERIMENT_TRIGGERING_STATUSES="ACTIVE"

USER_OFFICE_GRAPHQL_URL=http://localhost:8080
USER_OFFICE_JWT=some-token

SYNAPSE_SERVER_URL=https://server-scichat
SYNAPSE_SERVER_NAME=serverName
Expand All @@ -23,6 +25,7 @@ SYNAPSE_OAUTH_ISSUER=SAMPLE_ISSUER

USER_OFFICE_CORE_EXCHANGE_NAME=user_office_backend.fanout
PROPOSAL_CREATION_QUEUE_NAME=connector.proposal_creation.queue
EXPERIMENT_CREATION_QUEUE_NAME=connector.experiment_creation.queue
CHATROOM_CREATION_QUEUE_NAME=consumer.chatroom_creation.queue
FOLDER_CREATION_QUEUE_NAME=connector.proposals_folders_creation.queue
VISA_QUEUE_NAME=dummy
Expand Down
7 changes: 0 additions & 7 deletions .eslintignore

This file was deleted.

101 changes: 0 additions & 101 deletions .eslintrc

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Connector
The connector connects other services through the message queue.
The connector connects other services through the message queue

# Requirements
This service requires node >=22.0.0
Expand Down
131 changes: 131 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
import { defineConfig, globalIgnores } from 'eslint/config';
import typescriptEslint from '@typescript-eslint/eslint-plugin';
import jest from 'eslint-plugin-jest';
import _import from 'eslint-plugin-import';
import unusedImports from 'eslint-plugin-unused-imports';
import { fixupPluginRules } from '@eslint/compat';
import tsParser from '@typescript-eslint/parser';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import js from '@eslint/js';
import { FlatCompat } from '@eslint/eslintrc';

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});

export default defineConfig([
globalIgnores([
'build/*',
'**/*.d.ts',
'src/@matrix-org',
'**/@matrix-org',
'eslint.config.mjs',
]),
{
extends: compat.extends(
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
'plugin:jest/recommended'
),

plugins: {
'@typescript-eslint': typescriptEslint,
jest,
import: fixupPluginRules(_import),
'unused-imports': unusedImports,
},

languageOptions: {
parser: tsParser,
ecmaVersion: 2018,
sourceType: 'module',
},

rules: {
semi: ['error', 'always'],

'import/order': [
'error',
{
groups: [
'builtin',
'external',
'internal',
['parent', 'sibling'],
'index',
],

pathGroups: [
{
pattern: '@src/**',
group: 'internal',
position: 'after',
},
],

pathGroupsExcludedImportTypes: ['builtin'],
'newlines-between': 'always',

alphabetize: {
order: 'asc',
caseInsensitive: true,
},
},
],

quotes: [
'error',
'single',
{
avoidEscape: true,
},
],

'@typescript-eslint/explicit-module-boundary-types': 'off',

'@typescript-eslint/naming-convention': [
'error',
{
selector: 'variable',
format: ['camelCase', 'PascalCase', 'UPPER_CASE'],
leadingUnderscore: 'allow',
trailingUnderscore: 'allow',
},
{
selector: 'function',
format: ['PascalCase', 'camelCase'],
},
],

'@typescript-eslint/no-explicit-any': 1,
'@typescript-eslint/no-require-imports': 'off',

'@typescript-eslint/no-inferrable-types': [
'warn',
{
ignoreParameters: true,
},
],

'@typescript-eslint/no-unused-vars': 'warn',
'@typescript-eslint/ban-ts-comment': 'warn',

'padding-line-between-statements': [
'error',
{
blankLine: 'always',
prev: '*',
next: 'return',
},
],

'unused-imports/no-unused-imports': 2,
'no-console': 'error',
},
},
]);
9 changes: 8 additions & 1 deletion jest.unit.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
module.exports = {
roots: ['<rootDir>/src'],
transform: {
'^.+\\.tsx?$': 'ts-jest',
'^.+\\.tsx?$': [
'ts-jest',
{
tsconfig: {
isolatedModules: true,
},
},
],
},
testEnvironment: 'node',
testRegex: '(/__tests__/.*|(\\.|/)(spec))\\.[jt]sx?$',
Expand Down
Loading
Loading