Skip to content

[MS] Update configuration to use dev & prod CryptPad servers #11193

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[MS] Update configuration to use dev & prod CryptPad servers #11193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions client/.env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ PARSEC_APP_CLEAR_CACHE="true"
PARSEC_APP_TESTBED_AUTO_LOGIN="true"
PARSEC_APP_ACCOUNT_SERVER="parsec3://dev-account.parsec.cloud"
PARSEC_APP_DEFAULT_LIB_LOG_LEVEL="DEBUG"
PARSEC_APP_DEFAULT_CRYPTPAD_SERVER="https://cryptpad-dev.parsec.cloud"
1 change: 1 addition & 0 deletions client/.env.playwright
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ PARSEC_APP_BMS_MOCKED_FUNCTIONS=""
PARSEC_APP_BMS_FAIL_FUNCTIONS=""
PARSEC_APP_CREATE_DEFAULT_WORKSPACES="false"
PARSEC_APP_TESTBED_AUTO_LOGIN="false"
PARSEC_APP_DEFAULT_CRYPTPAD_SERVER="https://cryptpad-dev.parsec.cloud"
1 change: 1 addition & 0 deletions client/.env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ PARSEC_APP_SIGN_URL=https://sign.parsec.cloud
PARSEC_APP_SAAS_SERVERS="saas-v3.parsec.cloud"
PARSEC_APP_TRIAL_SERVERS="trial.parsec.cloud"
PARSEC_APP_ENABLE_CUSTOM_BRANDING=true
PARSEC_APP_DEFAULT_CRYPTPAD_SERVER="https://cryptpad.parsec.cloud"
1 change: 1 addition & 0 deletions client/.env.release-candidate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ PARSEC_APP_SAAS_SERVERS="saas-v3.parsec.cloud;saas-demo-v3-mightyfairy.parsec.cl
PARSEC_APP_TRIAL_SERVERS="trial.parsec.cloud"
PARSEC_APP_DEFAULT_LIB_LOG_LEVEL="DEBUG"
PARSEC_APP_ENABLE_CUSTOM_BRANDING=true
PARSEC_APP_DEFAULT_CRYPTPAD_SERVER="https://cryptpad.parsec.cloud"
13 changes: 0 additions & 13 deletions client/electron/src/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,19 +581,6 @@ export function setupContentSecurityPolicy(customScheme: string): void {
CspDirective.WorkerSrc,
],
},
{
domain: 'https://centakina.ddns.net',
directives: [
CspDirective.DefaultSrc,
CspDirective.ScriptSrc,
CspDirective.ConnectSrc,
CspDirective.ImgSrc,
CspDirective.StyleSrc,
CspDirective.FontSrc,
CspDirective.FrameSrc,
CspDirective.WorkerSrc,
],
},
{
domain: 'https://*.stripe.com',
directives: [
Expand Down
2 changes: 1 addition & 1 deletion client/src/services/environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ async function openTOS(tosLink: string): Promise<void> {

const ENABLE_EDITICS_VARIABLE = 'PARSEC_APP_ENABLE_EDITICS';
const CRYPTPAD_SERVER_VARIABLE = 'PARSEC_APP_DEFAULT_CRYPTPAD_SERVER';
const DEFAULT_CRYPTPAD_SERVER = 'https://centakina.ddns.net';
const DEFAULT_CRYPTPAD_SERVER = 'https://cryptpad-dev.parsec.cloud';

function isEditicsEnabled(): boolean {
return import.meta.env[ENABLE_EDITICS_VARIABLE] === 'true' || (window as any).TESTING_ENABLE_EDITICS === true;
Expand Down
2 changes: 1 addition & 1 deletion client/tests/e2e/helpers/cryptpad.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { expect } from '@playwright/test';
import { MsPage } from '@tests/e2e/helpers/types';

// cspell:disable-next-line
export const CRYPTPAD_SERVER = 'centakina.ddns.net';
export const CRYPTPAD_SERVER = 'cryptpad-dev.parsec.cloud';

interface MockCryptpadOptions {
timeout?: boolean;
Expand Down
Loading