avniproject/avni-server#397 | Fix for tests failing

Author: 1t5j0y

packages/openchs-android/src/action/LoginActions.js

@@ -6,7 +6,7 @@ import _ from 'lodash';
 import { firebaseEvents, logEvent } from "../utility/Analytics";
 import BackupRestoreRealmService from "../service/BackupRestoreRealm";
 import SettingsService from "../service/SettingsService";
-import { IDP_PROVIDERS } from "../service/BaseAuthProviderService";
+import { IDP_PROVIDERS } from "../model/IdpProviders";
 
 class LoginActions {
     static getInitialState() {

packages/openchs-android/src/framework/http/requests.js

@@ -3,7 +3,7 @@ import _ from 'lodash';
 import AuthenticationError from "../../service/AuthenticationError";
 import ServerError from "../../service/ServerError";
 import GlobalContext from "../../GlobalContext";
-import { IDP_PROVIDERS } from "../../service/BaseAuthProviderService";
+import { IDP_PROVIDERS } from "../../model/IdpProviders";
 
 const ACCEPTABLE_RESPONSE_STATUSES = [200, 201];
 

packages/openchs-android/src/model/IdpProviders.js

@@ -0,0 +1,6 @@
+export const IDP_PROVIDERS = {
+    COGNITO: 'cognito',
+    KEYCLOAK: 'keycloak',
+    BOTH: 'both',
+    NONE: 'none'
+};

packages/openchs-android/src/service/AuthService.js

@@ -7,7 +7,7 @@ import UserInfoService from "./UserInfoService";
 import StubbedAuthService from "./StubbedAuthService";
 import CognitoAuthService from "./CognitoAuthService";
 import KeycloakAuthService from "./KeycloakAuthService";
-import { IDP_PROVIDERS } from "./BaseAuthProviderService";
+import { IDP_PROVIDERS } from "../model/IdpProviders";
 
 @Service("authService")
 class AuthService extends BaseService {

packages/openchs-android/src/service/BaseAuthProviderService.js

@@ -58,11 +58,4 @@ class BaseAuthProviderService extends BaseService {
 
 }
 
-const IDP_PROVIDERS = {
-    COGNITO: 'cognito',
-    KEYCLOAK: 'keycloak',
-    BOTH: 'both',
-    NONE: 'none'
-}
-
-export {BaseAuthProviderService, IDP_PROVIDERS};
+export default BaseAuthProviderService;

packages/openchs-android/src/service/CognitoAuthService.js

@@ -7,7 +7,7 @@ import General from "../utility/General";
 import ErrorHandler from "../utility/ErrorHandler";
 import UserInfoService from "./UserInfoService";
 import AuthService from "./AuthService";
-import { BaseAuthProviderService } from "./BaseAuthProviderService";
+import BaseAuthProviderService from "./BaseAuthProviderService";
 
 @Service("cognitoAuthService")
 class CognitoAuthService extends BaseAuthProviderService {

packages/openchs-android/src/service/ExtensionService.js

@@ -8,10 +8,8 @@ import General from "../utility/General";
 import Service from "../framework/bean/Service";
 import RNFetchBlob from "rn-fetch-blob";
 import AuthService from "./AuthService";
-import Config from "../framework/Config";
-import UserInfoService from "./UserInfoService";
 import fs from 'react-native-fs';
-import { IDP_PROVIDERS } from "./BaseAuthProviderService";
+import { IDP_PROVIDERS } from "../model/IdpProviders";
 
 
 @Service("extensionService")

packages/openchs-android/src/service/KeycloakAuthService.js

@@ -1,8 +1,8 @@
 import Service from "../framework/bean/Service";
-import { BaseAuthProviderService } from "./BaseAuthProviderService";
 import { postUrlFormEncoded } from "../framework/http/requests";
 import General from "../utility/General";
 import AuthenticationError, { NO_USER } from "./AuthenticationError";
+import BaseAuthProviderService from "./BaseAuthProviderService";
 
 
 @Service("keycloakAuthService")

packages/openchs-android/src/service/StubbedAuthService.js

@@ -1,6 +1,6 @@
 import Service from "../framework/bean/Service";
 import General from "../utility/General";
-import { BaseAuthProviderService } from "./BaseAuthProviderService";
+import BaseAuthProviderService from "./BaseAuthProviderService";
 
 @Service("stubbedAuthService")
 class StubbedAuthService extends BaseAuthProviderService {

packages/openchs-android/src/views/LoginView.js

@@ -31,7 +31,7 @@ import SyncService from '../service/SyncService';
 import TypedTransition from '../framework/routing/TypedTransition';
 import SetPasswordView from './SetPasswordView';
 import LandingView from './LandingView';
-import { IDP_PROVIDERS } from "../service/BaseAuthProviderService";
+import { IDP_PROVIDERS } from "../model/IdpProviders";
 
 @Path('/loginView')
 class LoginView extends AbstractComponent {