Skip to content

Commit

Permalink
merge full-id branch
Browse files Browse the repository at this point in the history
  • Loading branch information
rezk2ll committed Dec 16, 2024
1 parent 3dc972d commit 052783d
Show file tree
Hide file tree
Showing 16 changed files with 916 additions and 17 deletions.
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ COPY landing /usr/src/app/landing

# Build and clean

RUN npm install && npm run build && \
rm -rf node_modules */*/node_modules && \
npm install --production --ignore-scripts && \
npm cache clean --force
RUN npm install
RUN npm run build -- --skip-nx-cache
RUN rm -rf node_modules */*/node_modules
RUN npm install --production --ignore-scripts
RUN npm cache clean --force

FROM node-minimal as tom-server

Expand Down
82 changes: 82 additions & 0 deletions packages/matrix-client-server/src/__testData__/loginConf.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{
"cron_service": false,
"database_engine": "sqlite",
"database_host": "./src/__testData__/testLogin.db",
"matrix_database_engine": "sqlite",
"matrix_database_host": "./src/__testData__/testMatrixLogin.db",
"database_vacuum_delay": 7200,
"invitation_server_name": "matrix.to",
"is_federated_identity_service": false,
"key_delay": 3600,
"keys_depth": 5,
"mail_link_delay": 7200,
"rate_limiting_window": 10000,
"server_name": "matrix.org",
"smtp_sender": "[email protected]",
"smtp_server": "localhost",
"template_dir": "./templates",
"userdb_engine": "sqlite",
"userdb_host": "./src/__testData__/testLogin.db",
"authentication_flows": {
"flows": [
{
"stages": ["m.login.dummy"]
},
{
"stages": ["m.login.password", "m.login.dummy"]
},
{
"stages": ["m.login.terms", "m.login.password"]
},
{
"stages": ["m.login.registration_token", "m.login.dummy"]
}
],
"params": {
"m.login.terms": {
"policies": {
"terms_of_service": {
"version": "1.2",
"en": {
"name": "Terms of Service",
"url": "https://example.org/somewhere/terms-1.2-en.html"
},
"fr": {
"name": "Conditions d'utilisation",
"url": "https://example.org/somewhere/terms-1.2-fr.html"
}
}
}
}
}
},
"login_flows": {
"flows": [
{
"type": "m.login.password"
},
{
"get_login_token": true,
"type": "m.login.token"
}
]
},
"application_services": [
{
"id": "test",
"hs_token": "hsTokenTestwdakZQunWWNe3DZitAerw9aNqJ2a6HVp0sJtg7qTJWXcHnBjgN0NL",
"as_token": "as_token_test",
"url": "http://localhost:3000",
"sender_localpart": "sender_localpart_test",
"namespaces": {
"users": [
{
"exclusive": false,
"regex": "@_irc_bridge_.*"
}
]
}
}
],
"is_registration_enabled": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"base_url": "http://example.com/",
"cron_service": false,
"database_engine": "sqlite",
"database_host": "./src/__testData__/test.db",
"database_vacuum_delay": 7200,
"invitation_server_name": "matrix.to",
"is_federated_identity_service": false,
"key_delay": 3600,
"keys_depth": 5,
"mail_link_delay": 7200,
"rate_limiting_window": 10000,
"server_name": "matrix.org",
"smtp_sender": "[email protected]",
"smtp_server": "localhost",
"template_dir": "./templates",
"userdb_engine": "sqlite",
"userdb_host": "./src/__testData__/test.db",
"matrix_database_engine": "sqlite",
"matrix_database_host": "./src/__testData__/testMatrix.db",
"authentication_flows": {
"flows": [
{
"stages": ["m.login.dummy"]
},
{
"stages": ["m.login.password", "m.login.dummy"]
},
{
"stages": ["m.login.terms", "m.login.password"]
},
{
"stages": ["m.login.registration_token", "m.login.dummy"]
}
],
"params": {
"m.login.terms": {
"policies": {
"terms_of_service": {
"version": "1.2",
"en": {
"name": "Terms of Service",
"url": "https://example.org/somewhere/terms-1.2-en.html"
},
"fr": {
"name": "Conditions d'utilisation",
"url": "https://example.org/somewhere/terms-1.2-fr.html"
}
}
}
}
}
},
"login_flows": {
"flows": [
{
"type": "m.login.password"
},
{
"get_login_token": true,
"type": "m.login.token"
}
]
},
"application_services": [
{
"id": "test",
"hs_token": "hsTokenTestwdakZQunWWNe3DZitAerw9aNqJ2a6HVp0sJtg7qTJWXcHnBjgN0NL",
"as_token": "as_token_test",
"url": "http://localhost:3000",
"sender_localpart": "sender_localpart_test",
"namespaces": {
"users": [
{
"exclusive": false,
"regex": "@_irc_bridge_.*"
}
]
}
}
],
"is_registration_enabled": true
}
83 changes: 83 additions & 0 deletions packages/matrix-client-server/src/__testData__/presenceConf.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"cron_service": false,
"database_engine": "sqlite",
"database_host": "./src/__testData__/testPresence.db",
"matrix_database_engine": "sqlite",
"matrix_database_host": "./src/__testData__/testMatrixPresence.db",
"database_vacuum_delay": 7200,
"invitation_server_name": "matrix.to",
"is_federated_identity_service": false,
"key_delay": 3600,
"keys_depth": 5,
"mail_link_delay": 7200,
"rate_limiting_window": 10000,
"server_name": "matrix.org",
"smtp_sender": "[email protected]",
"smtp_server": "localhost",
"template_dir": "./templates",
"userdb_engine": "sqlite",
"userdb_host": "./src/__testData__/testPresence.db",
"authentication_flows": {
"flows": [
{
"stages": ["m.login.dummy"]
},
{
"stages": ["m.login.password", "m.login.dummy"]
},
{
"stages": ["m.login.terms", "m.login.password"]
},
{
"stages": ["m.login.registration_token", "m.login.dummy"]
}
],
"params": {
"m.login.terms": {
"policies": {
"terms_of_service": {
"version": "1.2",
"en": {
"name": "Terms of Service",
"url": "https://example.org/somewhere/terms-1.2-en.html"
},
"fr": {
"name": "Conditions d'utilisation",
"url": "https://example.org/somewhere/terms-1.2-fr.html"
}
}
}
}
}
},
"login_flows": {
"flows": [
{
"type": "m.login.password"
},
{
"get_login_token": true,
"type": "m.login.token"
}
]
},
"application_services": [
{
"id": "test",
"hs_token": "hsTokenTestwdakZQunWWNe3DZitAerw9aNqJ2a6HVp0sJtg7qTJWXcHnBjgN0NL",
"as_token": "as_token_test",
"url": "http://localhost:3000",
"sender_localpart": "sender_localpart_test",
"namespaces": {
"users": [
{
"exclusive": false,
"regex": "@_irc_bridge_.*"
}
]
}
}
],
"sms_folder": "./src/__testData__/sms",
"is_registration_enabled": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"cron_service": false,
"database_engine": "sqlite",
"database_host": "./src/__testData__/testRoom.db",
"matrix_database_engine": "sqlite",
"matrix_database_host": "./src/__testData__/testMatrixRoom.db",
"database_vacuum_delay": 7200,
"invitation_server_name": "matrix.to",
"is_federated_identity_service": false,
"key_delay": 3600,
"keys_depth": 5,
"mail_link_delay": 7200,
"rate_limiting_window": 10000,
"server_name": "matrix.org",
"smtp_sender": "[email protected]",
"smtp_server": "localhost",
"template_dir": "./templates",
"userdb_engine": "sqlite",
"userdb_host": "./src/__testData__/testRoom.db",
"authentication_flows": {
"flows": [
{
"stages": ["m.login.dummy"]
},
{
"stages": ["m.login.password", "m.login.dummy"]
},
{
"stages": ["m.login.terms", "m.login.password"]
},
{
"stages": ["m.login.registration_token", "m.login.dummy"]
}
],
"params": {
"m.login.terms": {
"policies": {
"terms_of_service": {
"version": "1.2",
"en": {
"name": "Terms of Service",
"url": "https://example.org/somewhere/terms-1.2-en.html"
},
"fr": {
"name": "Conditions d'utilisation",
"url": "https://example.org/somewhere/terms-1.2-fr.html"
}
}
}
}
}
},
"login_flows": {
"flows": [
{
"type": "m.login.password"
},
{
"get_login_token": true,
"type": "m.login.token"
}
]
},
"application_services": [
{
"id": "test",
"hs_token": "hsTokenTestwdakZQunWWNe3DZitAerw9aNqJ2a6HVp0sJtg7qTJWXcHnBjgN0NL",
"as_token": "as_token_test",
"url": "http://localhost:3000",
"sender_localpart": "sender_localpart_test",
"namespaces": {
"users": [
{
"exclusive": false,
"regex": "@_irc_bridge_.*"
}
]
}
}
],
"sms_folder": "./src/__testData__/sms",
"is_registration_enabled": true
}
Loading

0 comments on commit 052783d

Please sign in to comment.