Merge from develop to preprod

demo/restore-demo.sh

@@ -7,7 +7,7 @@ destinationDataDir="/data/hosted/"
 
 echo "Removing $destinationDataDir"
 
-rm -R ${destinationDataDir}
+rm -R ${destinationDataDir}*
 
 echo "Resetting to initial status from $originDataDir.."
 cp -R ${originDataDir} ${destinationDataDir}

deploy/digitalocean/README.md

@@ -9,15 +9,28 @@ This script is maintained for the community by Proxeus Association
 
 ## Instructions
 
-1. Create fresh DO droplet with Ubuntu v.20+ with any basic Provision configuration
-2. You will need to have your API keys for Infura and Sparkpost handy - see the root README for further details.
-3. add executive permission for deploy.sh ( chmod +x deploy.sh )
-4. run $PWD/proxeus-core/deploy/digitalocean/deploy.sh
-5. It takes a few minutes for the server to boot and install, then you should be able to open `http://<your DO's IP address or domain>:1323/init`
-6. A configuration screen will be shown where you can set up an admin account and check settings.
-
-Once your server is running, visit the [User Handbook](https://github.com/ProxeusApp/community/blob/master/handbook/handbook.md) to get started.
+1. Create fresh DO droplet with Ubuntu v.20+ with any basic Provision configuration. [Here](https://docs.digitalocean.com/products/droplets/getting-started/recommended-droplet-setup) you can find some help how to set up a production-ready droplet.
+2. Make sure your API keys for Infura and Sparkpost.
+3. Get the deployment script and make it executable:
+```bash
+wget https://raw.githubusercontent.com/ProxeusApp/proxeus-core/main/deploy/digitalocean/deploy.sh && chmod +x deploy.sh
+```
+4. Enter all the necessary variables, where **FQDN** - domain name for the future server, **INFURA** - your Infura API key, **SPARKPOST** - your SparkPost API key, **ADMINEMAIL** - admin email (in format like [email protected]). It can be done by editing the script file directly or by shell "export" command:
+```bash
+export FQDN=[value]
+export INFURA=[value]
+export SPARKPOST=[value]
+export ADMINEMAIL=[value]
+```
+5. Run deployment process (go through it carefully, it may ask you any additional confirmation):
+```bash
+./deploy.sh
+```
+7. It takes a few minutes for the server to boot and install, then you should be able to open `http://<your DO's IP address or domain>:1323/init`
+8. A configuration screen will be shown where you can set up an admin account and check settings.
+
+Once your server is running, visit the [User Handbook](https://doc.proxeus.org/#/handbook) to get started.
 
 To view the logs connect to your droplet using an SSH client program. Then paste this into the console to see the logs being updated in real time:
 
-`cd /srv/proxeus && docker-compose logs -f`
+`cd /srv/proxeus && docker-compose logs -f`

deploy/digitalocean/deploy.sh

@@ -1,12 +1,18 @@
 #!/bin/bash
-#specify values for local variables
 
+# Specify values for local variables
 #FQDN=<value>
 #INFURA=<value>
 #SPARKPOST=<value>
 #ADMINEMAIL=<value>
 
 
+## Performing the installation
+exec 1> >(tee -a "/var/log/stackscript.log") 2>&1
+function log {
+  echo "### $1 -- `date '+%D %T'`"
+}
+
 log "Configuring System Updates"
 apt-get -o Acquire::ForceIPv4=true update -y
 DEBIAN_FRONTEND=noninteractive apt-get -y -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" install grub-pc
@@ -109,11 +115,11 @@ cd /srv/proxeus
 # make init server-docker
 
 log "Starting cloud deployment via docker-compose"
-docker-compose --env-file .env -f docker-compose.yml -f docker-compose-cloud.override.yml up -d &
+docker-compose --env-file .env -f docker-compose.yml -f docker-compose-cloud.override.yml up -d >/dev/null 2>&1
 
 # Open http://$FQDN:1323/init to configure your server
 log "After a minute, open: http://$FQDN:1323/init"
 
 ## ----------------------------------------------
 
-echo "Installation complete!"
+echo "Installation complete!"

main/www/security.go

@@ -54,7 +54,7 @@ func redirectToLogin(c echo.Context) error {
 	if isAjax {
 		return echo.ErrUnauthorized
 	}
-	return c.Redirect(http.StatusTemporaryRedirect, "/login")
+	return c.Redirect(http.StatusTemporaryRedirect, "/login?redirect=" + req.URL.Path)
 }
 
 func getURI(host, url string) string {

service/document.go

@@ -87,7 +87,7 @@ func (me *DefaultDocumentService) Edit(auth model.Auth, userId string, formInput
 	if !ok {
 		return ErrUnableToEdit
 	}
-	if len(fName) >= 80 || !filenameRegex.MatchString(fName) {
+	if len(fName) > 80 || !filenameRegex.MatchString(fName) {
 		return ErrUnableToEdit
 	}
 	usrDataItem, err := userDataDB().Get(auth, userId)

test/e2e/cypress/integration/0_powerup.js

@@ -17,6 +17,10 @@ describe(`Power up on ${url}`, () => {
 
   it('should bring to home page after saving with default values', () => {
     cy.get('button.btn-primary').eq(2).click()
+
+    cy.location('pathname', {
+      timeout: 60000
+    }).should('eq', '/');
   })
 
-})
+})

ui/core/src/App.vue

@@ -50,6 +50,10 @@ export default {
     window.$root = this.$root
     this.$root.$on('service-on', this.onServiceOn)
     this.$root.$on('service-off', this.onServiceOff)
+
+    if (!this.app.checkUserHasSession()) {
+      this.app.redirectToLogin(window.location.pathname)
+    }
   },
   beforeDestroy () {
     this.$root.$off('service-on', this.onServiceOn)

ui/core/src/DocumentApp.vue

@@ -24,6 +24,10 @@ export default {
   created () {
     this.$root.$on('service-on', this.onServiceOn)
     this.$root.$on('service-off', this.onServiceOff)
+
+    if (!this.app.checkUserHasSession()) {
+      this.app.redirectToLogin(window.location.pathname)
+    }
   },
   beforeDestroy () {
     this.$root.$off('service-on', this.onServiceOn)
@@ -107,13 +111,19 @@ export default {
     color: $primary;
   }
 
+  body {
+    overflow: hidden;
+  }
+
   .navbar h1 {
     margin-bottom: 0;
   }
 
   .app-main {
-    @media (max-width: 767px) {
-      max-width: 100% !important;
+    max-width: calc(100% - 265px);
+
+    @media (max-width: 979px) {
+      max-width: calc(100% - 80px);
     }
   }