Relative DB URLs #1319

TheSlimvReal · 2022-06-24T07:48:47Z

solves #841
On default the app will now be in demo_mode with a in-memory DB. Do change this DEMO="false" needs to be passed to the Docker image on start.

Visible/Frontend Changes

--

Architectural/Backend Changes

DB is only accessed through relative URL which makes the database_url in the config.json file unnecessary
Replace database_name with default app
Demo mode and session type can be configured through environment or query params
Dockerfile allows to add a default redirect to demo mode for all requests
Site name has been move to config in database

github-actions · 2022-06-24T07:49:09Z

Deployed to https://test-deployment-pr-1319.herokuapp.com/

sleidig · 2022-06-24T11:47:59Z

For me, one of the main objectives of removing the config.json is to have a multi-tenant system (one hosted app for all projects). Do we have an idea yet how to route to different DBs in the long run?

And if we remove the url, we not also move the name to the config document in couchdb and immediately delete the whole json file?

TheSlimvReal · 2022-06-25T19:32:58Z

@sleidig

Regarding the multi tenant system:
I would expect the URL to the DB of a user would be provided through the authentication process. E.g. keycloak would send the DB URL after a successful login.

Regarding the full deletion of the config.json file:
It still holds the information for the session and demo mode. For this I don't have a clear solution yet how we would otherwise configure this as it cannot come from the database.

src/app/core/app-config/app-config.model.ts

# Conflicts: # src/app/core/webdav/cloud-file-service.service.spec.ts

…ry params

…ences

# Conflicts: # build/Dockerfile # build/default.conf # src/app/app.module.ts # src/app/core/config/config-fix.ts # src/app/core/ui/ui-config.ts # src/main.ts

# Conflicts: # build/default.conf # src/app/core/language/language-select/language-select.component.html # src/app/core/translation/language-selector/language-select.component.ts

sleidig

Wow, I really like how this cleans up some long standing loose ends 😃
Just a bunch of clean code ideas in my comments but this looks pretty good overall.

Functionally I noticed one thing:
When I switch to "local" session and then do a hard reload (Ctrl+F5) the app gets the queryParam "session=mock" in the URL and switches back to "mock" session. Looking at the code I see that queryParam takes precedence over localStorage by design.

My intuitive expectation was that I will remain in the previous (-> local) mode. What should we have as the expected behaviour here?

build/Dockerfile

sleidig · 2022-07-20T07:14:22Z

build/default.conf

