hot fix for app service authentication issue (#1226)

OfficeDev · Nov 23, 2023 · 40d2c51 · 40d2c51
1 parent c40047a
commit 40d2c51
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/Source/CompanyCommunicator/ClientApp/src/apis/apiDecorator.ts b/Source/CompanyCommunicator/ClientApp/src/apis/apiDecorator.ts
@@ -3,18 +3,12 @@
 
 import { ROUTE_PARTS } from '../routes';
 import i18n from '../i18n';
-import { store } from '../store';
-import { HostClientType, authentication } from '@microsoft/teams-js';
-
-const isIOSHost = () => {
-  const clientType = store.getState().messages.hostClientType.payload;
-  return clientType === HostClientType.ios || clientType === HostClientType.ipados;
-};
+import { authentication } from '@microsoft/teams-js';
 
 export class ApiDecorator {
   public async getJsonResponse(url: string): Promise<any> {
     return await this.handleApiCall('get', url).then((response) => {
-      if (response.type === 'cors' && response.status >= 401 && isIOSHost()) {
+      if (response.type === 'cors' && response.status >= 401) {
         return this.handleApiCall('get', response.url).then((result) => result.json());
       } else if (response.status >= 401) {
         this.handleError(response);
@@ -26,7 +20,7 @@ export class ApiDecorator {
 
   public async getTextResponse(url: string): Promise<any> {
     return await this.handleApiCall('get', url).then((response) => {
-      if (response.type === 'cors' && response.status >= 401 && isIOSHost()) {
+      if (response.type === 'cors' && response.status >= 401) {
         return this.handleApiCall('get', response.url).then((result) => result.text());
       } else if (response.status >= 401) {
         this.handleError(response);
@@ -38,7 +32,7 @@ export class ApiDecorator {
 
   public async postAndGetJsonResponse(url: string, data?: any): Promise<any> {
     return await this.handleApiCall('post', url, data).then((response) => {
-      if (response.type === 'cors' && response.status >= 401 && isIOSHost()) {
+      if (response.type === 'cors' && response.status >= 401) {
         return this.handleApiCall('post', response.url, data).then((result) => result.json());
       } else {
         return response.json();
@@ -48,7 +42,7 @@ export class ApiDecorator {
 
   public async postAndGetTextResponse(url: string, data?: any): Promise<any> {
     return await this.handleApiCall('post', url, data).then((response) => {
-      if (response.type === 'cors' && response.status >= 401 && isIOSHost()) {
+      if (response.type === 'cors' && response.status >= 401) {
         return this.handleApiCall('post', response.url, data).then((result) => result.text());
       } else {
         return response.text();
@@ -58,7 +52,7 @@ export class ApiDecorator {
 
   public async putAndGetJsonResponse(url: string, data?: any): Promise<any> {
     return await this.handleApiCall('put', url, data).then((response) => {
-      if (response.type === 'cors' && response.status >= 401 && isIOSHost()) {
+      if (response.type === 'cors' && response.status >= 401) {
         return this.handleApiCall('put', response.url, data).then((result) => result.json());
       } else {
         return response.json();
@@ -68,7 +62,7 @@ export class ApiDecorator {
 
   public async putAndGetTextResponse(url: string, data?: any): Promise<any> {
     return await this.handleApiCall('put', url, data).then((response) => {
-      if (response.type === 'cors' && response.status >= 401 && isIOSHost()) {
+      if (response.type === 'cors' && response.status >= 401) {
         return this.handleApiCall('put', response.url, data).then((result) => result.text());
       } else {
         return response.text();
@@ -78,7 +72,7 @@ export class ApiDecorator {
 
   public async deleteAndGetJsonResponse(url: string): Promise<any> {
     return await this.handleApiCall('delete', url).then((response) => {
-      if (response.type === 'cors' && response.status >= 401 && isIOSHost()) {
+      if (response.type === 'cors' && response.status >= 401) {
         return this.handleApiCall('delete', response.url).then((result) => result.json());
       } else {
         return response.json();
@@ -88,7 +82,7 @@ export class ApiDecorator {
 
   public async deleteAndGetTextResponse(url: string): Promise<any> {
     return await this.handleApiCall('delete', url).then((response) => {
-      if (response.type === 'cors' && response.status >= 401 && isIOSHost()) {
+      if (response.type === 'cors' && response.status >= 401) {
         return this.handleApiCall('delete', response.url).then((result) => result.text());
       } else {
         return response.text();