Tweak proxy for universal link registration

apps/platform/src/organizations/OrganizationMiddleware.ts

@@ -4,13 +4,13 @@ import App from '../app'
 
 export const organizationMiddleware = async (ctx: Context, next: () => void) => {
     const organizationId = ctx.cookies.get('organization', { signed: true })
-    if (organizationId) {
+    if (!App.main.env.config.multiOrg) {
+        ctx.state.organization = await getDefaultOrganization()
+    } else if (organizationId) {
         ctx.state.organization = await getOrganization(parseInt(organizationId))
     } else if (ctx.subdomains && ctx.subdomains[0]) {
         const subdomain = ctx.subdomains[0]
         ctx.state.organization = await getOrganizationByUsername(subdomain)
-    } else if (App.main.env.config.multiOrg) {
-        ctx.state.organization = await getDefaultOrganization()
     }
     return next()
 }

apps/platform/src/providers/push/PushJob.ts

@@ -1,6 +1,5 @@
 import { EncodedJob, Job } from '../../queue'
 import { PushTemplate } from '../../render/Template'
-import { createEvent } from '../../users/UserEventRepository'
 import { MessageTrigger } from '../MessageTrigger'
 import PushError from './PushError'
 import { disableNotifications } from '../../users/UserRepository'
@@ -9,6 +8,7 @@ import { finalizeSend, loadSendJob, messageLock, prepareSend } from '../MessageT
 import { loadPushChannel } from '.'
 import App from '../../app'
 import { releaseLock } from '../../core/Lock'
+import { EventPostJob } from '../../jobs'
 
 export default class PushJob extends Job {
     static $name = 'push'
@@ -60,13 +60,18 @@ export default class PushJob extends Job {
                 })
 
                 // Create an event about the disabling
-                await createEvent(user, {
-                    name: 'notifications_disabled',
-                    data: {
-                        ...context,
-                        tokens: error.invalidTokens,
+                await EventPostJob.from({
+                    project_id: project.id,
+                    user_id: user.id,
+                    event: {
+                        name: 'notifications_disabled',
+                        external_id: user.external_id,
+                        data: {
+                            ...context,
+                            tokens: error.invalidTokens,
+                        },
                     },
-                })
+                }).queue()
             } else {
                 App.main.error.notify(error)
             }

apps/ui/docker/nginx/conf.d/default.conf

@@ -11,7 +11,7 @@ server {
         proxy_pass http://api:3001;
     }
 
-    location ~ ^\/(uploads|unsubscribe|.well-known|(?:c$|c\/)|(?:o$|o\/)) { 
+    location ~ ^\/(uploads|unsubscribe|\.well-known|(?:c$|c\/)|(?:o$|o\/)) { 
         rewrite ^\/(.*)$ /api/$1 break;
         proxy_pass http://api:3001;
     }