+        }
+        if ($demo = "truetrue") {
+            # This first part is required because Heroku does some internal redirects which break the rewrite otherwise
+            # This does not work in localhost as it enforces HTTPS


do we have to rewrite to https here or could we just leave it at whatever was used before?

It would make more sense to have a separate block that rewrites any mode to use https (easier to understand if separated - and applying to all modes). But I don't know whether that's doable in nginx, e.g. multiple rewrite blocks applying.

Normally it definitely works the way you are asking for the problem is that it does not work with Heroku. Somehow in there a internal redirect is happening before this one which leads to a wrong URL in this rewrite (in particular loosing the https and adding a wrong port). This workaround is not needed for our own servers. There we could just use:

rewrite ^ $uri?demo=true&session=mock permanent;

build/default.conf

src/app/core/app-config/app-config.ts

src/app/core/config/config-fix.ts

src/app/core/app-config/app-config.ts

src/assets/config.default.json

src/environments/environment.ts

sonarcloud · 2022-07-27T10:31:29Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

sleidig

looks awesome! 😍

aam-digital-ci · 2022-07-28T16:10:26Z

🎉 This PR is included in version 3.9.0-master.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

aam-digital-ci · 2022-08-15T18:39:33Z

🎉 This PR is included in version 3.9.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

TheSlimvReal added 3 commits June 23, 2022 22:51

removed usage of remote_url

4b537b6

removed database name from config

3a12b4c

added comments for proxy url

39dd063

TheSlimvReal changed the title ~~Relative url~~ Relative DB URLs Jun 24, 2022

TheSlimvReal added 2 commits June 24, 2022 09:58

removed usages of remote_url for database

031ee25

fixed lint error

3e8e55a

sleidig reviewed Jul 5, 2022

View reviewed changes

src/app/core/app-config/app-config.model.ts Outdated Show resolved Hide resolved

sleidig marked this pull request as draft July 5, 2022 13:59

TheSlimvReal and others added 17 commits July 6, 2022 09:54

Merge remote-tracking branch 'origin/master' into relative-url

b36e871

# Conflicts: # src/app/core/webdav/cloud-file-service.service.spec.ts

removed remote_url from default config

6b5b981

removed database name and replaced it by a static value

93974ce

removed site_name from config.json and moved it to db config

faeca34

fixed tests

b4f7b06

removed session type from config.json and moved it environment or que…

6f25216

…ry params

added default env options to prod settings

70d87d4

added demo redirect to nginx conf and option to disable it to dockerfile

edcfba0

cleaned up initialization of AppConfig settings and removed old refer…

b502680

…ences

fixed tests

e7f2ff8

Merge branch 'master' into relative-url

150963f

fix doc styling

aee3697

Merge remote-tracking branch 'origin/relative-url' into relative-url

6503623

disabled port in redirect

39091ab

fixed typo

f8d81d1

better rewriting to use correct port and schema

eb0cca5

using https on default

e8d9b1d

TheSlimvReal marked this pull request as ready for review July 8, 2022 11:56

TheSlimvReal marked this pull request as draft July 8, 2022 12:20

TheSlimvReal and others added 10 commits July 11, 2022 17:58

directly navigating to index.html file on language change

862eb3c

Merge remote-tracking branch 'origin/master' into relative-url

1f34781

# Conflicts: # build/Dockerfile # build/default.conf # src/app/app.module.ts # src/app/core/config/config-fix.ts # src/app/core/ui/ui-config.ts # src/main.ts

added automatic demo query params to new nginx config

35a62c1

Merge remote-tracking branch 'origin/relative-url' into relative-url

0ea0c8c

# Conflicts: # build/default.conf # src/app/core/language/language-select/language-select.component.html # src/app/core/translation/language-selector/language-select.component.ts

files are captured in separate location block

281f97d

enforcing https in rewrite

62a6673

using correct host variable

579dc82

added local storage option to preserve query params

da65aee

using permanent rewrite for demo mode

90a0273

improved documentation

9b407e1

TheSlimvReal marked this pull request as ready for review July 19, 2022 17:22

TheSlimvReal requested a review from sleidig July 19, 2022 17:22

added comment about heroku workaround

db88268

sleidig requested changes Jul 20, 2022

View reviewed changes

TheSlimvReal added 7 commits July 27, 2022 09:58

removed webdav references

1ff29ab

cleaned up demo check in nginx config

2ef6fd8

cleaned up fetching of runtime settings

13985d3

renamed AppConfig to AppSettings

1532db3

changed order of config attributes

18de486

removed config.default.json

fb3df4b

moved demo_mode and session_type to environment.ts

474572e

sleidig approved these changes Jul 28, 2022

View reviewed changes

TheSlimvReal merged commit ca3704a into master Jul 28, 2022

TheSlimvReal deleted the relative-url branch July 28, 2022 16:06

aam-digital-ci added the released on @master label Jul 28, 2022

aam-digital-ci added the released label Aug 15, 2022

snyk-bot mentioned this pull request Sep 19, 2022

[Snyk] Upgrade @faker-js/faker from 7.4.0 to 7.5.0 #1441

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Relative DB URLs #1319

Relative DB URLs #1319

TheSlimvReal commented Jun 24, 2022 •

edited

Loading

github-actions bot commented Jun 24, 2022

sleidig commented Jun 24, 2022

TheSlimvReal commented Jun 25, 2022

sleidig left a comment

sleidig Jul 20, 2022

TheSlimvReal Jul 20, 2022 •

edited

Loading

sonarcloud bot commented Jul 27, 2022

sleidig left a comment

aam-digital-ci commented Jul 28, 2022

aam-digital-ci commented Aug 15, 2022

Relative DB URLs #1319

Relative DB URLs #1319

Conversation

TheSlimvReal commented Jun 24, 2022 • edited Loading

Visible/Frontend Changes

Architectural/Backend Changes

github-actions bot commented Jun 24, 2022

sleidig commented Jun 24, 2022

TheSlimvReal commented Jun 25, 2022

sleidig left a comment

Choose a reason for hiding this comment

sleidig Jul 20, 2022

Choose a reason for hiding this comment

TheSlimvReal Jul 20, 2022 • edited Loading

Choose a reason for hiding this comment

sonarcloud bot commented Jul 27, 2022

sleidig left a comment

Choose a reason for hiding this comment

aam-digital-ci commented Jul 28, 2022

aam-digital-ci commented Aug 15, 2022

TheSlimvReal commented Jun 24, 2022 •

edited

Loading

TheSlimvReal Jul 20, 2022 •

edited

Loading