Merge pull request #343 from raisingthefloor/master

Morphic for Windows v1.6
raisingthefloor · Sep 21, 2022 · 75fb0b1 · 75fb0b1
2 parents e987e0d + c392d1f
commit 75fb0b1
Show file tree

Hide file tree

Showing 18 changed files with 1,678 additions and 262 deletions.
diff --git a/Morphic.Client/App.xaml.cs b/Morphic.Client/App.xaml.cs
@@ -871,7 +871,7 @@ private void ConfigureTelemetry()
 
         internal record SessionTelemetryEventData
         {
-            [JsonPropertyName("sessionId")]
+            [JsonPropertyName("session_id")]
             public Guid? SessionId { get; set; }
             //
             [JsonPropertyName("state")]
@@ -1491,7 +1491,7 @@ protected override async void OnExit(ExitEventArgs e)
             _messageWatcherNativeWindow?.Dispose();
             if (ConfigurableFeatures.TelemetryIsEnabled == true)
             {
-                // dispose of our heartbeat timer
+                // dispose of our telemetry heartbeat timer
                 _telemetryHeartbeatTimer.Dispose();
 
                 try

diff --git a/Morphic.Client/Bar/Data/Actions/Functions.cs b/Morphic.Client/Bar/Data/Actions/Functions.cs
diff --git a/Morphic.Client/DefaultConfig/presets.json5 b/Morphic.Client/DefaultConfig/presets.json5
@@ -317,6 +317,30 @@
           }
         }
       }
