(staging) Fix subscriptions using user_id (#670)

helium · Jun 29, 2021 · 7783e90 · 7783e90
1 parent 87106b0
commit 7783e90
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/assets/js/components/common/NavDrawer.jsx b/assets/js/components/common/NavDrawer.jsx
@@ -23,7 +23,7 @@ class NavDrawer extends Component {
 
   componentDidMount() {
     const { socket, user } = this.props
-    const user_id = user.sub.slice(6)
+    const user_id = user.sub.startsWith("auth0") ? user.sub.slice(6) : user.sub;
 
     this.channel = socket.channel("graphql:nav_labels", {})
     this.channel.join()

diff --git a/assets/js/components/common/TopBar.jsx b/assets/js/components/common/TopBar.jsx
@@ -32,7 +32,7 @@ class TopBar extends Component {
 
   componentDidMount() {
     const { socket, user } = this.props
-    const user_id = user.sub;
+    const user_id = user.sub.startsWith("auth0") ? user.sub.slice(6) : user.sub;
 
     this.channel = socket.channel("graphql:topbar_orgs", {})
     this.channel.join()

diff --git a/assets/js/components/devices/DeviceIndex.jsx b/assets/js/components/devices/DeviceIndex.jsx
@@ -64,7 +64,7 @@ class DeviceIndex extends Component {
     this.importChannel.on(`graphql:device_import_update:${currentOrganizationId}:import_list_updated`, (message) => {
       const { page, pageSize } = this.state
       this.props.importsQuery.refetch({ page, pageSize })
-      const user_id = user.sub.slice(6)
+      const user_id = user.sub.startsWith("auth0") ? user.sub.slice(6) : user.sub;
 
       if (user_id === message.user_id && message.status === 'success') {
         this.setState({ importComplete: true })

diff --git a/assets/js/components/organizations/OrganizationsTable.jsx b/assets/js/components/organizations/OrganizationsTable.jsx
@@ -25,7 +25,7 @@ class OrganizationsTable extends Component {
 
   componentDidMount() {
     const { socket, user } = this.props
-    const user_id = user.sub.slice(6)
+    const user_id = user.sub.startsWith("auth0") ? user.sub.slice(6) : user.sub;
 
     this.channel = socket.channel("graphql:orgs_index_table", {})
     this.channel.join()