avniproject/avni-server#397 | Support for Keycloak auth

Author: 1t5j0y

packages/openchs-android/package-lock.json

@@ -47,10 +47,11 @@
     "i18n-js": "3.9.2",
     "immutable": "4.1.0",
     "invariant": "2.2.4",
+    "jwt-decode": "^3.1.2",
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "native-base": "3.4.9",
-    "openchs-models": "1.27.28",
+    "openchs-models": "1.27.29",
     "prop-types": "15.8.1",
     "react": "18.2.0",
     "react-native": "0.69.7",

packages/openchs-android/package.json

@@ -5,6 +5,7 @@ import UserInfoService from "../service/UserInfoService";
 import _ from 'lodash';
 import {firebaseEvents, logEvent} from "../utility/Analytics";
 import BackupRestoreRealmService from "../service/BackupRestoreRealm";
+import SettingsService from "../service/SettingsService";
 
 class LoginActions {
     static getInitialState() {
@@ -19,15 +20,18 @@ class LoginActions {
             validationResult: ValidationResult.successful(),
             dumpRestoring: false,
             percentProgress: 0,
-            dumpRestoreMessage: null
+            dumpRestoreMessage: null,
+            idpType: null
         };
     }
 
     static onLoad(state, action, context) {
         const userInfo = context.get(UserInfoService).getUserInfo();
-        const newState = _.assignIn({}, state, userInfo ? {userId: userInfo.username, loggedInUser: userInfo.username, percentProgress: null} : {
+        const settings = context.get(SettingsService).getSettings();
+        const newState = _.assignIn({}, state, userInfo ? {userId: userInfo.username, loggedInUser: userInfo.username, percentProgress: null, idpType: settings.idpType} : {
             percentProgress: null,
-            dumpRestoreMessage: null
+            dumpRestoreMessage: null,
+            idpType: settings.idpType
         });
         newState.dumpRestoring = false;
         return newState;
@@ -48,7 +52,7 @@ class LoginActions {
 
     static onLoginStarted(state, action, context) {
         let newState = _.assignIn({}, state, {loggingIn: true, loginError: '', loginSuccess: false});
-        context.get(AuthService)
+        context.get(AuthService).getAuthProviderService()
             .authenticate(state.userId, state.password)
             .then((response) => {
                 if (response.status === "LOGIN_SUCCESS") {

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

@@ -2,16 +2,20 @@ import General from "../../utility/General";
 import _ from 'lodash';
 import AuthenticationError from "../../service/AuthenticationError";
 import ServerError from "../../service/ServerError";
-import Config from '../Config';
 import GlobalContext from "../../GlobalContext";
 
 const ACCEPTABLE_RESPONSE_STATUSES = [200, 201];
 
 const getAuthToken = async  () => {
     const authService = GlobalContext.getInstance().beanRegistry.getService("authService");
-    return await authService.getAuthToken();
+    return await authService.getAuthProviderService().getAuthToken();
 };
 
+const getIdpType = async () => {
+    const settingsService = GlobalContext.getInstance().beanRegistry.getService("settingsService");
+    return await settingsService.getSettings().idpType;
+}
+
 const fetchFactory = (endpoint, method = "GET", params, fetchWithoutTimeout) => {
     const processResponse = (response) => {
       if (ACCEPTABLE_RESPONSE_STATUSES.indexOf(parseInt(response.status)) > -1) {
@@ -52,8 +56,9 @@ const _addAuthIfRequired = async (request, bypassAuth) => {
     if (bypassAuth) {
         return request;
     }
-    const token = await getAuthToken();
-    return Config.ENV === 'dev' ?
+    const [token, idpType] = await Promise.all([getAuthToken(), getIdpType()]);
+
+    return idpType === 'none' ?
         _.merge({}, request, {headers: {"USER-NAME": token}}) :
         _.merge({}, request, {headers: {'AUTH-TOKEN': token}});
 };
@@ -87,3 +92,8 @@ export let get = (endpoint, bypassAuth = false) => {
 export let getJSON = (endpoint, bypassAuth = false) => {
     return _get(endpoint, bypassAuth);
 };
+
+export let postUrlFormEncoded = (endpoint, body) => {
+    const formBody = new URLSearchParams(body).toString();
+    return fetchFactory(endpoint, "POST", {headers: {'Content-Type': 'application/x-www-form-urlencoded', 'Accept': '*/*'}, body: formBody}, true)
+}