Merge pull request #44 from wireapp/staging

Release v1.1.1 WPB-15513

.env.localhost

@@ -1,4 +1,5 @@
 BASE_URL=
 WIRE_API_BASE_URL=
+WIRE_API_VERISON=
 WIRE_API_AUTHORIZATION_ENDPOINT=
 CLIENT_ID=

README.md

@@ -10,6 +10,9 @@ value: https://outlook.integrations.zinfra.io
 - name: WIRE_API_BASE_URL
 value: https://staging-nginz-https.zinfra.io
 
+- name: WIRE_API_VERSION
+value: v5
+
 - name: WIRE_AUTHORIZATION_ENDPOINT
 value: https://wire-webapp-qa.zinfra.io/auth
 
@@ -22,10 +25,13 @@ value: e30a9b94-8e0d-4b15-8a1a-236f68729cdd
 window.config = {
   addInBaseUrl: "${BASE_URL}",
   apiBaseUrl: "${WIRE_API_BASE_URL}",
+  apiVersion: "${WIRE_API_VERSION}",
   authorizeUrl: "${WIRE_AUTHORIZATION_ENDPOINT}",
   clientId: "${CLIENT_ID}",
 };
 ```
+## API Version
+The WIRE_API_VERSION environment variable can be optionally set to define the API version for the application. If not explicitly set, the default value of 'v5' will be used.
 
 ## Local Storage
 - isLoggedIn

entrypoint.sh

@@ -6,6 +6,7 @@ set -euo pipefail
 
 if [ -z ${BASE_URL:-} ]; then echo "BASE_URL is unset"; exit 1; fi
 if [ -z ${WIRE_API_BASE_URL:-} ]; then echo "WIRE_API_BASE_URL is unset"; exit 1; fi
+if [ -z ${WIRE_API_VERSION:-} ]; then echo "WIRE_API_VERSION is unset, defaulting to v5"; fi
 if [ -z ${WIRE_AUTHORIZATION_ENDPOINT:-} ]; then echo "WIRE_AUTHORIZATION_ENDPOINT is unset"; exit 1; fi
 if [ -z ${CLIENT_ID:-} ]; then echo "CLIENT_ID is unset"; exit 1; fi
 #if [ -z ${SUPPORT_URL:-} ]; then echo "SUPPORT_URL is unset"; exit 1; fi

manifest.xml.template

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <OfficeApp xmlns="http://schemas.microsoft.com/office/appforoffice/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bt="http://schemas.microsoft.com/office/officeappbasictypes/1.0" xmlns:mailappor="http://schemas.microsoft.com/office/mailappversionoverrides/1.0" xsi:type="MailApp">
   <Id>50581182-7271-4e44-8aa7-63c432b46a3e</Id>
-  <Version>0.1.8</Version>
+  <Version>1.1.0</Version>
   <ProviderName>Wire</ProviderName>
   <DefaultLocale>en-US</DefaultLocale>
   <DisplayName DefaultValue="Wire"/>
   <Description DefaultValue="Wire meeting integration for Outlook"/>
   <IconUrl DefaultValue="${BASE_URL}/assets/icon-64.png"/>
   <HighResolutionIconUrl DefaultValue="${BASE_URL}/assets/icon-128.png"/>
+  <SupportUrl DefaultValue="https://support.wire.com" />
   <Hosts>
     <Host Name="Mailbox"/>
   </Hosts>
@@ -95,15 +96,6 @@
             </OfficeTab>
           </ExtensionPoint>
 
-          <!-- Enable launching the add-in on the included event. -->
-          <ExtensionPoint xsi:type="LaunchEvent">
-            <LaunchEvents>
-              <LaunchEvent Type="OnAppointmentSend" FunctionName="onAppointmentSendHandler" SendMode="PromptUser" />
-            </LaunchEvents>
-            <!-- Identifies the runtime to be used (also referenced by the Runtime element). -->
-            <SourceLocation resid="WebViewRuntime.Url"/>
-          </ExtensionPoint>
-
         </DesktopFormFactor>
 
         <MobileFormFactor>
@@ -158,10 +150,6 @@
         <bt:String id="TaskpaneButton.Tooltip" DefaultValue="Opens a pane displaying all available properties."/>
       </bt:LongStrings>
     </Resources>
-    <!-- Configure the prepend-on-send or append-on-send feature using the AppendOnSend value. -->
-    <ExtendedPermissions>
-      <ExtendedPermission>AppendOnSend</ExtendedPermission>
-    </ExtendedPermissions>
   </VersionOverrides>
 </VersionOverrides>
 </OfficeApp>

package.json

@@ -15,6 +15,7 @@
     "build": "webpack --mode production",
     "build:dev": "webpack --mode development",
     "dev-server": "webpack serve --mode development",
+    "dev-server-local": "webpack serve --mode development --host localhost --allowed-hosts all",
     "lint": "office-addin-lint check",
     "lint:fix": "office-addin-lint fix",
     "prettier": "office-addin-lint prettier",
@@ -70,7 +71,7 @@
     "ts-loader": "^9.4.2",
     "typescript": "^5.0.4",
     "webpack": "^5.82.0",
-    "webpack-cli": "^5.1.1",
+    "webpack-cli": "^5.1.4",
     "webpack-dev-server": "4.15.0"
   },
   "prettier": "office-addin-prettier-config",

src/authorize/authorize.ts

@@ -26,9 +26,8 @@ async function redirectToAuthorize(): Promise<void> {
   url.searchParams.append("scope", scope);
   url.searchParams.append("code_challenge_method", codeChallengeMethod);
   url.searchParams.append("code_challenge", codeChallenge);
-  url.hash = "authorize";
 
-  window.location.href = url.href;
+  window.location.href = url.href.replace("/auth?", "/auth/#/login?");
 }
 
 function generateRandomState(): string {