Update main with changes in dev (#42)

* feat: Added isMultiplayer to receive log * Adds universal OAuth, preliminary connector installer and new column in GetByURL table (#41) * ci: Added step to sign MEZ file * ci: Fix output dir * ci: Added innosetup installer test * ci: Fix path * ci: Fix sign tool path 🤦🏼‍♂️ * ci: Don't sign * feat: Added parent object column to GetByUrl result * feat: Universal OAuth login * fix: Installer function fail, non-critical. Reverted to simple implementation
specklesystems · May 11, 2023 · 9db161b · 9db161b
1 parent 83ec9a7
commit 9db161b
Show file tree

Hide file tree

Showing 54 changed files with 12,087 additions and 96 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -20,6 +20,18 @@ jobs:
       - run:
           name: "Build Data Connector"
           command: "msbuild Speckle.proj /restore /consoleloggerparameters:NoSummary /property:GenerateFullPaths=true"
+      - run:
+          name: Create Innosetup signing cert
+          command: |
+            echo $env:PFX_B64 > "tools\AEC Systems Ltd.txt"
+            certutil -decode "tools\AEC Systems Ltd.txt" "tools\AEC Systems Ltd.pfx"
+      - run:
+          name: Create Signed PFX file
+          command: .\tools\MakePQX\MakePQX.exe pack -mz bin/Speckle.mez -t bin/Speckle.pqx -c "tools\AEC Systems Ltd.pfx" -p $env:PFX_PSW
+      - run:
+          name: Build Installer
+          command: tools\InnoSetup\ISCC.exe tools\powerbi.iss /Sbyparam=$p
+          shell: cmd.exe #does not work in powershell
       - store_artifacts:
           path: ./bin
       - persist_to_workspace:
@@ -40,7 +52,7 @@ workflows:
   build:
     jobs:
       - build-connector:
-          context: github-dev-bot
+          context: innosetup
   deploy:
     jobs:
       - build-connector:
@@ -49,6 +61,7 @@ workflows:
               ignore: /.*/ # For testing only: /ci\/.*/
             tags:
               only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w{1,10})?$/
+          context: innosetup
       - deploy-connector:
           filters:
             branches:

diff --git a/.github/workflows/close-issue.yml b/.github/workflows/close-issue.yml
diff --git a/.github/workflows/open-issue.yml b/.github/workflows/open-issue.yml
diff --git a/Speckle.pq b/Speckle.pq
@@ -1,9 +1,8 @@
 [Version = "2.0.0"]
 section Speckle;
 
-AuthAppId = "63463ba25d";
-AuthAppSecret = "c317a7ce45";
-AuthServer = "https://speckle.xyz";
+AuthAppId = "spklpwerbi";
+AuthAppSecret = "spklpwerbi";
 
 // The data source definition, used when connecting to any speckle server
 Speckle = [
@@ -14,18 +13,22 @@ Speckle = [
         OAuth = [
             Label = "Speckle.xyz",
             StartLogin = (clientApplication, dataSourcePath, state, display) =>
-                [
-                    LoginUri = Text.Combine({AuthServer, "authn", "verify", AuthAppId, state}, "/"),
-                    CallbackUri = "https://oauth.powerbi.com/views/oauthredirect.html",
-                    WindowHeight = 800,
-                    WindowWidth = 600,
-                    Context = null
-                ],
+                let
+                    server = Text.Combine({"https://", Uri.Parts(dataSourcePath)[Host]})
+                in
+                    [
+                        LoginUri = Text.Combine({server, "authn", "verify", AuthAppId, state}, "/"),
+                        CallbackUri = "https://oauth.powerbi.com/views/oauthredirect.html",
+                        WindowHeight = 800,
+                        WindowWidth = 600,
+                        Context = null
+                    ],
             FinishLogin = (clientApplication, dataSourcePath, context, callbackUri, state) =>
                 let
+                    server = Text.Combine({"https://", Uri.Parts(dataSourcePath)[Host]}),
                     Parts = Uri.Parts(callbackUri)[Query],
                     Source = Web.Contents(
-                        Text.Combine({AuthServer, "auth", "token"}, "/"),
+                        Text.Combine({server, "auth", "token"}, "/"),
                         [
                             Headers = [
                                 #"Content-Type" = "application/json"
@@ -50,8 +53,9 @@ Speckle = [
                     ],
             Refresh = (dataSourcePath, refreshToken) =>
                 let
+                    server = Text.Combine({"https://", Uri.Parts(dataSourcePath)[Host]}),
                     Source = Web.Contents(
-                        Text.Combine({AuthServer, "auth", "token"}, "/"),
+                        Text.Combine({server, "auth", "token"}, "/"),
                         [
                             Headers = [
                                 #"Content-Type" = "application/json"

diff --git a/Speckle.proj b/Speckle.proj
@@ -1,38 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="BuildMez">
-  <PropertyGroup>
-    <OutputPath Condition="'$(OutputPath)' == ''">$(MSBuildProjectDirectory)\bin\</OutputPath>
-    <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(MSBuildProjectDirectory)\obj\</IntermediateOutputPath>
-    <MezIntermediatePath>$(IntermediateOutputPath)MEZ\</MezIntermediatePath>
-    <MezOutputPath>$(OutputPath)$(MsBuildProjectName).mez</MezOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <MezContent Include="Speckle.pq" />
-    <MezContent Include="utilities\**\*.pqm" />
-    <MezContent Include="speckle\**\*.pqm" />
-    <MezContent Include="assets\SpeckleLogo16.png" />
-    <MezContent Include="assets\SpeckleLogo20.png" />
-    <MezContent Include="assets\SpeckleLogo24.png" />
-    <MezContent Include="assets\SpeckleLogo32.png" />
-    <MezContent Include="assets\SpeckleLogo40.png" />
-    <MezContent Include="assets\SpeckleLogo48.png" />
-    <MezContent Include="assets\SpeckleLogo64.png" />
-    <MezContent Include="assets\SpeckleLogo80.png" />
-    <MezContent Include="assets\resources.resx" />
-  </ItemGroup>
-  <Target Name="BuildMez" AfterTargets="Build" Inputs="@(MezContent)" Outputs="$(MezOutputPath)">
-    <RemoveDir Directories="$(MezIntermediatePath)" />
-    <Copy SourceFiles="@(MezContent)" DestinationFolder="$(MezIntermediatePath)" />
-    <MakeDir Directories="$(OutputPath)" Condition="!Exists('$(OutputPath)')" />
-    <ZipDirectory SourceDirectory="$(MezIntermediatePath)" DestinationFile="$(MezOutputPath)" Overwrite="true" />
-  </Target>
-  <Target Name="CopyToConnectors" AfterTargets="BuildMez">
-    <Message Text="Copying .mez file to: $(UserProfile)\Documents\Power BI Desktop\Custom Connectors" Importance="High" />
-    <MakeDir Directories="$(UserProfile)\Documents\Power BI Desktop\Custom Connectors\" />
-    <Copy SourceFiles="$(MezOutputPath)" DestinationFolder="$(UserProfile)\Documents\Power BI Desktop\Custom Connectors\"/>
-  </Target>
-  <Target Name="Clean">
-    <RemoveDir Directories="$(MezIntermediatePath)" />
-    <Delete Files="$(MezOutputPath)" />
-  </Target>
-</Project>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
+    DefaultTargets="BuildMez">
+    <PropertyGroup>
+        <Version Condition="'$(Version)' == ''">2.0.0-wip</Version>
+        <OutputPath Condition="'$(OutputPath)' == ''">$(MSBuildProjectDirectory)\bin\</OutputPath>
+        <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">
+            $(MSBuildProjectDirectory)\obj\</IntermediateOutputPath>
+        <MezIntermediatePath>$(IntermediateOutputPath)MEZ\</MezIntermediatePath>
+        <MezOutputPath>$(OutputPath)$(MsBuildProjectName).mez</MezOutputPath>
+    </PropertyGroup>
+    <ItemGroup>
+        <MezContent Include="Speckle.pq" />
+        <MezContent Include="utilities\**\*.pqm" />
+        <MezContent Include="speckle\**\*.pqm" />
+        <MezContent Include="assets\SpeckleLogo16.png" />
+        <MezContent Include="assets\SpeckleLogo20.png" />
+        <MezContent Include="assets\SpeckleLogo24.png" />
+        <MezContent Include="assets\SpeckleLogo32.png" />
+        <MezContent Include="assets\SpeckleLogo40.png" />
+        <MezContent Include="assets\SpeckleLogo48.png" />
+        <MezContent Include="assets\SpeckleLogo64.png" />
+        <MezContent Include="assets\SpeckleLogo80.png" />
+        <MezContent Include="assets\resources.resx" />
+    </ItemGroup>
+    <Target Name="BuildMez" AfterTargets="Build" Inputs="@(MezContent)" Outputs="$(MezOutputPath)">
+        <RemoveDir Directories="$(MezIntermediatePath)" />
+        <Copy SourceFiles="@(MezContent)" DestinationFolder="$(MezIntermediatePath)" />
+        <MakeDir Directories="$(OutputPath)" Condition="!Exists('$(OutputPath)')" />
+        <ZipDirectory SourceDirectory="$(MezIntermediatePath)" DestinationFile="$(MezOutputPath)"
+            Overwrite="true" />
+    </Target>
+    <Target Name="CopyToConnectors" AfterTargets="BuildMez">
+        <Message
+            Text="Copying .mez file to: $(UserProfile)\Documents\Power BI Desktop\Custom Connectors"
+            Importance="High" />
+        <MakeDir Directories="$(UserProfile)\Documents\Power BI Desktop\Custom Connectors\" />
+        <Copy SourceFiles="$(MezOutputPath)"
+            DestinationFolder="$(UserProfile)\Documents\Power BI Desktop\Custom Connectors\" />
+    </Target>
+    <Target Name="Clean">
+        <RemoveDir Directories="$(MezIntermediatePath)" />
+        <Delete Files="$(MezOutputPath)" />
+    </Target>
+</Project>
diff --git a/Speckle.query.pq b/Speckle.query.pq
@@ -1,2 +1,2 @@
 // Use this file to write queries to test your data connector
-let result = Speckle.GetByUrl.Structured("https://speckle.xyz/streams/ceecc65de7") in Record.ToTable(result)
+let result = Speckle.GetByUrl("https://latest.speckle.dev/streams/c1faab5c62/commits/aefb7a5fff") in result
diff --git a/speckle/GetByUrl.pqm b/speckle/GetByUrl.pqm
@@ -36,13 +36,23 @@ in
                     GetObjectFromBranch(server, id, "main"),
             removeEmpty = Table.RemoveLastN(commitObjectsTable, 1),
             addStreamUrl = Table.AddColumn(removeEmpty, "Stream URL", each server & "/streams/" & id),
-            addUrlType = Table.AddColumn(addStreamUrl, "URL Type", each stream[urlType]),
+            addParentObjectId = Table.AddColumn(
+                addStreamUrl, "Commit Object ID", each Value.Metadata(commitObjectsTable)[objectId]
+            ),
+            addUrlType = Table.AddColumn(addParentObjectId, "URL Type", each stream[urlType]),
             addObjectIdCol = Table.AddColumn(addUrlType, "Object ID", each try[data][id] otherwise null),
             addSpeckleTypeCol = Table.AddColumn(
                 addObjectIdCol, "speckle_type", each try[data][speckle_type] otherwise null
             ),
             final = Table.ReorderColumns(
-                addSpeckleTypeCol, {"Stream URL", "URL Type", "Object ID", "speckle_type", "data"}
+                addSpeckleTypeCol, {
+                    "Stream URL",
+                    "URL Type",
+                    "Commit Object ID",
+                    "Object ID",
+                    "speckle_type",
+                    "data"
+                }
             )
         in
             final
diff --git a/speckle/GetObjectFromCommit.pqm b/speckle/GetObjectFromCommit.pqm
@@ -25,6 +25,7 @@ in
                     id
                     sourceApplication
                     referencedObject
+                    authorId
                 }
             }
         }",

diff --git a/speckle/api/Api.CommitReceived.pqm b/speckle/api/Api.CommitReceived.pqm
@@ -1,6 +1,6 @@
 let
     Speckle.Api.Fetch = Extension.LoadFunction("Api.Fetch.pqm"),
-    Speckle.LogEvent = Extension.LoadFunction("LogEvent.pqm"),
+    Speckle.Log.Receive = Extension.LoadFunction("Log.Receive.pqm"),
     Extension.LoadFunction = (fileName as text) =>
         let
             binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
@@ -27,7 +27,7 @@ in
                     sourceApplication = "PowerBI"
                 ]
             ],
-            s = Speckle.LogEvent(server, commit)
+            s = Speckle.Log.Receive(server, commit)
         in
             // Read receipts should fail gracefully no matter what
             try Speckle.Api.Fetch(s, query, variables)[commitReceive] otherwise false
diff --git a/speckle/api/Api.GetUser.pqm b/speckle/api/Api.GetUser.pqm
@@ -1,11 +1,13 @@
 (url as text) =>
     let
+        userType = type [name = text, email = text, id = text],
         query = "query {
-            activeUser { name email }
+            activeUser { name email id }
         }",
         // Imports
         Speckle.Api.Fetch = Extension.LoadFunction("Api.Fetch.pqm"),
-        server = Extension.LoadFunction("ParseStreamUrl.pqm"),
+        ParseUrl = Extension.LoadFunction("ParseStreamUrl.pqm"),
+        urlObject = ParseUrl(url),
         Extension.LoadFunction = (fileName as text) =>
             let
                 binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
@@ -18,7 +20,8 @@
                                 Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
                                 Message.Parameters = {fileName, e[Reason], e[Message]},
                                 Detail = [File = fileName, Error = e]
-                            ]
+                            ],
+        user = Speckle.Api.Fetch(urlObject[server], query)[activeUser]
     in
         // Read receipts should fail gracefully no matter what
-        try Speckle.Api.Fetch(server, query)[activeUser][email] otherwise "hey"
+        Value.ReplaceType(user, userType)
diff --git a/speckle/logging/Log.Receive.pqm b/speckle/logging/Log.Receive.pqm
@@ -0,0 +1,33 @@
+let
+    GetApplicationSlug = Extension.LoadFunction("GetApplicationSlug.pqm"),
+    GetUser = Extension.LoadFunction("Api.GetUser.pqm"),
+    LogEvent = Extension.LoadFunction("LogEvent.pqm"),
+    Hash = Extension.LoadFunction("Hash.pqm"),
+    Extension.LoadFunction = (fileName as text) =>
+        let
+            binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
+        in
+            try
+                Expression.Evaluate(asText, #shared) catch (e) =>
+                    error
+                        [
+                            Reason = "Extension.LoadFunction Failure",
+                            Message.Format = "Loading '#{0}' failed - '#{1}': '#{2}'",
+                            Message.Parameters = {fileName, e[Reason], e[Message]},
+                            Detail = [File = fileName, Error = e]
+                        ]
+in
+    (server as text, commit as text) =>
+        let
+            user = GetUser(server),
+            event = "Receive",
+            properties = [
+                server_id = Hash(server),
+                token = "acd87c5a50b56df91a795e999812a3a4",
+                hostApp = "powerbi",
+                sourceHostApp = GetApplicationSlug(commit[sourceApplication]),
+                sourceHostAppVersion = commit[sourceApplication],
+                isMultiplayer = commit[authorId] <> user[id]
+            ]
+        in
+            LogEvent(server, event, properties)
diff --git a/speckle/helpers/LogEvent.pqm → speckle/logging/LogEvent.pqm b/speckle/helpers/LogEvent.pqm → speckle/logging/LogEvent.pqm
@@ -1,7 +1,4 @@
 let
-    GetApplicationSlug = Extension.LoadFunction("GetApplicationSlug.pqm"),
-    GetUser = Extension.LoadFunction("GetUser.pqm"),
-    Hash = Extension.LoadFunction("Hash.pqm"),
     Extension.LoadFunction = (fileName as text) =>
         let
             binary = Extension.Contents(fileName), asText = Text.FromBinary(binary)
@@ -16,19 +13,12 @@ let
                             Detail = [File = fileName, Error = e]
                         ]
 in
-    (server as text, commit as any) =>
+    (server as text, event as text, properties as record) =>
         let
             trackUrl = "https://analytics.speckle.systems/track?ip=1",
-            user = GetUser(server),
             body = [
-                event = "Receive",
-                properties = [
-                    server_id = Hash(server),
-                    token = "acd87c5a50b56df91a795e999812a3a4",
-                    hostApp = "powerbi",
-                    sourceHostApp = GetApplicationSlug(commit[sourceApplication]),
-                    sourceHostAppVersion = commit[sourceApplication]
-                ]
+                event = event,
+                properties = properties
             ],
             Result = Web.Contents(
                 trackUrl,