+    },
+    "usbopeneject": {
+      kind: "internal",
+      widget: "multi",
+      configuration: {
+        function: "allUsbAction",
+        args: {
+          value: "{button}"
+        },
+        label: "{{QuickStrip_UsbOpenEject_Title}}",
+        telemetryCategory: "morphicBarExtraItem",
+        buttons: {
+          open: {
+            label: "{{QuickStrip_UsbOpenEject_Open_Title}}",
+            tooltip: "{{QuickStrip_UsbOpenEject_Open_HelpTitle}}",
+            value: "openallusb"
+          },
+          eject: {
+            label: "{{QuickStrip_UsbOpenEject_Eject_Title}}",
+            tooltip: "{{QuickStrip_UsbOpenEject_Eject_HelpTitle}}",
+            value: "ejectallusb"
+          }
+        }
+      }
     }
   },
   defaults: {

diff --git a/Morphic.Client/Morphic.Client.csproj b/Morphic.Client/Morphic.Client.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>Morphic</AssemblyName>
     <PublishTrimmed>false</PublishTrimmed>
     <Platforms>AnyCPU;x64</Platforms>
-    <VersionPrefix>1.5$(VersionBuildComponents)</VersionPrefix>
+    <VersionPrefix>1.6$(VersionBuildComponents)</VersionPrefix>
     <VersionSuffix Condition="'$(Configuration)' == 'Debug'">localdev</VersionSuffix>
     <VersionSuffix Condition="'$(Configuration)' == 'Release'">$(VersionSuffix)</VersionSuffix>
     <StartupObject>Morphic.Client.AppMain</StartupObject>
@@ -83,8 +83,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.3" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.3" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
-    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
+<!--    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" /> -->
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" />
     <PackageReference Include="NHotkey.Wpf" Version="2.0.1" />
     <PackageReference Include="NReco.Logging.File" Version="1.1.1" />
     <PackageReference Include="PInvoke.User32" Version="0.7.104" />

diff --git a/Morphic.Client/app.Debug.manifest b/Morphic.Client/app.Debug.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.5.0.0" name="Morphic.app"/>
+  <assemblyIdentity version="1.6.0.0" name="Morphic.app"/>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

diff --git a/Morphic.Client/app.Development.manifest b/Morphic.Client/app.Development.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.5.0.0" name="Morphic.app"/>
+  <assemblyIdentity version="1.6.0.0" name="Morphic.app"/>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

diff --git a/Morphic.Client/app.Production.manifest b/Morphic.Client/app.Production.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.5.0.0" name="Morphic.app"/>
+  <assemblyIdentity version="1.6.0.0" name="Morphic.app"/>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

diff --git a/Morphic.OAuth.Client/OAuthClient.cs b/Morphic.OAuth.Client/OAuthClient.cs
diff --git a/Morphic.OAuth.Core/Rfc6749/Rfc6749Objects.cs b/Morphic.OAuth.Core/Rfc6749/Rfc6749Objects.cs
@@ -0,0 +1,69 @@
+// Copyright 2021-2022 Raising the Floor - US, Inc.
+//
+// Licensed under the New BSD license. You may not use this file except in
+// compliance with this License.
+//
+// You may obtain a copy of the License at
+// https://github.com/raisingthefloor/morphic-oauthcore-lib-cs/blob/main/LICENSE
+//
+// The R&D leading to these results received funding from the:
+// * Rehabilitation Services Administration, US Dept. of Education under
+//   grant H421A150006 (APCP)
+// * National Institute on Disability, Independent Living, and
+//   Rehabilitation Research (NIDILRR)
+// * Administration for Independent Living & Dept. of Education under grants
+//   H133E080022 (RERC-IT) and H133E130028/90RE5003-01-00 (UIITA-RERC)
+// * European Union's Seventh Framework Programme (FP7/2007-2013) grant
+//   agreement nos. 289016 (Cloud4all) and 610510 (Prosperity4All)
+// * William and Flora Hewlett Foundation
+// * Ontario Ministry of Research and Innovation
+// * Canadian Foundation for Innovation
+// * Adobe Foundation
+// * Consumer Electronics Association Foundation
+
+using Morphic.Core;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace Morphic.OAuth.Rfc6749
+{
+    public struct Rfc6749AccessTokenSuccessfulResponseContent
+    {
+        public string? access_token { get; set; }
+        public string? token_type { get; set; }
+        public double? expires_in { get; set; }
+        public string? refresh_token { get; set; }
+        public string? scope { get; set; }
+    }
+
+    public enum Rfc6749AccessTokenErrorResponseErrorCodes
+    {
+        [MorphicStringValue("invalid_request")]
+        InvalidRequest,
+        //
+        [MorphicStringValue("invalid_client")]
+        InvalidClient,
+        //
+        [MorphicStringValue("invalid_grant")]
+        InvalidGrant,
+        //
+        [MorphicStringValue("unauthorized_client")]
+        UnauthorizedClient,
+        //
+        [MorphicStringValue("unsupported_grant_type")]
+        UnsupportedGrantType,
+        //
+        [MorphicStringValue("invalid_scope")]
+        InvalidScope
+    }
+
+    //
+
+    public struct Rfc6749AccessTokenErrorResponseContent
+    {
+        public string? error { get; set; }
+        public string? error_description { get; set; }
+        public string? error_uri { get; set; }
+    }
+
+}
diff --git a/Morphic.Settings/Morphic.Settings.csproj b/Morphic.Settings/Morphic.Settings.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="DotNetWindowsRegsitry" Version="0.1.0-alpha1" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.3" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Morphic.Setup/Morphic.Setup.wixproj b/Morphic.Setup/Morphic.Setup.wixproj
@@ -66,9 +66,6 @@
   <Target Name="AfterPreBuild" AfterTargets="PreBuildEvent">
     <HeatDirectory Directory="..\Morphic.Client\bin\$(Configuration)\netcoreapp3.1\win-x64\publish" PreprocessorVariable="var.ClientOutputDirectory" OutputFile="Generated.wxs" ComponentGroupName="GeneratedComponents" DirectoryRefId="INSTALLFOLDER" AutogenerateGuids="true" ToolPath="$(WixToolPath)" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" />
   </Target>
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <PreBuildEvent>dotnet publish $(ProjectDir)..\Morphic.Client\Morphic.Client.csproj -f netcoreapp3.1 -r win-x64 -c $(Configuration) -p:BuildType=$(BuildType)</PreBuildEvent>
-  </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.

diff --git a/Morphic.Setup/Product.wxs b/Morphic.Setup/Product.wxs
@@ -27,12 +27,14 @@
         <UIRef Id="WixUI_Minimal" />
         <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
 
+        <UIRef Id="WixUI_ErrorProgressText" />
+
         <Property Id="WINDOWSBUILDNUMBER" Secure="yes">
             <RegistrySearch Id="BuildNumberSearch" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuildNumber" Type="raw" />
         </Property>
         <Condition Message="This application is only supported on Windows 10 version 1809 (build 17763) or higher.">
             <![CDATA[(WINDOWSBUILDNUMBER >= 17763)]]>
-        </Condition>        
+        </Condition>
     </Product>
 
   <Fragment>