Skip to content

Make packages reference each other more cleanly #17

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.

Sign up for GitHub

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

Open
Pandapip1 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Make packages reference each other more cleanly #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0525f0
Make packages reference each other more cleanly
Pandapip1 Apr 12, 2026
ee0c151
Update lockfiles
Pandapip1 Apr 12, 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
2 changes: 2 additions & 0 deletions AdminPanel/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
},
"dependencies": {
"apicache": "^1.6.3",
"coauthoring": "file:../DocService",
"config": "^3.3.11",
"common": "file:../Common",
"cookie-parser": "^1.4.6",
"cors": "^2.8.5",
"express": "^4.19.2",
Expand Down
8 changes: 4 additions & 4 deletions AdminPanel/server/sources/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
'use strict';

const crypto = require('crypto');
const runtimeConfigManager = require('../../../Common/sources/runtimeConfigManager');
const runtimeConfigManager = require('common/sources/runtimeConfigManager');
const passwordManager = require('./passwordManager');

const BOOTSTRAP_TOKEN_TTL = 1 * 60 * 60 * 1000; // 1 hour
Expand Down Expand Up @@ -78,7 +78,7 @@ function generateShortCode(timestamp) {
* Code is deterministic based on time window and secret (cluster-safe)
* All pods with same secret will generate same code for current time window
*
* @param {import('../../../Common/sources/operationContext').Context} ctx - Operation context
* @param {import('common/sources/operationContext').Context} ctx - Operation context
* @returns {Promise<{code: string, expiresAt: Date}>}
*/
async function generateBootstrapToken(ctx) {
Expand All @@ -103,7 +103,7 @@ async function generateBootstrapToken(ctx) {
* Stateless verification - works across all cluster nodes with same secret
* Verifies that code matches HMAC signature for current or previous time window
*
* @param {import('../../../Common/sources/operationContext').Context} ctx - Operation context
* @param {import('common/sources/operationContext').Context} ctx - Operation context
* @param {string} providedCode - Code provided by user (e.g. "AB12CD34EF56")
* @returns {Promise<boolean>} True if code is valid and not expired
*/
Expand Down Expand Up @@ -182,7 +182,7 @@ function hasValidBootstrapToken() {
/**
* Invalidate bootstrap code cache (for reset scenarios)
* Note: Code itself remains valid across cluster until time window expires
* @param {import('../../../Common/sources/operationContext').Context} ctx - Operation context
* @param {import('common/sources/operationContext').Context} ctx - Operation context
*/
async function invalidateBootstrapToken(ctx) {
cachedBootstrapCode = null;
Expand Down
2 changes: 1 addition & 1 deletion AdminPanel/server/sources/devProxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

const http = require('http');
const cors = require('cors');
const operationContext = require('../../../Common/sources/operationContext');
const operationContext = require('common/sources/operationContext');

/**
* Setup development proxy to DocService
Expand Down
2 changes: 1 addition & 1 deletion AdminPanel/server/sources/middleware/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const jwt = require('jsonwebtoken');
const operationContext = require('../../../../Common/sources/operationContext');
const operationContext = require('common/sources/operationContext');
const adminPanelJwtSecret = require('../jwtSecret');

/**
Expand Down
2 changes: 1 addition & 1 deletion AdminPanel/server/sources/passwordManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

const crypto = require('crypto');
const util = require('util');
const runtimeConfigManager = require('../../../Common/sources/runtimeConfigManager');
const runtimeConfigManager = require('common/sources/runtimeConfigManager');

const pbkdf2 = util.promisify(crypto.pbkdf2);
const PASSWORD_MIN_LENGTH = 1; // Any non-empty password allowed
Expand Down
8 changes: 4 additions & 4 deletions AdminPanel/server/sources/routes/adminpanel/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
const express = require('express');
const jwt = require('jsonwebtoken');
const cookieParser = require('cookie-parser');
const operationContext = require('../../../../../Common/sources/operationContext');
const operationContext = require('common/sources/operationContext');
const passwordManager = require('../../passwordManager');
const bootstrap = require('../../bootstrap');
const adminPanelJwtSecret = require('../../jwtSecret');
const tenantManager = require('../../../../../Common/sources/tenantManager');
const commonDefines = require('../../../../../Common/sources/commondefines');
const tenantManager = require('common/sources/tenantManager');
const commonDefines = require('common/sources/commondefines');
const {validateScoped} = require('../config/config.service');
const supersetSchema = require('../../../../../Common/config/schemas/config.schema.json');
const supersetSchema = require('common/config/schemas/config.schema.json');

const router = express.Router();

Expand Down
6 changes: 3 additions & 3 deletions AdminPanel/server/sources/routes/config/config.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
const Ajv = require('ajv');
const addFormats = require('ajv-formats');
const addErrors = require('ajv-errors');
const logger = require('../../../../../Common/sources/logger');
const tenantManager = require('../../../../../Common/sources/tenantManager');
const supersetSchema = require('../../../../../Common/config/schemas/config.schema.json');
const logger = require('common/sources/logger');
const tenantManager = require('common/sources/tenantManager');
const supersetSchema = require('common/config/schemas/config.schema.json');
const {deriveSchemaForScope, X_SCOPE_KEYWORD} = require('./config.schema.utils');

// Constants
Expand Down
8 changes: 4 additions & 4 deletions AdminPanel/server/sources/routes/config/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
const config = require('config');
const express = require('express');
const bodyParser = require('body-parser');
const tenantManager = require('../../../../../Common/sources/tenantManager');
const runtimeConfigManager = require('../../../../../Common/sources/runtimeConfigManager');
const tenantManager = require('common/sources/tenantManager');
const runtimeConfigManager = require('common/sources/runtimeConfigManager');
const {getScopedConfig, validateScoped} = require('./config.service');
const {validateJWT} = require('../../middleware/auth');
const cookieParser = require('cookie-parser');
const utils = require('../../../../../Common/sources/utils');
const supersetSchema = require('../../../../../Common/config/schemas/config.schema.json');
const utils = require('common/sources/utils');
const supersetSchema = require('common/config/schemas/config.schema.json');

const router = express.Router();
router.use(cookieParser());
Expand Down
8 changes: 4 additions & 4 deletions AdminPanel/server/sources/routes/wopi/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
const config = require('config');
const express = require('express');
const crypto = require('crypto');
const utils = require('../../../../../Common/sources/utils');
const runtimeConfigManager = require('../../../../../Common/sources/runtimeConfigManager');
const tenantManager = require('../../../../../Common/sources/tenantManager');
const utils = require('common/sources/utils');
const runtimeConfigManager = require('common/sources/runtimeConfigManager');
const tenantManager = require('common/sources/tenantManager');
const {validateJWT} = require('../../middleware/auth');
const {getConfig} = require('../../../../../Common/sources/runtimeConfigManager');
const {getConfig} = require('common/sources/runtimeConfigManager');
const cookieParser = require('cookie-parser');

const cfgWopiPublicKey = config.get('wopi.publicKey');
Expand Down
12 changes: 6 additions & 6 deletions AdminPanel/server/sources/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@

'use strict';

const moduleReloader = require('../../../Common/sources/moduleReloader');
const moduleReloader = require('common/sources/moduleReloader');
const config = moduleReloader.requireConfigWithRuntime();
const operationContext = require('../../../Common/sources/operationContext');
const tenantManager = require('../../../Common/sources/tenantManager');
const license = require('../../../Common/sources/license');
const runtimeConfigManager = require('../../../Common/sources/runtimeConfigManager');
const operationContext = require('common/sources/operationContext');
const tenantManager = require('common/sources/tenantManager');
const license = require('common/sources/license');
const runtimeConfigManager = require('common/sources/runtimeConfigManager');

const express = require('express');
const http = require('http');
const path = require('path');
const fs = require('fs');
const infoRouter = require('../../../DocService/sources/routes/info');
const infoRouter = require('coauthoring/sources/routes/info');

const configRouter = require('./routes/config/router');
const adminpanelRouter = require('./routes/adminpanel/router');
Expand Down
Loading