Change image tag to rc version

2025-10-30 02:12:32 +00:00 · 2021-08-31 14:02:55 +02:00
192 changed files with 7139 additions and 21932 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,46 +25,45 @@ jobs:
      DOCKER_REGISTRY_URL: tip-tip-wlan-cloud-ucentral.jfrog.io
      DOCKER_REGISTRY_USERNAME: ucentral
    steps:
-    - name: Checkout actions repo
-      uses: actions/checkout@v2
-      with:
-        repository: Telecominfraproject/.github
-        path: github
+    - uses: actions/checkout@v2

-    - name: Build and push Docker image
-      uses: ./github/composite-actions/docker-image-build
-      with:
-        image_name: owsec
-        registry: tip-tip-wlan-cloud-ucentral.jfrog.io
-        registry_user: ucentral
-        registry_password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+    - name: Build Docker image
+      run: docker build -t wlan-cloud-ucentralsec:${{ github.sha }} .

-  trigger-testing:
-    if: startsWith(github.ref, 'refs/pull/')
-    runs-on: ubuntu-latest
-    needs: docker
-    steps:
-    - name: Get base branch name and set as output
-      id: get_base_branch
+    - name: Tag Docker image
      run: |
-        echo ::set-output name=branch::$(echo ${GITHUB_BASE_REF##*/})
-        echo ::set-output name=owgw_branch::$(echo ${GITHUB_BASE_REF##*/} | sed 's/main/master/g')
+        TAGS="${{ github.sha }}"

-    - name: Checkout actions repo
-      uses: actions/checkout@v2
-      with:
-        repository: Telecominfraproject/.github
-        path: github
+        if [[ ${GITHUB_REF} == "refs/heads/"* ]]
+        then
+          CURRENT_TAG=$(echo ${GITHUB_REF#refs/heads/} | tr '/' '-')
+          TAGS="$TAGS $CURRENT_TAG"
+        else
+          if [[ ${GITHUB_REF} == "refs/tags/"* ]]
+          then
+            CURRENT_TAG=$(echo ${GITHUB_REF#refs/tags/} | tr '/' '-')
+            TAGS="$TAGS $CURRENT_TAG"
+          else # PR build
+            CURRENT_TAG=$(echo ${GITHUB_HEAD_REF#refs/heads/} | tr '/' '-')
+            TAGS="$TAGS $CURRENT_TAG"
+          fi
+        fi

-    - name: Trigger testing of OpenWifi Docker Compose deployment and wait for result
-      uses: ./github/composite-actions/trigger-workflow-and-wait
-      env:
-        BASE_BRANCH: ${{ steps.get_base_branch.outputs.branch }}
-        OWGW_BASE_BRANCH: ${{ steps.get_base_branch.outputs.owgw_branch }}
+        echo "Result tags: $TAGS"
+
+        for tag in $TAGS; do
+          docker tag wlan-cloud-ucentralsec:${{ github.sha }} ${{ env.DOCKER_REGISTRY_URL }}/ucentralsec:$tag
+        done
+
+    - name: Log into Docker registry
+      if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/') || github.ref == 'refs/heads/main'
+      uses: docker/login-action@v1
      with:
-        owner: Telecominfraproject
-        repo: wlan-testing
-        workflow: ow_docker-compose.yml
-        token: ${{ secrets.WLAN_TESTING_PAT }}
-        ref: master
-        inputs: '{"owgw_version": "${{ env.OWGW_BASE_BRANCH }}", "owgwui_version": "${{ env.BASE_BRANCH }}", "owsec_version": "${{ github.sha }}", "owfms_version": "${{ env.BASE_BRANCH }}", "owprov_version": "main", "owprovui_version": "main"}'
+        registry: ${{ env.DOCKER_REGISTRY_URL }}
+        username: ${{ env.DOCKER_REGISTRY_USERNAME }}
+        password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+
+    - name: Push Docker images
+      if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/') || github.ref == 'refs/heads/main'
+      run: |
+        docker images | grep ${{ env.DOCKER_REGISTRY_URL }}/ucentralsec | awk -F ' ' '{print $1":"$2}' | xargs -I {} docker push {}
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -16,4 +16,4 @@ jobs:
    steps:
      - run: |
          export PR_BRANCH_TAG=$(echo ${GITHUB_HEAD_REF#refs/heads/} | tr '/' '-')
-          curl -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/owsec/$PR_BRANCH_TAG"
+          curl -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/ucentralsec/$PR_BRANCH_TAG"
--- a/.github/workflows/enforce-jira-issue-key.yml
+++ b/.github/workflows/enforce-jira-issue-key.yml
@@ -1,24 +0,0 @@
-name: Ensure Jira issue is linked
-
-on:
-  pull_request:
-    types: [opened, edited, reopened, synchronize]
-    branches:
-      - 'release/*'
-
-jobs:
-  check_for_issue_key:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout actions repo
-        uses: actions/checkout@v2
-        with:
-          repository: Telecominfraproject/.github
-          path: github
-
-      - name: Run JIRA check
-        uses: ./github/composite-actions/enforce-jira-issue-key
-        with:
-          jira_base_url: ${{ secrets.TIP_JIRA_URL }}
-          jira_user_email: ${{ secrets.TIP_JIRA_USER_EMAIL }}
-          jira_api_token: ${{ secrets.TIP_JIRA_API_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,3 @@ _deps
 *.csr
 /cmake-build/
 /smake-build-debug/
-test_scripts/curl/result.json
--- a/CLI.md
+++ b/CLI.md
@@ -1,9 +1,9 @@
 # Security Service CLI Documentation

 ## Before using the CLI
-You must set the environment variable `OWSEC`. You must specify the host and port for the security service. Here is an example
+You must set the environment variable `UCENTRALSEC`. You must specify the host and port for the security service. Here is an example
 ```csh
-export OWSEC=mysecurityservice,example.com:16001
+export UCENTRALSEC=mysecurityservice,example.com:16001
 ```
 Once set, you can start using the `CLI`.

@@ -12,59 +12,64 @@ Most commands will take from 0 to 2 parameters. You should include all parameter

 ## The commands

-### listendpoints                          
-Get all the system endpoints.
+### `cli createuser <email> <initial password>`
+This will create a simple user as admin using the email as login ID and setting the initial password.

-### emailtest                              
-Generate a forgot Password e-amil to the logged in user.
+### `cli createuser_v <email> <initial password>`
+This will create a simple user and force email verification. 

-### me
-Show information about the logged user.
+### `cli deleteuser <id>`
+Delete the specified user using the user's UUID.

-### createuser <email> <password>          
-Create a user with an initial password and force the user to change password.
+### `cli getuser <id>`
+Get the specified user using the user's UUID.

-### createuser_v <email> <password>        
-Same as create user but also force an e-mail verification.
+### `cli listusers`
+Get a list of users.

-### deleteuser <user UUID>                 
-Delete the user.
-    
-### getuser <user UUID>                    
-Get the user information.
+### `cli policies`
+List the link used to display password and usage policies for the management site.

-### listusers
-List users.
+### `cli setavatar <id> <filename>`
+Sets the avatar for the user with ID. The file should be gif, png, svg.

-### policies
-List the login and access policies.
+### `cli deleteavatar <id>`
+Remove the avatar fort the specified user ID.

-### setavatar <user UUID> <filename>       
-Sets the avatar for user to the image in filename.
+### `cli secversion`
+Get the vewrsion of the secufiry service.

-### getavatar <user UUID>                  
-Get the avatar for the user.
+### `cli sectimes`
+Get the starttime and uptime for the security service.

-### deleteavatar <user UUID>               
-Remove the avatar for a user.

-### sendemail <recipient> <from>           
-Sends a test email to see if the e-mail system is working.

-### setloglevel <subsystem> <loglevel>
-Set the log level for s specific subsystem.

-### getloglevels
-Get the current log levels for all subsystems.
+### `cli revisions`
+Get the list of currently available revisions.

-### getloglevelnames
-Get the log level names available.
+### `cli devicetypes`
+Retrieve the list of known `device_types`

-### getsubsystemnames
-Get the list of subsystems.
+### `cli firmwareage <device_type> <revision>`
+If you specify your `device_type` and `revision`, the system will do its best to estimate how
+far in the past you `revision` is compared to the latest revision.

-### systeminfo
-Get basic system information.
+### `cli gethistory <serialNumber>`
+Get the revision history for a given device.
+
+### `cli connecteddevices`
+Get a list of the currently known devices and the last connection information we have about the,
+
+### `cli connecteddevice <serialNumber>`
+Get the information relevant to a specific device.
+
+### `cli devicereport`
+Give a simplified dashboard report of the data in the service.
+
+### `cli fmsversion`
+Display the version of the service.
+
+### `cli fmstimes`
+Display the uptime and start time of the service.

-### reloadsubsystem <subsystem name>
-Reload the configuration for a subsystem.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owsec VERSION 2.5.0)
+project(ucentralsec VERSION 2.1.0)

 set(CMAKE_CXX_STANDARD 17)

@@ -20,32 +20,19 @@ endif()

 # Auto build increment. You must define BUILD_INCREMENT with cmake -DBUILD_INCREMENT=1
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/build)
-    file(READ ${CMAKE_CURRENT_SOURCE_DIR}/build BUILD_NUM)
+    file(READ build BUILD_NUM)
    if(BUILD_INCREMENT)
        MATH(EXPR BUILD_NUM "${BUILD_NUM}+1")
-        file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/build ${BUILD_NUM})
+        file(WRITE build ${BUILD_NUM})
    endif()
 else()
    set(BUILD_NUM 1)
-    file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/build ${BUILD_NUM})
+    file(WRITE build ${BUILD_NUM})
 endif()

-find_package(Git QUIET)
-if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
-    execute_process(COMMAND ${GIT_EXECUTABLE} describe --always --tags
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-            RESULT_VARIABLE GIT_RESULT
-            OUTPUT_VARIABLE GIT_HASH)
-    if(NOT GIT_RESULT EQUAL "0")
-        message(FATAL_ERROR "git describe --always --tags failed with ${GIT_RESULT}")
-    endif()
-    string(REGEX REPLACE "\n$" "" GIT_HASH "${GIT_HASH}")
-endif()
-
-add_definitions(-DAWS_CUSTOM_MEMORY_MANAGEMENT)
-
 set(BUILD_SHARED_LIBS 1)

+add_definitions(-DAPP_VERSION="${CMAKE_PROJECT_VERSION}" -DBUILD_NUMBER="${BUILD_NUM}")
 add_definitions(-DTIP_SECURITY_SERVICE="1")

 set(Boost_USE_STATIC_LIBS OFF)
@@ -54,82 +41,46 @@ set(Boost_USE_STATIC_RUNTIME OFF)
 find_package(Boost REQUIRED system)
 find_package(OpenSSL REQUIRED)
 find_package(ZLIB REQUIRED)
-find_package(AWSSDK     REQUIRED COMPONENTS sns)
-find_package(nlohmann_json  REQUIRED)
+
 find_package(CppKafka REQUIRED)
 find_package(PostgreSQL REQUIRED)
 find_package(MySQL REQUIRED)
 find_package(Poco REQUIRED COMPONENTS JSON Crypto JWT Net Util NetSSL Data DataSQLite DataPostgreSQL DataMySQL)

-include_directories(/usr/local/include  /usr/local/opt/openssl/include src include/kafka /usr/local/opt/mysql-client/include)
-
-configure_file(src/ow_version.h.in ${PROJECT_SOURCE_DIR}/src/ow_version.h @ONLY)
-
-add_executable( owsec
-        build
-        src/ow_version.h.in
-        src/framework/CountryCodes.h
-        src/framework/KafkaTopics.h
-        src/framework/MicroService.h
-        src/framework/orm.h
-        src/framework/RESTAPI_errors.h
-        src/framework/RESTAPI_protocol.h
-        src/framework/StorageClass.h
-        src/framework/uCentral_Protocol.h
-        src/seclibs/qrcode/qrcodegen.hpp src/seclibs/qrcode/qrcodegen.cpp
-        src/seclibs/cpptotp/bytes.cpp src/seclibs/cpptotp/bytes.h
-        src/seclibs/cpptotp/otp.cpp src/seclibs/cpptotp/otp.h
-        src/seclibs/cpptotp/sha1.cpp src/seclibs/cpptotp/sha1.h
-        src/RESTObjects/RESTAPI_SecurityObjects.h src/RESTObjects/RESTAPI_SecurityObjects.cpp
-        src/RESTObjects/RESTAPI_ProvObjects.cpp src/RESTObjects/RESTAPI_ProvObjects.h
-        src/RESTObjects/RESTAPI_GWobjects.h src/RESTObjects/RESTAPI_GWobjects.cpp
-        src/RESTObjects/RESTAPI_FMSObjects.h src/RESTObjects/RESTAPI_FMSObjects.cpp
-        src/RESTAPI/RESTAPI_oauth2_handler.h src/RESTAPI/RESTAPI_oauth2_handler.cpp
-        src/RESTAPI/RESTAPI_users_handler.cpp src/RESTAPI/RESTAPI_users_handler.h
-        src/RESTAPI/RESTAPI_user_handler.cpp src/RESTAPI/RESTAPI_user_handler.h
-        src/RESTAPI/RESTAPI_action_links.cpp src/RESTAPI/RESTAPI_action_links.h
-        src/RESTAPI/RESTAPI_validate_token_handler.cpp src/RESTAPI/RESTAPI_validate_token_handler.h
-        src/RESTAPI/RESTAPI_system_endpoints_handler.cpp src/RESTAPI/RESTAPI_system_endpoints_handler.h
-        src/RESTAPI/RESTAPI_asset_server.cpp src/RESTAPI/RESTAPI_asset_server.h
-        src/RESTAPI/RESTAPI_avatar_handler.cpp src/RESTAPI/RESTAPI_avatar_handler.h
-        src/RESTAPI/RESTAPI_subavatar_handler.cpp src/RESTAPI/RESTAPI_subavatar_handler.h
-        src/RESTAPI/RESTAPI_email_handler.cpp src/RESTAPI/RESTAPI_email_handler.h
-        src/RESTAPI/RESTAPI_sms_handler.cpp src/RESTAPI/RESTAPI_sms_handler.h
-        src/RESTAPI/RESTAPI_suboauth2_handler.h src/RESTAPI/RESTAPI_suboauth2_handler.cpp
-        src/RESTAPI/RESTAPI_subuser_handler.h src/RESTAPI/RESTAPI_subuser_handler.cpp
-        src/RESTAPI/RESTAPI_subusers_handler.h src/RESTAPI/RESTAPI_subusers_handler.cpp
-        src/RESTAPI/RESTAPI_validate_sub_token_handler.cpp src/RESTAPI/RESTAPI_validate_sub_token_handler.h
-        src/RESTAPI/RESTAPI_submfa_handler.cpp src/RESTAPI/RESTAPI_submfa_handler.h
-        src/RESTAPI/RESTAPI_preferences.cpp src/RESTAPI/RESTAPI_preferences.h
-        src/RESTAPI/RESTAPI_subpreferences.cpp src/RESTAPI/RESTAPI_subpreferences.h
-        src/RESTAPI/RESTAPI_routers.cpp
-        src/Daemon.h src/Daemon.cpp
-        src/SpecialUserHelpers.h
-        src/AuthService.h src/AuthService.cpp
-        src/StorageService.cpp src/StorageService.h
-        src/SMTPMailerService.cpp src/SMTPMailerService.h
-        src/SMSSender.cpp src/SMSSender.h
-        src/MFAServer.cpp src/MFAServer.h
-        src/SMS_provider_aws.cpp src/SMS_provider_aws.h
-        src/SMS_provider.cpp src/SMS_provider.h
-        src/SMS_provider_twilio.cpp src/SMS_provider_twilio.h
-        src/ActionLinkManager.cpp src/ActionLinkManager.h
-        src/ACLProcessor.h
-        src/framework/OpenWifiTypes.h
-        src/storage/orm_users.cpp src/storage/orm_users.h
-        src/storage/orm_tokens.cpp src/storage/orm_tokens.h
-        src/storage/orm_preferences.cpp src/storage/orm_preferences.h
-        src/storage/orm_actionLinks.cpp src/storage/orm_actionLinks.h
-        src/storage/orm_avatar.cpp src/storage/orm_avatar.h
-        src/SpecialUserHelpers.h
-        src/RESTAPI/RESTAPI_db_helpers.h src/storage/orm_logins.cpp src/storage/orm_logins.h src/RESTAPI/RESTAPI_totp_handler.cpp src/RESTAPI/RESTAPI_totp_handler.h src/TotpCache.h src/RESTAPI/RESTAPI_subtotp_handler.cpp src/RESTAPI/RESTAPI_subtotp_handler.h)
+add_executable( ucentralsec
+                build
+                src/Daemon.h src/Daemon.cpp
+                src/MicroService.cpp src/MicroService.h
+                src/SubSystemServer.cpp src/SubSystemServer.h
+                src/RESTAPI_oauth2Handler.h src/RESTAPI_oauth2Handler.cpp
+                src/RESTAPI_handler.h src/RESTAPI_handler.cpp
+                src/RESTAPI_server.cpp src/RESTAPI_server.h
+                src/RESTAPI_SecurityObjects.cpp src/RESTAPI_SecurityObjects.h
+                src/RESTAPI_system_command.h src/RESTAPI_system_command.cpp
+                src/RESTAPI_protocol.h
+                src/AuthService.h src/AuthService.cpp
+                src/KafkaManager.h src/KafkaManager.cpp
+                src/StorageService.cpp src/StorageService.h
+                src/Utils.cpp src/Utils.h
+                src/storage_setup.cpp
+                src/storage_tables.cpp src/SMTPMailerService.cpp src/SMTPMailerService.h
+                src/RESTAPI_users_handler.cpp src/RESTAPI_users_handler.h
+                src/RESTAPI_user_handler.cpp src/RESTAPI_user_handler.h
+                src/RESTAPI_action_links.cpp src/RESTAPI_action_links.h src/storage_users.cpp
+                src/RESTAPI_InternalServer.cpp src/RESTAPI_InternalServer.h
+                src/RESTAPI_validateToken_handler.cpp src/RESTAPI_validateToken_handler.h
+                src/RESTAPI_systemEndpoints_handler.cpp src/RESTAPI_systemEndpoints_handler.h
+                src/RESTAPI_AssetServer.cpp src/RESTAPI_AssetServer.h
+                src/RESTAPI_avatarHandler.cpp src/RESTAPI_avatarHandler.h
+                src/storage_avatar.cpp src/storage_avatar.h src/storage_users.h
+                src/OpenWifiTypes.h )

 if(NOT SMALL_BUILD)
-    target_link_libraries(owsec PUBLIC
+    target_link_libraries(ucentralsec PUBLIC
            ${Poco_LIBRARIES} ${Boost_LIBRARIES} ${MySQL_LIBRARIES}  ${ZLIB_LIBRARIES}
-            CppKafka::cppkafka ${AWSSDK_LINK_LIBRARIES}
+            CppKafka::cppkafka
            )
    if(UNIX AND NOT APPLE)
-        target_link_libraries(owsec PUBLIC PocoJSON)
+        target_link_libraries(ucentralsec PUBLIC PocoJSON)
    endif()
 endif()
--- a/119
+++ b/119
@@ -1,27 +1,15 @@
-FROM alpine:3.15 AS build-base
+FROM alpine AS builder

 RUN apk add --update --no-cache \
-    make cmake g++ git \
-    unixodbc-dev postgresql-dev mariadb-dev \
-    librdkafka-dev boost-dev openssl-dev \
-    zlib-dev nlohmann-json \
-    curl-dev
+    openssl openssh \
+    ncurses-libs \
+    bash util-linux coreutils curl \
+    make cmake gcc g++ libstdc++ libgcc git zlib-dev \
+    openssl-dev boost-dev unixodbc-dev postgresql-dev mariadb-dev \
+    apache2-utils yaml-dev apr-util-dev \
+    librdkafka-dev

-FROM build-base AS poco-build
-
-ADD https://api.github.com/repos/stephb9959/poco/git/refs/heads/master version.json
 RUN git clone https://github.com/stephb9959/poco /poco
-
-WORKDIR /poco
-RUN mkdir cmake-build
-WORKDIR cmake-build
-RUN cmake ..
-RUN cmake --build . --config Release -j8
-RUN cmake --build . --target install
-
-FROM build-base AS cppkafka-build
-
-ADD https://api.github.com/repos/stephb9959/cppkafka/git/refs/heads/master version.json
 RUN git clone https://github.com/stephb9959/cppkafka /cppkafka

 WORKDIR /cppkafka
@@ -31,92 +19,43 @@ RUN cmake ..
 RUN cmake --build . --config Release -j8
 RUN cmake --build . --target install

-FROM build-base AS json-schema-validator-build
-
-ADD https://api.github.com/repos/pboettch/json-schema-validator/git/refs/heads/master version.json
-RUN git clone https://github.com/pboettch/json-schema-validator /json-schema-validator
-
-WORKDIR /json-schema-validator
+WORKDIR /poco
 RUN mkdir cmake-build
 WORKDIR cmake-build
 RUN cmake ..
-RUN make
-RUN make install
-
-FROM build-base AS aws-sdk-cpp-build
-
-ADD https://api.github.com/repos/aws/aws-sdk-cpp/git/refs/heads/main version.json
-RUN git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp /aws-sdk-cpp
-
-WORKDIR /aws-sdk-cpp
-RUN mkdir cmake-build
-WORKDIR cmake-build
-RUN cmake .. -DBUILD_ONLY="sns;s3" \
-             -DCMAKE_BUILD_TYPE=Release \
-             -DCMAKE_CXX_FLAGS="-Wno-error=stringop-overflow -Wno-error=uninitialized" \
-             -DAUTORUN_UNIT_TESTS=OFF
 RUN cmake --build . --config Release -j8
 RUN cmake --build . --target install

-FROM build-base AS owsec-build
+ADD CMakeLists.txt build /ucentralsec/
+ADD cmake /ucentralsec/cmake
+ADD src /ucentralsec/src

-ADD CMakeLists.txt build /owsec/
-ADD cmake /owsec/cmake
-ADD src /owsec/src
-ADD .git /owsec/.git
-
-COPY --from=poco-build /usr/local/include /usr/local/include
-COPY --from=poco-build /usr/local/lib /usr/local/lib
-COPY --from=cppkafka-build /usr/local/include /usr/local/include
-COPY --from=cppkafka-build /usr/local/lib /usr/local/lib
-COPY --from=json-schema-validator-build /usr/local/include /usr/local/include
-COPY --from=json-schema-validator-build /usr/local/lib /usr/local/lib
-COPY --from=aws-sdk-cpp-build /usr/local/include /usr/local/include
-COPY --from=aws-sdk-cpp-build /usr/local/lib /usr/local/lib
-
-WORKDIR /owsec
+WORKDIR /ucentralsec
 RUN mkdir cmake-build
-WORKDIR /owsec/cmake-build
-RUN cmake .. \
-          -Dcrypto_LIBRARY=/usr/lib/libcrypto.so \
-          -DBUILD_SHARED_LIBS=ON
+WORKDIR /ucentralsec/cmake-build
+RUN cmake ..
 RUN cmake --build . --config Release -j8

-FROM alpine:3.15
+FROM alpine

-ENV OWSEC_USER=owsec \
-    OWSEC_ROOT=/owsec-data \
-    OWSEC_CONFIG=/owsec-data
+ENV UCENTRALSEC_USER=ucentralsec \
+    UCENTRALSEC_ROOT=/ucentralsec-data \
+    UCENTRALSEC_CONFIG=/ucentralsec-data

-RUN addgroup -S "$OWSEC_USER" && \
-    adduser -S -G "$OWSEC_USER" "$OWSEC_USER"
+RUN addgroup -S "$UCENTRALSEC_USER" && \
+    adduser -S -G "$UCENTRALSEC_USER" "$UCENTRALSEC_USER"

-RUN mkdir /openwifi
-RUN mkdir -p "$OWSEC_ROOT" "$OWSEC_CONFIG" && \
-    chown "$OWSEC_USER": "$OWSEC_ROOT" "$OWSEC_CONFIG"
+RUN mkdir /ucentral
+RUN mkdir -p "$UCENTRALSEC_ROOT" "$UCENTRALSEC_CONFIG" && \
+    chown "$UCENTRALSEC_USER": "$UCENTRALSEC_ROOT" "$UCENTRALSEC_CONFIG"
+RUN apk add --update --no-cache librdkafka mariadb-connector-c libpq unixodbc su-exec

-RUN apk add --update --no-cache librdkafka su-exec gettext ca-certificates bash jq curl \
-    mariadb-connector-c libpq unixodbc postgresql-client
-
-COPY readiness_check /readiness_check
-COPY test_scripts/curl/cli /cli
-
-COPY owsec.properties.tmpl /
-COPY wwwassets /dist/wwwassets
-COPY templates /dist/templates
+COPY --from=builder /ucentralsec/cmake-build/ucentralsec /ucentral/ucentralsec
+COPY --from=builder /cppkafka/cmake-build/src/lib/* /lib/
+COPY --from=builder /poco/cmake-build/lib/* /lib/
 COPY docker-entrypoint.sh /
-COPY wait-for-postgres.sh /
-RUN wget https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-ucentral-deploy/main/docker-compose/certs/restapi-ca.pem \
-    -O /usr/local/share/ca-certificates/restapi-ca-selfsigned.pem
-
-COPY --from=owsec-build /owsec/cmake-build/owsec /openwifi/owsec
-COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib/* /usr/local/lib/
-COPY --from=poco-build /poco/cmake-build/lib/* /usr/local/lib/
-COPY --from=aws-sdk-cpp-build /aws-sdk-cpp/cmake-build/aws-cpp-sdk-core/libaws-cpp-sdk-core.so /usr/local/lib
-COPY --from=aws-sdk-cpp-build /aws-sdk-cpp/cmake-build/aws-cpp-sdk-s3/libaws-cpp-sdk-s3.so /usr/local/lib
-COPY --from=aws-sdk-cpp-build /aws-sdk-cpp/cmake-build/aws-cpp-sdk-sns/libaws-cpp-sdk-sns.so /usr/local/lib

 EXPOSE 16001 17001 16101

 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["/openwifi/owsec"]
+CMD ["/ucentral/ucentralsec"]
--- a/README.md
+++ b/README.md
@@ -13,43 +13,36 @@ into your own systems. If all you need it to access the uCentralGW for example (
 - choose one to manage (pick an endpoint that matches what you are trying to do by looking at its `type`. For the gateway, type = ucentrtalgw)
 - make your calls (use the PublicEndPoint of the corresponding entry to make your calls, do not forget to add `/api/v1` as the root os the call)

-The CLI for the [uCentralGW](https://github.com/telecominfraproject/wlan-cloud-ucentralgw/blob/main/test_scripts/curl/cli) has a very good example of this. 
-Look for the `setgateway` function.
+The CLI for the [uCentralGW](https://github.com/telecominfraproject/wlan-cloud-ucentralgw/blob/main/test_scripts/curl/cli) has a very good example of this. Loog for the `setgateway` 
+function.

 ## Firewall Considerations
 The entire uCentral systems uses several MicroServices. In order for the whole system to work, you should provide the following port
-access:
+access

 - Security
-  - Properties file: owsec.properties
+  - Properties file: ucentralsec.properties
  - Ports
    - Public: 16001
    - Private: 17001
    - ALB: 16101

 - Gateway:
-  - Properties file: owgw.properties
+  - Properties file: ucentralgw.properties
  - Ports
    - Public: 16002
    - Private: 17002
    - ALB: 16102

 - Firmware:
-  - Properties file: owfms.properties
-  - Ports
-    - Public: 16004
-    - Private: 17004
-    - ALB: 16104
-
- Provisioning:
-  - Properties file: owprov.properties
+  - Properties file: ucentralfms.properties
  - Ports
    - Public: 16004
    - Private: 17004
    - ALB: 16104

 ## Security Configuration
-The service relies on a properties configuration file called `owsec.properties`. In this file, you should configure several entries. Many values are optional 
+The service relies on a properties configuration file called `ucentralsec.properties`. In this file, you should configure several entries. Many values are optional 
 and you can rely on the defaults. Here are some values of note:

 ### `authentication.default.password`
@@ -59,7 +52,7 @@ Set the hash of the default username and password. Please look below on how to d
 Set the default username to use to login.

 ### Default username and password
-The default username and password are set in `owsec.properties` file. The following entries manage the username and password
+The default username and password are set in `ucentralsec.properties` file. The following entries manage the username and password
 ```text
 authentication.default.username = tip@ucentral.com
 authentication.default.password = XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -86,6 +79,7 @@ Is this safe to show the hash in a text file? Let me put it this way, if you can
 would have control over the entire internet. It's incredibly safe. If you love math, you can find a lot of videos explaining
 how hashes work and why they are safe.

+
 ### `authentication.validation.expression`
 This is a regular expression (regex) to verify the incoming password. You can find many examples on the internet on how to create these expressions. I suggest 
 that using Google is your friend. Someone has figured out what you want to do already. Click [here](https://stackoverflow.com/questions/19605150/regex-for-password-must-contain-at-least-eight-characters-at-least-one-number-a)
@@ -98,58 +92,24 @@ to get a sample. The default is
 ### `authentication.oldpasswords`
 The number of older passwords to keep. Default is 5.

-### Changing default password
-
-On the first startup of the service new user will be created with the default credentials from properties `authentication.default.username` and `authentication.default.password`, but **you will have to change the password** before making any real requests.
-
-You can this using [owgw-ui](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw-ui/) on first login or using the following script:
-
-```
-export OWSEC=openwifi.wlan.local:16001 # endpoint to your owsec RESTAPI endpoint
-#export FLAGS="-k" # uncomment and add curl flags that you would like to pass for the request (for example '-k' may be used to pass errors with self-signed certificates)
-export OWSEC_DEFAULT_USERNAME=root@system.com # default username that you've set in property 'authentication.default.username'
-export OWSEC_DEFAULT_PASSWORD=weLoveWifi # default password __in cleartext__ from property 'authentication.default.password'
-export OWSEC_NEW_PASSWORD=NewPass123% # new password that must be set for the user (must comply with 'authentication.validation.expression')
-test_scripts/curl/cli testlogin $OWSEC_DEFAULT_USERNAME $OWSEC_DEFAULT_PASSWORD $OWSEC_NEW_PASSWORD
-```
-
-CLI is also included in Docker image if you want to run it this way:
-
-```
-export OWSEC=openwifi.wlan.local:16001
-#export FLAGS="-k"
-export OWSEC_DEFAULT_USERNAME=root@system.com
-export OWSEC_DEFAULT_PASSWORD=weLoveWifi
-export OWSEC_NEW_PASSWORD=NewPass123%
-docker run --rm -ti \
-  --network=host \
-  --env OWSEC \
-  --env FLAGS \
-  --env OWSEC_DEFAULT_USERNAME \
-  --env OWSEC_DEFAULT_PASSWORD \
-  --env OWSEC_NEW_PASSWORD \
-  tip-tip-wlan-cloud-ucentral.jfrog.io/owsec:main \
-  /cli testlogin $OWSEC_DEFAULT_USERNAME $OWSEC_DEFAULT_PASSWORD $OWSEC_NEW_PASSWORD
-```
-
 ### Kafka integration
 This security service uses Kafka to coordinate security with other services that are part of the system. You must have a Kafka service running
 in order to use this. You can find several examples of Kafka services available with Docker. Here are the values you need to configure.

 ```asm
-openwifi.kafka.group.id = security
-openwifi.kafka.client.id = security1
-openwifi.kafka.enable = true
-openwifi.kafka.brokerlist = my.kafkaserver.arilia.com:9092
-openwifi.kafka.auto.commit = false
-openwifi.kafka.queue.buffering.max.ms = 50
+ucentral.kafka.group.id = security
+ucentral.kafka.client.id = security1
+ucentral.kafka.enable = true
+ucentral.kafka.brokerlist = my.kafkaserver.arilia.com:9092
+ucentral.kafka.auto.commit = false
+ucentral.kafka.queue.buffering.max.ms = 50
 ```

-#### `openwifi.kafka.brokerlist`
+#### `ucentral.kafka.brokerlist`
 This is the list of your kafka brokers. This is a comma separated list. You should use IP addresses or FQDNs and the relevant ports, usually 9092 is the 
 default.

-#### `openwifi.kafka.group.id`
+#### `ucentral.kafka.group.id`
 Every service on the Kafka bux must have a unique value (at least in our case). This should be a string. We suggest using a name corresponding to the 
 function provided. In this case, security.

@@ -164,17 +124,17 @@ Here are the parameters for the public interface. The important files are:
 - `restapi-ca.pem` : the CA of your certificate
 - `restapi-cert.pem` : the certificate for the public interface
 - `restapi-key.pem` : the key associated with this certificate
- `openwifi.restapi.host.0.key.password` : if you key is password protected, you may supply that password here.
+- `ucentral.restapi.host.0.key.password` : if you key is password protected, you may supply that password here.

 ```asm
-openwifi.restapi.host.0.backlog = 100
-openwifi.restapi.host.0.security = relaxed
-openwifi.restapi.host.0.rootca = $OWSEC_ROOT/certs/restapi-ca.pem
-openwifi.restapi.host.0.address = *
-openwifi.restapi.host.0.port = 16001
-openwifi.restapi.host.0.cert = $OWSEC_ROOT/certs/restapi-cert.pem
-openwifi.restapi.host.0.key = $OWSEC_ROOT/certs/restapi-key.pem
-openwifi.restapi.host.0.key.password = mypassword
+ucentral.restapi.host.0.backlog = 100
+ucentral.restapi.host.0.security = relaxed
+ucentral.restapi.host.0.rootca = $UCENTRALSEC_ROOT/certs/restapi-ca.pem
+ucentral.restapi.host.0.address = *
+ucentral.restapi.host.0.port = 16001
+ucentral.restapi.host.0.cert = $UCENTRALSEC_ROOT/certs/restapi-cert.pem
+ucentral.restapi.host.0.key = $UCENTRALSEC_ROOT/certs/restapi-key.pem
+ucentral.restapi.host.0.key.password = mypassword
 ```

 #### The private interface
@@ -182,14 +142,14 @@ The private interface is used for service-to-service communication. You can use
 to the filenames used in the previous section.

 ```asm
-openwifi.internal.restapi.host.0.backlog = 100
-openwifi.internal.restapi.host.0.security = relaxed
-openwifi.internal.restapi.host.0.rootca = $OWSEC_ROOT/certs/restapi-ca.pem
-openwifi.internal.restapi.host.0.address = *
-openwifi.internal.restapi.host.0.port = 17001
-openwifi.internal.restapi.host.0.cert = $OWSEC_ROOT/certs/restapi-cert.pem
-openwifi.internal.restapi.host.0.key = $OWSEC_ROOT/certs/restapi-key.pem
-openwifi.internal.restapi.host.0.key.password = mypassword
+ucentral.internal.restapi.host.0.backlog = 100
+ucentral.internal.restapi.host.0.security = relaxed
+ucentral.internal.restapi.host.0.rootca = $UCENTRALSEC_ROOT/certs/restapi-ca.pem
+ucentral.internal.restapi.host.0.address = *
+ucentral.internal.restapi.host.0.port = 17001
+ucentral.internal.restapi.host.0.cert = $UCENTRALSEC_ROOT/certs/restapi-cert.pem
+ucentral.internal.restapi.host.0.key = $UCENTRALSEC_ROOT/certs/restapi-key.pem
+ucentral.internal.restapi.host.0.key.password = mypassword
 ```

 ### Other important values
@@ -197,68 +157,19 @@ Here are other important values you must set.


 ```asm
-openwifi.system.data = $OWSEC_ROOT/data
-openwifi.system.uri.private = https://localhost:17001
-openwifi.system.uri.public = https://openwifi.dpaas.arilia.com:16001
-openwifi.system.uri.ui = https://ucentral-ui.arilia.com
-openwifi.system.commandchannel = /tmp/app.ucentralsec
-openwifi.service.key = $OWSEC_ROOT/certs/restapi-key.pem
-openwifi.service.key.password = mypassword
+ucentral.system.data = $UCENTRALSEC_ROOT/data
+ucentral.system.uri.private = https://localhost:17001
+ucentral.system.uri.public = https://ucentral.dpaas.arilia.com:16001
+ucentral.system.commandchannel = /tmp/app.ucentralsec
+ucentral.service.key = $UCENTRALSEC_ROOT/certs/restapi-key.pem
 ```
-#### `openwifi.system.data`
+
+#### `ucentral.system.data`
 The location of some important data files including the user name database.

-#### `openwifi.system.uri.private`
+#### `ucentral.system.uri.private`
 This is the FQDN used internally between services.

-#### `openwifi.system.uri.public`
+#### `ucentral.system.uri.public`
 This is the FQDN used externally serving the OpenAPI interface.

-### Sending SMS for Multifactor Aithentication
-`owsec` hs the ability to send SMS messages to users during login or to send notifications. In order to do so,
-an SMS provider must be configured. At present time, 2 providers are supported: Tilio and AWS SNS
-
-#### AWS SMS
-For SNS you must create an IAM ID that has sns:sendmessage rights.  
-
-```asm
-smssender.provider = aws
-smssender.aws.secretkey = ***************************************
-smssender.aws.accesskey = ***************************************
-smssender.aws.region = **************
-```
-
-#### Twilio
-For Twilio, you must provide the following
-
-```asm
-smssender.provider = twilio
-smssender.twilio.sid = ***********************
-smssender.twilio.token = **********************
-smssender.twilio.phonenumber = +18888888888
-```
-
-### `owsec` Messaging Configuration
-`owsec` nay require to send e-mails. In order to do so, you must configure an email sender. We have run tests 
-with GMail and AWS SES. For each, you must obtain the proper credentials and insert them in this configuration as well
-as the proper mail host.
-
-```asm
-mailer.hostname = smtp.gmail.com
-mailer.username = ************************
-mailer.password = ************************
-mailer.sender = OpenWIFI
-mailer.loginmethod = login
-mailer.port = 587
-mailer.templates = $OWSEC_ROOT/templates
-```
-
-#### Google Authenticator
-In order to use the Google Time-based One-Time Password (TOTP), the user must down load the Goole Authenticator 
-on any other app that support the TOTP protocol. You should include the following in your configuration
-
-```asm
-totp.issuer = OrgName
-```
-
-It is very important that you not use spaces in your OrgName.
--- a/2
+++ b/2
@@ -1 +1 @@
-244
+11
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,86 +1,11 @@
 #!/bin/sh
 set -e

-if [ "$SELFSIGNED_CERTS" = 'true' ]; then
-    update-ca-certificates
-fi
-
-if [[ "$TEMPLATE_CONFIG" = 'true' && ! -f "$OWSEC_CONFIG"/owsec.properties ]]; then
-  RESTAPI_HOST_ROOTCA=${RESTAPI_HOST_ROOTCA:-"\$OWSEC_ROOT/certs/restapi-ca.pem"} \
-  RESTAPI_HOST_PORT=${RESTAPI_HOST_PORT:-"16001"} \
-  RESTAPI_HOST_CERT=${RESTAPI_HOST_CERT:-"\$OWSEC_ROOT/certs/restapi-cert.pem"} \
-  RESTAPI_HOST_KEY=${RESTAPI_HOST_KEY:-"\$OWSEC_ROOT/certs/restapi-key.pem"} \
-  RESTAPI_HOST_KEY_PASSWORD=${RESTAPI_HOST_KEY_PASSWORD:-"mypassword"} \
-  RESTAPI_WWWASSETS=${RESTAPI_WWWASSETS:-"\$OWSEC_ROOT/persist/wwwassets"} \
-  INTERNAL_RESTAPI_HOST_ROOTCA=${INTERNAL_RESTAPI_HOST_ROOTCA:-"\$OWSEC_ROOT/certs/restapi-ca.pem"} \
-  INTERNAL_RESTAPI_HOST_PORT=${INTERNAL_RESTAPI_HOST_PORT:-"17001"} \
-  INTERNAL_RESTAPI_HOST_CERT=${INTERNAL_RESTAPI_HOST_CERT:-"\$OWSEC_ROOT/certs/restapi-cert.pem"} \
-  INTERNAL_RESTAPI_HOST_KEY=${INTERNAL_RESTAPI_HOST_KEY:-"\$OWSEC_ROOT/certs/restapi-key.pem"} \
-  INTERNAL_RESTAPI_HOST_KEY_PASSWORD=${INTERNAL_RESTAPI_HOST_KEY_PASSWORD:-"mypassword"} \
-  AUTHENTICATION_DEFAULT_USERNAME=${AUTHENTICATION_DEFAULT_USERNAME:-"tip@ucentral.com"} \
-  AUTHENTICATION_DEFAULT_PASSWORD=${AUTHENTICATION_DEFAULT_PASSWORD:-"13268b7daa751240369d125e79c873bd8dd3bef7981bdfd38ea03dbb1fbe7dcf"} \
-  SYSTEM_DATA=${SYSTEM_DATA:-"\$OWSEC_ROOT/data"} \
-  SYSTEM_URI_PRIVATE=${SYSTEM_URI_PRIVATE:-"https://localhost:17001"} \
-  SYSTEM_URI_PUBLIC=${SYSTEM_URI_PUBLIC:-"https://localhost:16001"} \
-  SYSTEM_URI_UI=${SYSTEM_URI_UI:-"http://localhost"} \
-  SERVICE_KEY=${SERVICE_KEY:-"\$OWSEC_ROOT/certs/restapi-key.pem"} \
-  SERVICE_KEY_PASSWORD=${SERVICE_KEY_PASSWORD:-"mypassword"} \
-  SMSSENDER_ENABLED=${SMSSENDER_ENABLED:-"false"} \
-  SMSSENDER_PROVIDER=${SMSSENDER_PROVIDER:-""} \
-  SMSSENDER_AWS_SECRETKEY=${SMSSENDER_AWS_SECRETKEY:-""} \
-  SMSSENDER_AWS_ACCESSKEY=${SMSSENDER_AWS_ACCESSKEY:-""} \
-  SMSSENDER_AWS_REGION=${SMSSENDER_AWS_REGION:-""} \
-  SMSSENDER_TWILIO_SID=${SMSSENDER_TWILIO_SID:-""} \
-  SMSSENDER_TWILIO_TOKEN=${SMSSENDER_TWILIO_TOKEN:-""} \
-  SMSSENDER_TWILIO_PHONENUMBER=${SMSSENDER_TWILIO_PHONENUMBER:-""} \
-  MAILER_ENABLED=${MAILER_ENABLED:-"false"} \
-  MAILER_HOSTNAME=${MAILER_HOSTNAME:-"localhost"} \
-  MAILER_USERNAME=${MAILER_USERNAME:-""} \
-  MAILER_PASSWORD=${MAILER_PASSWORD:-""} \
-  MAILER_SENDER=${MAILER_SENDER:-"OpenWIFI"} \
-  MAILER_PORT=${MAILER_PORT:-"587"} \
-  MAILER_TEMPLATES=${MAILER_TEMPLATES:-"\$OWSEC_ROOT/persist/templates"} \
-  KAFKA_ENABLE=${KAFKA_ENABLE:-"true"} \
-  KAFKA_BROKERLIST=${KAFKA_BROKERLIST:-"localhost:9092"} \
-  DOCUMENT_POLICY_ACCESS=${DOCUMENT_POLICY_ACCESS:-"\$OWSEC_ROOT/persist/wwwassets/access_policy.html"} \
-  DOCUMENT_POLICY_PASSWORD=${DOCUMENT_POLICY_PASSWORD:-"\$OWSEC_ROOT/persist/wwwassets/password_policy.html"} \
-  STORAGE_TYPE=${STORAGE_TYPE:-"sqlite"} \
-  STORAGE_TYPE_POSTGRESQL_HOST=${STORAGE_TYPE_POSTGRESQL_HOST:-"localhost"} \
-  STORAGE_TYPE_POSTGRESQL_USERNAME=${STORAGE_TYPE_POSTGRESQL_USERNAME:-"owsec"} \
-  STORAGE_TYPE_POSTGRESQL_PASSWORD=${STORAGE_TYPE_POSTGRESQL_PASSWORD:-"owsec"} \
-  STORAGE_TYPE_POSTGRESQL_DATABASE=${STORAGE_TYPE_POSTGRESQL_DATABASE:-"owsec"} \
-  STORAGE_TYPE_POSTGRESQL_PORT=${STORAGE_TYPE_POSTGRESQL_PORT:-"5432"} \
-  STORAGE_TYPE_MYSQL_HOST=${STORAGE_TYPE_MYSQL_HOST:-"localhost"} \
-  STORAGE_TYPE_MYSQL_USERNAME=${STORAGE_TYPE_MYSQL_USERNAME:-"owsec"} \
-  STORAGE_TYPE_MYSQL_PASSWORD=${STORAGE_TYPE_MYSQL_PASSWORD:-"owsec"} \
-  STORAGE_TYPE_MYSQL_DATABASE=${STORAGE_TYPE_MYSQL_DATABASE:-"owsec"} \
-  STORAGE_TYPE_MYSQL_PORT=${STORAGE_TYPE_MYSQL_PORT:-"3306"} \
-  envsubst < /owsec.properties.tmpl > $OWSEC_CONFIG/owsec.properties
-fi
-
-# Check if wwwassets directory exists
-export RESTAPI_WWWASSETS=$(grep 'openwifi.restapi.wwwassets' $OWSEC_CONFIG/owsec.properties | awk -F '=' '{print $2}' | xargs | envsubst)
-if [[ ! -d "$(dirname $RESTAPI_WWWASSETS)" ]]; then
-  mkdir -p $(dirname $RESTAPI_WWWASSETS)
-fi
-if [[ ! -d "$RESTAPI_WWWASSETS" ]]; then
-  cp -r /dist/wwwassets $RESTAPI_WWWASSETS
-fi
-
-# Check if templates directory exists
-export MAILER_TEMPLATES=$(grep 'mailer.templates' $OWSEC_CONFIG/owsec.properties | awk -F '=' '{print $2}' | xargs | envsubst)
-if [[ ! -d "$(dirname $MAILER_TEMPLATES)" ]]; then
-  mkdir -p $(dirname $MAILER_TEMPLATES)
-fi
-if [[ ! -d "$MAILER_TEMPLATES" ]]; then
-  cp -r /dist/templates $MAILER_TEMPLATES
-fi
-
-if [ "$1" = '/openwifi/owsec' -a "$(id -u)" = '0' ]; then
+if [ "$1" = '/ucentral/ucentralsec' -a "$(id -u)" = '0' ]; then
    if [ "$RUN_CHOWN" = 'true' ]; then
-      chown -R "$OWSEC_USER": "$OWSEC_ROOT" "$OWSEC_CONFIG"
+      chown -R "$UCENTRALSEC_USER": "$UCENTRALSEC_ROOT" "$UCENTRALSEC_CONFIG"
    fi
-    exec su-exec "$OWSEC_USER" "$@"
+    exec su-exec "$UCENTRALSEC_USER" "$@"
 fi

 exec "$@"
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -1,18 +1,18 @@
 apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
-name: owsec
+name: ucentralsec
 version: 0.1.0
 dependencies:
 - name: postgresql
-  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
+  repository: https://charts.bitnami.com/bitnami
  version: 10.9.2
  condition: postgresql.enabled
 - name: mysql
-  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
+  repository: https://charts.bitnami.com/bitnami
  version: 8.8.3
  condition: mysql.enabled
 - name: mariadb
-  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
+  repository: https://charts.bitnami.com/bitnami
  version: 9.4.2
  condition: mariadb.enabled
--- a/helm/README.md
+++ b/helm/README.md
@@ -1,6 +1,6 @@
-# owsec
+# ucentralsec

-This Helm chart helps to deploy OpenWIFI Security (further on refered as __Security__) to the Kubernetes clusters. It is mainly used in [assembly chart](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart) as Security requires other services as dependencies that are considered in that Helm chart. This chart is purposed to define deployment logic close to the application code itself and define default values that could be overriden during deployment.
+This Helm chart helps to deploy uCentralSec to the Kubernetes clusters. It is mainly used in [assembly chart](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart) as uCentralSec requires other services as dependencies that are considered in that Helm chart. This chart is purposed to define deployment logic close to the application code itself and define default values that could be overriden during deployment.


 ## TL;DR;
@@ -11,7 +11,7 @@ $ helm install .

 ## Introduction

-This chart bootstraps the Security on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+This chart bootstraps an ucentralsec on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.

 ## Installing the Chart

@@ -20,10 +20,10 @@ Currently this chart is not assembled in charts archives, so [helm-git](https://
 To install the chart with the release name `my-release`:

 ```bash
-$ helm install --name my-release git+https://github.com/Telecominfraproject/wlan-cloud-ucentralsec@helm/owsec-0.1.0.tgz?ref=main
+$ helm install --name my-release git+https://github.com/Telecominfraproject/wlan-cloud-ucentralsec@helm?ref=main
 ```

-The command deploys the Security on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+The command deploys ucentralsec on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.

 > **Tip**: List all releases using `helm list`

@@ -47,30 +47,30 @@ The following table lists the configurable parameters of the chart and their def
 | strategyType | string | Application deployment strategy | `'Recreate'` |
 | nameOverride | string | Override to be used for application deployment |  |
 | fullnameOverride | string | Override to be used for application deployment (has priority over nameOverride) |  |
-| images.owsec.repository | string | Docker image repository |  |
-| images.owsec.tag | string | Docker image tag | `'master'` |
-| images.owsec.pullPolicy | string | Docker image pull policy | `'Always'` |
-| services.owsec.type | string | OpenWIFI Security service type | `'LoadBalancer'` |
-| services.owsec.ports.restapi.servicePort | number | REST API endpoint port to be exposed on service | `16001` |
-| services.owsec.ports.restapi.targetPort | number | REST API endpoint port to be targeted by service | `16001` |
-| services.owsec.ports.restapi.protocol | string | REST API endpoint protocol | `'TCP'` |
-| services.owsec.ports.restapiinternal.servicePort | string | Internal REST API endpoint port to be exposed on service | `17001` |
-| services.owsec.ports.restapiinternal.targetPort | number | Internal REST API endpoint port to be targeted by service | `17001` |
-| services.owsec.ports.restapiinternal.protocol | string | Internal REST API endpoint protocol | `'TCP'` |
-| checks.owsec.liveness.httpGet.path | string | Liveness check path to be used | `'/'` |
-| checks.owsec.liveness.httpGet.port | number | Liveness check port to be used (should be pointint to ALB endpoint) | `16101` |
-| checks.owsec.readiness.httpGet.path | string | Readiness check path to be used | `'/'` |
-| checks.owsec.readiness.httpGet.port | number | Readiness check port to be used (should be pointint to ALB endpoint) | `16101` |
+| images.ucentralsec.repository | string | Docker image repository |  |
+| images.ucentralsec.tag | string | Docker image tag | `'master'` |
+| images.ucentralsec.pullPolicy | string | Docker image pull policy | `'Always'` |
+| services.ucentralsec.type | string | uCentralSec service type | `'LoadBalancer'` |
+| services.ucentralsec.ports.restapi.servicePort | number | REST API endpoint port to be exposed on service | `16001` |
+| services.ucentralsec.ports.restapi.targetPort | number | REST API endpoint port to be targeted by service | `16001` |
+| services.ucentralsec.ports.restapi.protocol | string | REST API endpoint protocol | `'TCP'` |
+| services.ucentralsec.ports.restapiinternal.servicePort | string | Internal REST API endpoint port to be exposed on service | `17001` |
+| services.ucentralsec.ports.restapiinternal.targetPort | number | Internal REST API endpoint port to be targeted by service | `17001` |
+| services.ucentralsec.ports.restapiinternal.protocol | string | Internal REST API endpoint protocol | `'TCP'` |
+| checks.ucentralsec.liveness.httpGet.path | string | Liveness check path to be used | `'/'` |
+| checks.ucentralsec.liveness.httpGet.port | number | Liveness check port to be used (should be pointint to ALB endpoint) | `16101` |
+| checks.ucentralsec.readiness.httpGet.path | string | Readiness check path to be used | `'/'` |
+| checks.ucentralsec.readiness.httpGet.port | number | Readiness check port to be used (should be pointint to ALB endpoint) | `16101` |
 | ingresses.restapi.enabled | boolean | Defines if REST API endpoint should be exposed via Ingress controller | `False` |
 | ingresses.restapi.hosts | array | List of hosts for exposed REST API |  |
 | ingresses.restapi.paths | array | List of paths to be exposed for REST API |  |
-| volumes.owsec | array | Defines list of volumes to be attached to the Security |  |
-| persistence.enabled | boolean | Defines if Security requires Persistent Volume (required for permanent files storage and SQLite DB if enabled) | `True` |
+| volumes.ucentralsec | array | Defines list of volumes to be attached to uCentralSec |  |
+| persistence.enabled | boolean | Defines if uCentralSec requires Persistent Volume (required for permanent files storage and SQLite DB if enabled) | `True` |
 | persistence.accessModes | array | Defines PV access modes |  |
 | persistence.size | string | Defines PV size | `'10Gi'` |
-| public_env_variables | hash | Defines list of environment variables to be passed to the Security | |
-| configProperties | hash | Configuration properties that should be passed to the application in `owsec.properties`. May be passed by key in set (i.e. `configProperties."rtty\.token"`) | |
-| certs | hash | Defines files (keys and certificates) that should be passed to the Security (PEM format is adviced to be used) (see `volumes.owsec` on where it is mounted) |  |
+| public_env_variables | hash | Defines list of environment variables to be passed to uCentralSec | |
+| configProperties | hash | Configuration properties that should be passed to the application in `ucentralsec.properties`. May be passed by key in set (i.e. `configProperties."rtty\.token"`) | |
+| certs | hash | Defines files (keys and certificates) that should be passed to uCentralSec (PEM format is adviced to be used) (see `volumes.ucentralsec` on where it is mounted) |  |


 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
--- a/helm/templates/_config.tpl
+++ b/helm/templates/_config.tpl
@@ -1,4 +1,4 @@
-{{- define "owsec.config" -}}
+{{- define "ucentralsec.config" -}}
 {{- range $key, $value := .Values.configProperties }}
 {{ $key }} = {{ $value }}
 {{- end }}
--- a/helm/templates/_helpers.tpl
+++ b/helm/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "owsec.name" -}}
+{{- define "ucentralsec.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "owsec.fullname" -}}
+{{- define "ucentralsec.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,16 +27,6 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "owsec.chart" -}}
+{{- define "ucentralsec.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
-
-{{- define "owsec.ingress.apiVersion" -}}
-  {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
-      {{- print "networking.k8s.io/v1" -}}
-  {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" -}}
-    {{- print "networking.k8s.io/v1beta1" -}}
-  {{- else -}}
-    {{- print "extensions/v1beta1" -}}
-  {{- end -}}
-{{- end -}}
--- a/helm/templates/deployment.yaml
+++ b/helm/templates/deployment.yaml
@@ -3,54 +3,40 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "owsec.fullname" . }}
+  name: {{ include "ucentralsec.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "owsec.name" . }}
-    helm.sh/chart: {{ include "owsec.chart" . }}
+    app.kubernetes.io/name: {{ include "ucentralsec.name" . }}
+    helm.sh/chart: {{ include "ucentralsec.chart" . }}
    app.kubernetes.io/instance: {{ .Release.Name }}
    app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
  replicas: {{ .Values.replicaCount }}
  strategy:
    type: {{ .Values.strategyType }}
-  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
  selector:
    matchLabels:
-      app.kubernetes.io/name: {{ include "owsec.name" . }}
+      app.kubernetes.io/name: {{ include "ucentralsec.name" . }}
      app.kubernetes.io/instance: {{ .Release.Name }}
-      {{- with .Values.services.owsec.labels }}
+      {{- with .Values.services.ucentralsec.labels }}
      {{- toYaml . | nindent 6 }}
      {{- end }}
  template:
    metadata:
      annotations:
-        checksum/config: {{ include "owsec.config" . | sha256sum }}
-        {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
+        checksum/config: {{ include "ucentralsec.config" . | sha256sum }}
      labels:
-        app.kubernetes.io/name: {{ include "owsec.name" . }}
+        app.kubernetes.io/name: {{ include "ucentralsec.name" . }}
        app.kubernetes.io/instance: {{ .Release.Name }}
-        {{- with .Values.services.owsec.labels }}
+        {{- with .Values.services.ucentralsec.labels }}
        {{- toYaml . | nindent 8 }}
        {{- end }}
    spec:

-      initContainers:
-        - name: wait-kafka
-          image: "{{ .Values.images.dockerize.repository }}:{{ .Values.images.dockerize.tag }}"
-          imagePullPolicy: {{ .Values.images.dockerize.pullPolicy }}
-          args:
-            - -wait
-            - tcp://{{ index .Values.configProperties "openwifi.kafka.brokerlist" }}
-            - -timeout
-            - 600s
-
      containers:

-        - name: owsec
-          image: "{{ .Values.images.owsec.repository }}:{{ .Values.images.owsec.tag }}"
-          imagePullPolicy: {{ .Values.images.owsec.pullPolicy }}
+        - name: ucentralsec
+          image: "{{ .Values.images.ucentralsec.repository }}:{{ .Values.images.ucentralsec.tag }}"
+          imagePullPolicy: {{ .Values.images.ucentralsec.pullPolicy }}

          env:
            - name: KUBERNETES_DEPLOYED
@@ -63,19 +49,19 @@ spec:
            - name: {{ $key }}
              valueFrom:
                secretKeyRef:
-                  name: {{ include "owsec.fullname" $root }}-env
+                  name: {{ include "ucentralsec.fullname" $root }}-env
                  key: {{ $key }}
          {{- end }}

          ports:
-          {{- range $port, $portValue := .Values.services.owsec.ports }}
+          {{- range $port, $portValue := .Values.services.ucentralsec.ports }}
            - name: {{ $port }}
              containerPort: {{ $portValue.targetPort }}
              protocol: {{ $portValue.protocol }}
          {{- end }}

          volumeMounts:
-          {{- range .Values.volumes.owsec }}
+          {{- range .Values.volumes.ucentralsec }}
          - name: {{ .name }}
            mountPath: {{ .mountPath }}
            {{- if .subPath }}
@@ -83,13 +69,13 @@ spec:
            {{- end }}
          {{- end }}

-          {{- if .Values.checks.owsec.liveness }}
+          {{- if .Values.checks.ucentralsec.liveness }}
          livenessProbe:
-            {{- toYaml .Values.checks.owsec.liveness | nindent 12 }}
+            {{- toYaml .Values.checks.ucentralsec.liveness | nindent 12 }}
          {{- end }}
-          {{- if .Values.checks.owsec.readiness }}
+          {{- if .Values.checks.ucentralsec.readiness }}
          readinessProbe:
-            {{- toYaml .Values.checks.owsec.readiness | nindent 12 }}
+            {{- toYaml .Values.checks.ucentralsec.readiness | nindent 12 }}
          {{- end }}

          {{- with .Values.resources }}
@@ -105,7 +91,7 @@ spec:
      imagePullSecrets:
      {{- range $image, $imageValue := .Values.images }}
        {{- if $imageValue.regcred }}
-      - name: {{ include "owsec.fullname" $root }}-{{ $image }}-regcred
+      - name: {{ include "ucentralsec.fullname" $root }}-{{ $image }}-regcred
        {{- end }}
      {{- end }}

--- a/helm/templates/ingress.yaml
+++ b/helm/templates/ingress.yaml
@@ -2,13 +2,13 @@
 {{- range $ingress, $ingressValue := .Values.ingresses }}
 {{- if $ingressValue.enabled }}
 ---
-apiVersion: {{ include "owsec.ingress.apiVersion" $root }}
+apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: {{ include "owsec.fullname" $root }}-{{ $ingress }}
+  name: {{ include "ucentralsec.fullname" $root }}-{{ $ingress }}
  labels:
-    app.kubernetes.io/name: {{ include "owsec.name" $root }}
-    helm.sh/chart: {{ include "owsec.chart" $root }}
+    app.kubernetes.io/name: {{ include "ucentralsec.name" $root }}
+    helm.sh/chart: {{ include "ucentralsec.chart" $root }}
    app.kubernetes.io/instance: {{ $root.Release.Name }}
    app.kubernetes.io/managed-by: {{ $root.Release.Service }}
  {{- with $ingressValue.annotations }}
@@ -36,23 +36,9 @@ spec:
      paths:
      {{- range $ingressValue.paths }}
        - path: {{ .path }}
-          {{- if $root.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-          pathType: {{ .pathType | default "ImplementationSpecific" }}
-          {{- end }}
          backend:
-            {{- if $root.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-            service:
-              name: {{ include "owsec.fullname" $root }}-{{ .serviceName }}
-              port:
-              {{- if kindIs "string" .servicePort }}
-                name: {{ .servicePort }}
-              {{- else }}
-                number: {{ .servicePort }}
-              {{- end }}
-            {{- else }}
-            serviceName: {{ include "owsec.fullname" $root }}-{{ .serviceName }}
+            serviceName: {{ include "ucentralsec.fullname" $root }}-{{ .serviceName }}
            servicePort: {{ .servicePort }}
-            {{- end }}
      {{- end }}
  {{- end }}

--- a/helm/templates/pvc.yaml
+++ b/helm/templates/pvc.yaml
@@ -3,10 +3,10 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ template "owsec.fullname" . }}-pvc
+  name: {{ template "ucentralsec.fullname" . }}-pvc
  labels:
-    app.kubernetes.io/name: {{ include "owsec.name" . }}
-    helm.sh/chart: {{ include "owsec.chart" . }}
+    app.kubernetes.io/name: {{ include "ucentralsec.name" . }}
+    helm.sh/chart: {{ include "ucentralsec.chart" . }}
    app.kubernetes.io/instance: {{ .Release.Name }}
    app.kubernetes.io/managed-by: {{ .Release.Service }}
  {{- with .Values.persistence.annotations  }}
--- a/helm/templates/secret-certs.yaml
+++ b/helm/templates/secret-certs.yaml
@@ -2,11 +2,11 @@
 apiVersion: v1
 metadata:
  labels:
-    app.kuberentes.io/name: {{ include "owsec.name" . }}
-    helm.sh/chart: {{ include "owsec.chart" . }}
+    app.kuberentes.io/name: {{ include "ucentralsec.name" . }}
+    helm.sh/chart: {{ include "ucentralsec.chart" . }}
    app.kubernetes.io/instance: {{ .Release.Name }}
    app.kubernetes.io/managed-by: {{ .Release.Service }}
-  name: {{ include "owsec.fullname" . }}-certs
+  name: {{ include "ucentralsec.fullname" . }}-certs
 kind: Secret
 type: Opaque
 data:
--- a/helm/templates/secret-config.yaml
+++ b/helm/templates/secret-config.yaml
@@ -2,12 +2,12 @@
 apiVersion: v1
 metadata:
  labels:
-    app.kuberentes.io/name: {{ include "owsec.name" . }}
-    helm.sh/chart: {{ include "owsec.chart" . }}
+    app.kuberentes.io/name: {{ include "ucentralsec.name" . }}
+    helm.sh/chart: {{ include "ucentralsec.chart" . }}
    app.kubernetes.io/instance: {{ .Release.Name }}
    app.kubernetes.io/managed-by: {{ .Release.Service }}
-  name: {{ include "owsec.fullname" . }}-config
+  name: {{ include "ucentralsec.fullname" . }}-config
 kind: Secret
 type: Opaque
 data:
-  owsec.properties: {{ include "owsec.config" . | b64enc }}
+  ucentralsec.properties: {{ include "ucentralsec.config" . | b64enc }}
--- a/helm/templates/secret-env.yaml
+++ b/helm/templates/secret-env.yaml
@@ -2,11 +2,11 @@
 apiVersion: v1
 metadata:
  labels:
-    app.kuberentes.io/name: {{ include "owsec.name" . }}
-    helm.sh/chart: {{ include "owsec.chart" . }}
+    app.kuberentes.io/name: {{ include "ucentralsec.name" . }}
+    helm.sh/chart: {{ include "ucentralsec.chart" . }}
    app.kubernetes.io/instance: {{ .Release.Name }}
    app.kubernetes.io/managed-by: {{ .Release.Service }}
-  name: {{ include "owsec.fullname" . }}-env
+  name: {{ include "ucentralsec.fullname" . }}-env
 kind: Secret
 type: Opaque
 data:
--- a/helm/templates/secret-regcred.yaml
+++ b/helm/templates/secret-regcred.yaml
@@ -10,11 +10,11 @@ kind: Secret
 type: kubernetes.io/dockerconfigjson
 metadata:
  labels:
-    app.kuberentes.io/name: {{ include "owsec.name" $root }}
-    helm.sh/chart: {{ include "owsec.chart" $root }}
+    app.kuberentes.io/name: {{ include "ucentralsec.name" $root }}
+    helm.sh/chart: {{ include "ucentralsec.chart" $root }}
    app.kubernetes.io/instance: {{ $root.Release.Name }}
    app.kubernetes.io/managed-by: {{ $root.Release.Service }}
-  name: {{ include "owsec.fullname" $root }}-{{ $image }}-regcred
+  name: {{ include "ucentralsec.fullname" $root }}-{{ $image }}-regcred
 data:
  .dockerconfigjson: {{ template "imagePullSecret" $imageValue.regcred }}
 {{- end }}
--- a/helm/templates/service.yaml
+++ b/helm/templates/service.yaml
@@ -4,14 +4,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "owsec.fullname" $root }}-{{ $service }}
+  name: {{ include "ucentralsec.fullname" $root }}-{{ $service }}
  {{- with $serviceValue.annotations }}
  annotations:
    {{- toYaml . | nindent 4 }}
  {{- end }}
  labels:
-    app.kubernetes.io/name: {{ include "owsec.name" $root }}
-    helm.sh/chart: {{ include "owsec.chart" $root }}
+    app.kubernetes.io/name: {{ include "ucentralsec.name" $root }}
+    helm.sh/chart: {{ include "ucentralsec.chart" $root }}
    app.kubernetes.io/instance: {{ $root.Release.Name }}
    app.kubernetes.io/managed-by: {{ $root.Release.Service }}

@@ -39,7 +39,7 @@ spec:
      {{- end }}
  {{- end }}
  selector:
-    app.kubernetes.io/name: {{ include "owsec.name" $root }}
+    app.kubernetes.io/name: {{ include "ucentralsec.name" $root }}
    app.kubernetes.io/instance: {{ $root.Release.Name }}
    {{- with $serviceValue.labels }}
    {{- toYaml . | nindent 4 }}
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -1,28 +1,23 @@
 # System
 replicaCount: 1
 strategyType: Recreate
-revisionHistoryLimit: 2

 nameOverride: ""
 fullnameOverride: ""

 images:
-  owsec:
-    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owsec
-    tag: v2.5.2
+  ucentralsec:
+    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/ucentralsec
+    tag: v2.1.0-RC1
    pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io
 #      username: username
 #      password: password
-  dockerize:
-    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/dockerize
-    tag: 0.16.0
-    pullPolicy: IfNotPresent

 services:
-  owsec:
-    type: ClusterIP
+  ucentralsec:
+    type: LoadBalancer
    ports:
      restapi:
        servicePort: 16001
@@ -34,15 +29,15 @@ services:
        protocol: TCP

 checks:
-  owsec:
+  ucentralsec:
    liveness:
      httpGet:
        path: /
        port: 16101
    readiness:
-      exec:
-        command:
-          - /readiness_check
+      httpGet:
+        path: /
+        port: 16101

 ingresses:
  restapi:
@@ -54,30 +49,29 @@ ingresses:
    - restapi.chart-example.local
    paths:
    - path: /
-      pathType: ImplementationSpecific
-      serviceName: owsec
+      serviceName: ucentralsec
      servicePort: restapi

 volumes:
-  owsec:
+  ucentralsec:
    - name: config
-      mountPath: /owsec-data/owsec.properties
-      subPath: owsec.properties
+      mountPath: /ucentralsec-data/ucentralsec.properties
+      subPath: ucentralsec.properties
      # Template below will be rendered in template
      volumeDefinition: |
        secret:
-          secretName: {{ include "owsec.fullname" . }}-config
+          secretName: {{ include "ucentralsec.fullname" . }}-config
    - name: certs
-      mountPath: /owsec-data/certs
+      mountPath: /ucentralsec-data/certs
      volumeDefinition: |
        secret:
-          secretName: {{ include "owsec.fullname" . }}-certs
+          secretName: {{ include "ucentralsec.fullname" . }}-certs
    # Change this if you want to use another volume type
    - name: persist
-      mountPath: /owsec-data/persist
+      mountPath: /ucentralsec-data/persist
      volumeDefinition: |
        persistentVolumeClaim:
-          claimName: {{ template "owsec.fullname" . }}-pvc
+          claimName: {{ template "ucentralsec.fullname" . }}-pvc

 resources: {}
  # We usually recommend not to specify default resources and to leave this as a conscious
@@ -100,8 +94,6 @@ tolerations: []

 affinity: {}

-podAnnotations: {}
-
 persistence:
  enabled: true
  # storageClassName: "-"
@@ -112,61 +104,48 @@ persistence:

 # Application
 public_env_variables:
-  OWSEC_ROOT: /owsec-data
-  OWSEC_CONFIG: /owsec-data
-  # Environment variables required for the readiness checks using script
-  FLAGS: "-s --connect-timeout 3"
-  # NOTE in order for readiness check to use system info you need to set READINESS_METHOD to "systeminfo" and set OWSEC to the OWSEC's REST API endpoint
-  #READINESS_METHOD: systeminfo
+  UCENTRALSEC_ROOT: /ucentralsec-data
+  UCENTRALSEC_CONFIG: /ucentralsec-data

-secret_env_variables:
-  OWSEC_USERNAME: tip@ucentral.com
-  OWSEC_PASSWORD: openwifi
+secret_env_variables: {}

 configProperties:
  # -> Public part
  # REST API
-  openwifi.restapi.host.0.backlog: 100
-  openwifi.restapi.host.0.security: relaxed
-  openwifi.restapi.host.0.rootca: $OWSEC_ROOT/certs/restapi-ca.pem
-  openwifi.restapi.host.0.address: "*"
-  openwifi.restapi.host.0.port: 16001
-  openwifi.restapi.host.0.cert: $OWSEC_ROOT/certs/restapi-cert.pem
-  openwifi.restapi.host.0.key: $OWSEC_ROOT/certs/restapi-key.pem
-  openwifi.restapi.wwwassets: $OWSEC_ROOT/persist/wwwassets
-  openwifi.internal.restapi.host.0.backlog: 100
-  openwifi.internal.restapi.host.0.security: relaxed
-  openwifi.internal.restapi.host.0.rootca: $OWSEC_ROOT/certs/restapi-ca.pem
-  openwifi.internal.restapi.host.0.address: "*"
-  openwifi.internal.restapi.host.0.port: 17001
-  openwifi.internal.restapi.host.0.cert: $OWSEC_ROOT/certs/restapi-cert.pem
-  openwifi.internal.restapi.host.0.key: $OWSEC_ROOT/certs/restapi-key.pem
+  ucentral.restapi.host.0.backlog: 100
+  ucentral.restapi.host.0.security: relaxed
+  ucentral.restapi.host.0.rootca: $UCENTRALSEC_ROOT/certs/restapi-ca.pem
+  ucentral.restapi.host.0.address: "*"
+  ucentral.restapi.host.0.port: 16001
+  ucentral.restapi.host.0.cert: $UCENTRALSEC_ROOT/certs/restapi-cert.pem
+  ucentral.restapi.host.0.key: $UCENTRALSEC_ROOT/certs/restapi-key.pem
+  ucentral.restapi.wwwassets: $UCENTRALSEC_ROOT/wwwassets
+  ucentral.internal.restapi.host.0.backlog: 100
+  ucentral.internal.restapi.host.0.security: relaxed
+  ucentral.internal.restapi.host.0.rootca: $UCENTRALSEC_ROOT/certs/restapi-ca.pem
+  ucentral.internal.restapi.host.0.address: "*"
+  ucentral.internal.restapi.host.0.port: 17001
+  ucentral.internal.restapi.host.0.cert: $UCENTRALSEC_ROOT/certs/restapi-cert.pem
+  ucentral.internal.restapi.host.0.key: $UCENTRALSEC_ROOT/certs/restapi-key.pem
  # Authentication
  authentication.enabled: true
  authentication.default.access: master
  authentication.service.type: internal
  # Mailer
-  mailer.enabled: "false"
  mailer.hostname: smtp.gmail.com
-  mailer.sender: OpenWIFI
  mailer.loginmethod: login
  mailer.port: 587
-  mailer.templates: $OWSEC_ROOT/persist/templates
-  # SMS
-  smssender.enabled: "false"
-  smssender.provider: "aws"
-  #smssender.aws.region: ""
-  #smssender.twilio.phonenumber: ""
+  mailer.templates: $UCENTRALSEC_ROOT/templates
  # ALB
  alb.enable: "true"
  alb.port: 16101
  # Kafka
-  openwifi.kafka.enable: "false"
-  openwifi.kafka.group.id: security
-  openwifi.kafka.client.id: security1
-  openwifi.kafka.brokerlist: localhost:9092
-  openwifi.kafka.auto.commit: false
-  openwifi.kafka.queue.buffering.max.ms: 50
+  ucentral.kafka.enable: "false"
+  ucentral.kafka.group.id: security
+  ucentral.kafka.client.id: security1
+  ucentral.kafka.brokerlist: localhost:9092
+  ucentral.kafka.auto.commit: false
+  ucentral.kafka.queue.buffering.max.ms: 50
  # Storage
  storage.type: sqlite # (sqlite|postgresql|mysql|odbc)
  ## SQLite
@@ -177,45 +156,52 @@ configProperties:
  storage.type.postgresql.maxsessions: 64
  storage.type.postgresql.idletime: 60
  storage.type.postgresql.host: localhost
-  storage.type.postgresql.database: owsec
+  storage.type.postgresql.database: ucentral
  storage.type.postgresql.port: 5432
  storage.type.postgresql.connectiontimeout: 60
  ## MySQL
  storage.type.mysql.maxsessions: 64
  storage.type.mysql.idletime: 60
  storage.type.mysql.host: localhost
-  storage.type.mysql.database: owsec
+  storage.type.mysql.database: ucentral
  storage.type.mysql.port: 3306
  storage.type.mysql.connectiontimeout: 60
  # System
-  openwifi.service.key: $OWSEC_ROOT/certs/restapi-key.pem
-  openwifi.system.data: $OWSEC_ROOT/persist
-  openwifi.system.debug: "true"
-  openwifi.system.uri.private: https://localhost:17001
-  openwifi.system.uri.public: https://localhost:16001
-  openwifi.system.uri.ui: https://localhost
-  openwifi.system.commandchannel: /tmp/app_owsec
+  ucentral.service.key: $UCENTRALSEC_ROOT/certs/restapi-key.pem
+  ucentral.system.data: $UCENTRALSEC_ROOT/persist
+  ucentral.system.debug: "true"
+  ucentral.system.uri.private: https://localhost:17001
+  ucentral.system.uri.public: https://localhost:16001
+  ucentral.system.uri.ui: https://localhost
+  ucentral.system.commandchannel: /tmp/app_ucentralsec
  # Logging
-  logging.type: console
-  logging.path: $OWSEC_ROOT/logs
-  logging.level: debug
+  logging.formatters.f1.class: PatternFormatter
+  logging.formatters.f1.pattern: "%Y-%m-%d %H:%M:%S %s: [%p] %t"
+  logging.formatters.f1.times: UTC
+  logging.channels.c1.class: ConsoleChannel
+  logging.channels.c1.formatter: f1
+  logging.channels.c2.class: FileChannel
+  logging.channels.c2.path: /tmp/log_ucentralsec
+  logging.channels.c2.formatter.class: PatternFormatter
+  logging.channels.c2.formatter.pattern: "%Y-%m-%d %H:%M:%S %s: [%p] %t"
+  logging.channels.c2.rotation: "20 M"
+  logging.channels.c2.archive: timestamp
+  logging.channels.c2.purgeCount: 20
+  logging.channels.c3.class: ConsoleChannel
+  logging.channels.c3.pattern: "%s: [%p] %t"
+  logging.loggers.root.channel: c1
+  logging.loggers.root.level: debug

  # -> Secret part
  # REST API
-  openwifi.restapi.host.0.key.password: mypassword
-  openwifi.internal.restapi.host.0.key.password: mypassword
+  ucentral.restapi.host.0.key.password: mypassword
+  ucentral.internal.restapi.host.0.key.password: mypassword
  # Authentication
  authentication.default.username: tip@ucentral.com
  authentication.default.password: 13268b7daa751240369d125e79c873bd8dd3bef7981bdfd38ea03dbb1fbe7dcf
  # Mailer
  mailer.username: no-reply@arilia.com
  mailer.password: "**************************"
-  # SMS
-  #smssender.aws.secretkey: ""
-  #smssender.aws.accesskey: ""
-  #smssender.twilio.sid: ""
-  #smssender.twilio.token: ""
-  #
  # Storage
  ## PostgreSQL
  storage.type.postgresql.username: stephb
@@ -238,10 +224,10 @@ postgresql:
    repository: bitnami/postgresql
    tag: 11.13.0-debian-10-r0

-  postgresqlPostgresPassword: "rootPassword"
-  postgresqlUsername: stephb
-  postgresqlPassword: snoopy99
-  postgresqlDatabase: owgw
+  postgresqlPostgresPassword: ""
+  postgresqlUsername: postgres
+  postgresqlPassword: ""
+  postgresqlDatabase: ""

  persistence:
    enabled: true
@@ -258,10 +244,10 @@ mysql:
    tag: 8.0.26-debian-10-r10

  auth:
-    rootPassword: rootPassword
-    database: owgw
-    username: stephb
-    password: snoopy99
+    rootPassword: ""
+    database: my_database
+    username: ""
+    password: ""

  primary:
    persistence:
@@ -279,10 +265,10 @@ mariadb:
    tag: 10.5.12-debian-10-r0

  auth:
-    rootPassword: rootPassword
-    database: owgw
-    username: stephb
-    password: snoopy99
+    rootPassword: ""
+    database: my_database
+    username: ""
+    password: ""

  primary:
    persistence:
--- a/openpapi/ucentralsec/ucentralsec.yaml
+++ b/openpapi/ucentralsec/ucentralsec.yaml
--- a/owsec.properties
+++ b/owsec.properties
@@ -1,130 +0,0 @@
-#
-# uCentral protocol server for devices. This is where you point
-# all your devices. You can replace the * for address by the specific
-# address of one of your interfaces
-#
-
-#
-# REST API access
-#
-openwifi.restapi.host.0.backlog = 100
-openwifi.restapi.host.0.security = relaxed
-openwifi.restapi.host.0.rootca = $OWSEC_ROOT/certs/restapi-ca.pem
-openwifi.restapi.host.0.address = *
-openwifi.restapi.host.0.port = 16001
-openwifi.restapi.host.0.cert = $OWSEC_ROOT/certs/restapi-cert.pem
-openwifi.restapi.host.0.key = $OWSEC_ROOT/certs/restapi-key.pem
-openwifi.restapi.host.0.key.password = mypassword
-openwifi.restapi.wwwassets = $OWSEC_ROOT/wwwassets
-
-openwifi.internal.restapi.host.0.backlog = 100
-openwifi.internal.restapi.host.0.security = relaxed
-openwifi.internal.restapi.host.0.rootca = $OWSEC_ROOT/certs/restapi-ca.pem
-openwifi.internal.restapi.host.0.address = *
-openwifi.internal.restapi.host.0.port = 17001
-openwifi.internal.restapi.host.0.cert = $OWSEC_ROOT/certs/restapi-cert.pem
-openwifi.internal.restapi.host.0.key = $OWSEC_ROOT/certs/restapi-key.pem
-openwifi.internal.restapi.host.0.key.password = mypassword
-
-#
-# Generic section that all microservices must have
-#
-authentication.enabled = true
-authentication.default.username = tip@ucentral.com
-authentication.default.password = 13268b7daa751240369d125e79c873bd8dd3bef7981bdfd38ea03dbb1fbe7dcf
-openwifi.system.data = $OWSEC_ROOT/data
-openwifi.system.uri.private = https://localhost:17001
-openwifi.system.uri.public = https://local.dpaas.arilia.com:16001
-openwifi.system.uri.ui = https://ucentral-ui.arilia.com
-openwifi.system.commandchannel = /tmp/app.ucentralsec
-openwifi.service.key = $OWSEC_ROOT/certs/restapi-key.pem
-openwifi.service.key.password = mypassword
-
-smssender.enabled = false
-smssender.provider = aws
-smssender.aws.secretkey = ***************************************
-smssender.aws.accesskey = ***************************************
-smssender.aws.region = **************
-
-#smssender.provider = twilio
-#smssender.twilio.sid = ***********************
-#smssender.twilio.token = **********************
-#smssender.twilio.phonenumber = +18888888888
-
-#
-# Security Microservice Specific Section
-#
-mailer.enabled = false
-mailer.hostname = smtp.gmail.com
-mailer.username = ************************
-mailer.password = ************************
-mailer.sender = OpenWIFI
-mailer.loginmethod = login
-mailer.port = 587
-mailer.templates = $OWSEC_ROOT/templates
-
-
-#############################
-# Generic information for all micro services
-#############################
-#
-# NLB Support
-#
-alb.enable = true
-alb.port = 16101
-
-#
-# Kafka
-#
-openwifi.kafka.group.id = security
-openwifi.kafka.client.id = security1
-openwifi.kafka.enable = true
-openwifi.kafka.brokerlist = a1.arilia.com:9092
-openwifi.kafka.auto.commit = false
-openwifi.kafka.queue.buffering.max.ms = 50
-openwifi.document.policy.access = /wwwassets/access_policy.html
-openwifi.document.policy.password = /wwwassets/password_policy.html
-openwifi.avatar.maxsize = 2000000
-
-totp.issuer = OpenWiFi
-#
-# This section select which form of persistence you need
-# Only one selected at a time. If you select multiple, this service will die if a horrible
-# death and might make your beer flat.
-#
-storage.type = sqlite
-#storage.type = postgresql
-#storage.type = mysql
-#storage.type = odbc
-
-storage.type.sqlite.db = security.db
-storage.type.sqlite.idletime = 120
-storage.type.sqlite.maxsessions = 128
-
-storage.type.postgresql.maxsessions = 64
-storage.type.postgresql.idletime = 60
-storage.type.postgresql.host = localhost
-storage.type.postgresql.username = stephb
-storage.type.postgresql.password = snoopy99
-storage.type.postgresql.database = ucentral
-storage.type.postgresql.port = 5432
-storage.type.postgresql.connectiontimeout = 60
-
-storage.type.mysql.maxsessions = 64
-storage.type.mysql.idletime = 60
-storage.type.mysql.host = localhost
-storage.type.mysql.username = stephb
-storage.type.mysql.password = snoopy99
-storage.type.mysql.database = ucentral
-storage.type.mysql.port = 3306
-storage.type.mysql.connectiontimeout = 60
-
-########################################################################
-########################################################################
-#
-# Logging: please leave as is for now.
-#
-########################################################################
-logging.type = file
-logging.path = $OWSEC_ROOT/logs
-logging.level = debug
--- a/owsec.properties.tmpl
+++ b/owsec.properties.tmpl
@@ -1,127 +0,0 @@
-#
-# uCentral protocol server for devices. This is where you point
-# all your devices. You can replace the * for address by the specific
-# address of one of your interfaces
-#
-
-#
-# REST API access
-#
-openwifi.restapi.host.0.backlog = 100
-openwifi.restapi.host.0.security = relaxed
-openwifi.restapi.host.0.rootca = ${RESTAPI_HOST_ROOTCA}
-openwifi.restapi.host.0.address = *
-openwifi.restapi.host.0.port = ${RESTAPI_HOST_PORT}
-openwifi.restapi.host.0.cert = ${RESTAPI_HOST_CERT}
-openwifi.restapi.host.0.key = ${RESTAPI_HOST_KEY}
-openwifi.restapi.host.0.key.password = ${RESTAPI_HOST_KEY_PASSWORD}
-openwifi.restapi.wwwassets = ${RESTAPI_WWWASSETS}
-
-openwifi.internal.restapi.host.0.backlog = 100
-openwifi.internal.restapi.host.0.security = relaxed
-openwifi.internal.restapi.host.0.rootca = ${INTERNAL_RESTAPI_HOST_ROOTCA}
-openwifi.internal.restapi.host.0.address = *
-openwifi.internal.restapi.host.0.port = ${INTERNAL_RESTAPI_HOST_PORT}
-openwifi.internal.restapi.host.0.cert = ${INTERNAL_RESTAPI_HOST_CERT}
-openwifi.internal.restapi.host.0.key = ${INTERNAL_RESTAPI_HOST_KEY}
-openwifi.internal.restapi.host.0.key.password = ${INTERNAL_RESTAPI_HOST_KEY_PASSWORD}
-
-#
-# Generic section that all microservices must have
-#
-authentication.enabled = true
-authentication.default.username = ${AUTHENTICATION_DEFAULT_USERNAME}
-authentication.default.password = ${AUTHENTICATION_DEFAULT_PASSWORD}
-openwifi.system.data = ${SYSTEM_DATA}
-openwifi.system.uri.private = ${SYSTEM_URI_PRIVATE}
-openwifi.system.uri.public = ${SYSTEM_URI_PUBLIC}
-openwifi.system.uri.ui = ${SYSTEM_URI_UI}
-openwifi.system.commandchannel = /tmp/app.ucentralsec
-openwifi.service.key = ${SERVICE_KEY}
-openwifi.service.key.password = ${SERVICE_KEY_PASSWORD}
-
-smssender.enabled = ${SMSSENDER_ENABLED}
-smssender.provider = ${SMSSENDER_PROVIDER}
-
-smssender.aws.secretkey = ${SMSSENDER_AWS_SECRETKEY}
-smssender.aws.accesskey = ${SMSSENDER_AWS_ACCESSKEY}
-smssender.aws.region = ${SMSSENDER_AWS_REGION}
-
-smssender.twilio.sid = ${SMSSENDER_TWILIO_SID}
-smssender.twilio.token = ${SMSSENDER_TWILIO_TOKEN}
-smssender.twilio.phonenumber = ${SMSSENDER_TWILIO_PHONENUMBER}
-
-#
-# Security Microservice Specific Section
-#
-mailer.enabled = ${MAILER_ENABLED}
-mailer.hostname = ${MAILER_HOSTNAME}
-mailer.username = ${MAILER_USERNAME}
-mailer.password = ${MAILER_PASSWORD}
-mailer.sender = ${MAILER_SENDER}
-mailer.loginmethod = login
-mailer.port = ${MAILER_PORT}
-mailer.templates = ${MAILER_TEMPLATES}
-
-
-#############################
-# Generic information for all micro services
-#############################
-#
-# NLB Support
-#
-alb.enable = true
-alb.port = 16101
-
-#
-# Kafka
-#
-openwifi.kafka.group.id = security
-openwifi.kafka.client.id = security1
-openwifi.kafka.enable = ${KAFKA_ENABLE}
-openwifi.kafka.brokerlist = ${KAFKA_BROKERLIST}
-openwifi.kafka.auto.commit = false
-openwifi.kafka.queue.buffering.max.ms = 50
-
-openwifi.document.policy.access = ${DOCUMENT_POLICY_ACCESS}
-openwifi.document.policy.password = ${DOCUMENT_POLICY_PASSWORD}
-openwifi.avatar.maxsize = 2000000
-#
-# This section select which form of persistence you need
-# Only one selected at a time. If you select multiple, this service will die if a horrible
-# death and might make your beer flat.
-#
-storage.type = ${STORAGE_TYPE}
-
-storage.type.sqlite.db = security.db
-storage.type.sqlite.idletime = 120
-storage.type.sqlite.maxsessions = 128
-
-storage.type.postgresql.maxsessions = 64
-storage.type.postgresql.idletime = 60
-storage.type.postgresql.host = ${STORAGE_TYPE_POSTGRESQL_HOST}
-storage.type.postgresql.username = ${STORAGE_TYPE_POSTGRESQL_USERNAME}
-storage.type.postgresql.password = ${STORAGE_TYPE_POSTGRESQL_PASSWORD}
-storage.type.postgresql.database = ${STORAGE_TYPE_POSTGRESQL_DATABASE}
-storage.type.postgresql.port = ${STORAGE_TYPE_POSTGRESQL_PORT}
-storage.type.postgresql.connectiontimeout = 60
-
-storage.type.mysql.maxsessions = 64
-storage.type.mysql.idletime = 60
-storage.type.mysql.host = ${STORAGE_TYPE_MYSQL_HOST}
-storage.type.mysql.username = ${STORAGE_TYPE_MYSQL_USERNAME}
-storage.type.mysql.password = ${STORAGE_TYPE_MYSQL_PASSWORD}
-storage.type.mysql.database = ${STORAGE_TYPE_MYSQL_DATABASE}
-storage.type.mysql.port = ${STORAGE_TYPE_MYSQL_PORT}
-storage.type.mysql.connectiontimeout = 60
-
-
-########################################################################
-########################################################################
-#
-# Logging: please leave as is for now.
-#
-########################################################################
-logging.type = console
-logging.path = $OWSEC_ROOT/logs
-logging.level = debug
--- a/59
+++ b/59
@@ -1,59 +0,0 @@
-#!/bin/bash
-set -e
-
-if [[ "$(which jq)" == "" ]]
-then
-  echo "You need the package jq installed to use this script."
-  exit 1
-fi
-
-if [[ "$(which curl)" == "" ]]
-then
-  echo "You need the package curl installed to use this script."
-  exit 1
-fi
-
-
-if [[ "${READINESS_METHOD}" == "systeminfo" ]]
-then
-  if [[ "${OWSEC_USERNAME}" == "" ]]
-  then
-    echo "You must set the variable OWSEC_USERNAME in order to use this script. Something like"
-    echo "OWSEC_USERNAME=tip@ucentral.com"
-    exit 1
-  fi
-
-  if [[ "${OWSEC_PASSWORD}" == "" ]]
-  then
-    echo "You must set the variable OWSEC_PASSWORD in order to use this script. Something like"
-    echo "OWSEC_PASSWORD=openwifi"
-    exit 1
-  fi
-
-  export RESTAPI_PORT=$(grep 'openwifi.restapi.host.0.port' $OWSEC_CONFIG/owsec.properties | awk -F '=' '{print $2}' | xargs | envsubst)
-  # Get OAuth token from OWSEC and cache it or use cached one
-  payload="{ \"userId\" : \"$OWSEC_USERNAME\" , \"password\" : \"$OWSEC_PASSWORD\" }"
-  if [[ -f "/tmp/token" ]]
-  then
-    token=$(cat /tmp/token)
-  else
-    token=$(curl ${FLAGS} -k -X POST -H "Content-Type: application/json" -d "$payload" "https://localhost:$RESTAPI_PORT/api/v1/oauth2" | jq -r '.access_token')
-  fi
-  if [[ "${token}" == "" ]]
-  then
-    echo "Could not login. Please verify the host and username/password."
-    exit 13
-  fi
-  echo -n $token > /tmp/token
-
-  # Make systeminfo request to the local owsec instance
-  curl ${FLAGS} -k -X GET "https://localhost:$RESTAPI_PORT/api/v1/system?command=info" \
-    -H "accept: application/json" \
-    -H "Authorization: Bearer ${token}" > /tmp/result.json
-  exit_code=$?
-  jq < /tmp/result.json
-  exit $exit_code
-else
-  export ALB_PORT=$(grep 'alb.port' $OWSEC_CONFIG/owsec.properties | awk -F '=' '{print $2}' | xargs | envsubst)
-  curl localhost:$ALB_PORT
-fi
--- a/set_env.sh
+++ b/set_env.sh
@@ -1,4 +1,4 @@
 #!/bin/bash

-export OWSEC_CONFIG=`pwd`
-export OWSEC_ROOT=`pwd`
+export UCENTRALSEC_CONFIG=`pwd`
+export UCENTRALSEC_ROOT=`pwd`
--- a/src/ACLProcessor.h
+++ b/src/ACLProcessor.h
@@ -1,84 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-12.
-//
-
-#ifndef OWSEC_ACLPROCESSOR_H
-#define OWSEC_ACLPROCESSOR_H
-
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
-
-namespace OpenWifi {
-
-    class ACLProcessor {
-    public:
-        enum ACL_OPS {
-            READ,
-            MODIFY,
-            DELETE,
-            CREATE
-        };
-/*
-    1) You cannot delete yourself
-    2) If you are root, you can do anything.
-    3) You can do anything to yourself
-    4) Nobody can touch a root, unless they are a root, unless it is to get information on a ROOT
-    5) Creation rules:
-        ROOT -> create anything
-        PARTNER -> (multi-tenant owner) admin,subs,csr,installer,noc,accounting - matches to an entity in provisioning
-        ADMIN -> admin-subs-csr-installer-noc-accounting
-        ACCOUNTING -> subs-installer-csr
-
- */
-        static inline bool Can( const SecurityObjects::UserInfo & User, const SecurityObjects::UserInfo & Target, ACL_OPS Op) {
-            //  rule 1
-            if(User.id == Target.id && Op==DELETE)
-                return false;
-
-            //  rule 2
-            if(User.userRole==SecurityObjects::ROOT)
-                return true;
-
-            //  rule 3
-            if(User.id == Target.id)
-                return true;
-
-            //  rule 4
-            if(Target.userRole==SecurityObjects::ROOT && Op!=READ)
-                return false;
-
-            if(Op==CREATE) {
-                if(User.userRole==SecurityObjects::ROOT)
-                    return true;
-                if(User.userRole==SecurityObjects::PARTNER && (Target.userRole==SecurityObjects::ADMIN ||
-                    Target.userRole==SecurityObjects::SUBSCRIBER ||
-                    Target.userRole==SecurityObjects::CSR ||
-                    Target.userRole==SecurityObjects::INSTALLER ||
-                    Target.userRole==SecurityObjects::NOC ||
-                    Target.userRole==SecurityObjects::ACCOUNTING))
-                    return true;
-                if(User.userRole==SecurityObjects::ADMIN &&
-                    (Target.userRole==SecurityObjects::ADMIN ||
-                    Target.userRole==SecurityObjects::SUBSCRIBER ||
-                    Target.userRole==SecurityObjects::CSR ||
-                    Target.userRole==SecurityObjects::INSTALLER ||
-                    Target.userRole==SecurityObjects::NOC ||
-                    Target.userRole==SecurityObjects::ACCOUNTING))
-                    return true;
-                if(User.userRole==SecurityObjects::ACCOUNTING &&
-                    (Target.userRole==SecurityObjects::SUBSCRIBER ||
-                    Target.userRole==SecurityObjects::INSTALLER ||
-                    Target.userRole==SecurityObjects::CSR))
-                    return true;
-                return false;
-            }
-
-            return true;
-        }
-    private:
-
-    };
-
-}
-
-
-#endif //OWSEC_ACLPROCESSOR_H
--- a/src/ALBHealthCheckServer.h
+++ b/src/ALBHealthCheckServer.h
@@ -0,0 +1,114 @@
+//
+// Created by stephane bourque on 2021-06-04.
+//
+
+#ifndef UCENTRALGW_ALBHEALTHCHECKSERVER_H
+#define UCENTRALGW_ALBHEALTHCHECKSERVER_H
+
+#include <memory>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+#include "Poco/Thread.h"
+#include "Poco/Net/HTTPServer.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/Net/HTTPRequestHandler.h"
+#include "Poco/Logger.h"
+
+#include "Daemon.h"
+#include "SubSystemServer.h"
+
+namespace OpenWifi {
+
+	class ALBRequestHandler: public Poco::Net::HTTPRequestHandler
+			/// Return a HTML document with the current date and time.
+		{
+		  public:
+			ALBRequestHandler(Poco::Logger & L)
+				: Logger_(L)
+			{
+			}
+
+			void handleRequest(Poco::Net::HTTPServerRequest& Request, Poco::Net::HTTPServerResponse& Response)
+			{
+				Logger_.information(Poco::format("ALB-REQUEST(%s): New ALB request.",Request.clientAddress().toString()));
+				Response.setChunkedTransferEncoding(true);
+				Response.setContentType("text/html");
+				Response.setDate(Poco::Timestamp());
+				Response.setStatus(Poco::Net::HTTPResponse::HTTP_OK);
+				Response.setKeepAlive(true);
+				Response.set("Connection","keep-alive");
+				Response.setVersion(Poco::Net::HTTPMessage::HTTP_1_1);
+				std::ostream &Answer = Response.send();
+				Answer << "uCentralGW Alive and kicking!" ;
+			}
+
+	  private:
+		Poco::Logger 	& Logger_;
+	};
+
+	class ALBRequestHandlerFactory: public Poco::Net::HTTPRequestHandlerFactory
+		{
+		  public:
+			explicit ALBRequestHandlerFactory(Poco::Logger & L):
+				Logger_(L)
+			{
+			}
+
+			ALBRequestHandler* createRequestHandler(const Poco::Net::HTTPServerRequest& request) override
+			{
+				if (request.getURI() == "/")
+					return new ALBRequestHandler(Logger_);
+				else
+					return nullptr;
+			}
+
+		  private:
+			Poco::Logger	&Logger_;
+		};
+
+    class ALBHealthCheckServer : public SubSystemServer {
+        public:
+            ALBHealthCheckServer() noexcept:
+                    SubSystemServer("ALBHealthCheckServer", "ALB-SVR", "alb")
+            {
+            }
+
+            static ALBHealthCheckServer *instance() {
+                if (instance_ == nullptr) {
+                    instance_ = new ALBHealthCheckServer;
+                }
+                return instance_;
+            }
+
+            int Start() {
+                if(Daemon()->ConfigGetBool("alb.enable",false)) {
+                    Port_ = (int)Daemon()->ConfigGetInt("alb.port",15015);
+                    Socket_ = std::make_unique<Poco::Net::ServerSocket>(Port_);
+                    auto Params = new Poco::Net::HTTPServerParams;
+                    Server_ = std::make_unique<Poco::Net::HTTPServer>(new ALBRequestHandlerFactory(Logger_), *Socket_, Params);
+                    Server_->start();
+                }
+
+                return 0;
+            }
+
+            void Stop() {
+                if(Server_)
+                    Server_->stop();
+            }
+
+          private:
+            static ALBHealthCheckServer *instance_;
+            std::unique_ptr<Poco::Net::HTTPServer>   	Server_;
+            std::unique_ptr<Poco::Net::ServerSocket> 	Socket_;
+            int                                     	Port_ = 0;
+        };
+
+    inline ALBHealthCheckServer * ALBHealthCheckServer() { return ALBHealthCheckServer::instance(); }
+    inline class ALBHealthCheckServer * ALBHealthCheckServer::instance_ = nullptr;
+}
+
+#endif // UCENTRALGW_ALBHEALTHCHECKSERVER_H
--- a/src/ActionLinkManager.cpp
+++ b/src/ActionLinkManager.cpp
@@ -1,97 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-08.
-//
-
-#include "ActionLinkManager.h"
-#include "StorageService.h"
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
-
-namespace OpenWifi {
-
-    int ActionLinkManager::Start() {
-        if(!Running_)
-            Thr_.start(*this);
-        return 0;
-    }
-
-    void ActionLinkManager::Stop() {
-        if(Running_) {
-            Running_ = false;
-            Thr_.wakeUp();
-            Thr_.join();
-        }
-    }
-
-    void ActionLinkManager::run() {
-        Running_ = true ;
-
-        while(Running_) {
-            Poco::Thread::trySleep(2000);
-            if(!Running_)
-                break;
-            std::vector<SecurityObjects::ActionLink>    Links;
-            {
-                std::lock_guard G(Mutex_);
-                StorageService()->ActionLinksDB().GetActions(Links);
-            }
-
-            if(Links.empty())
-                continue;
-
-            for(auto &i:Links) {
-                if(!Running_)
-                    break;
-
-                SecurityObjects::UserInfo UInfo;
-                if((i.action==OpenWifi::SecurityObjects::LinkActions::FORGOT_PASSWORD ||
-                    i.action==OpenWifi::SecurityObjects::LinkActions::VERIFY_EMAIL) && !StorageService()->UserDB().GetUserById(i.userId,UInfo)) {
-                    StorageService()->ActionLinksDB().CancelAction(i.id);
-                    continue;
-                } else if(( i.action==OpenWifi::SecurityObjects::LinkActions::SUB_FORGOT_PASSWORD ||
-                            i.action==OpenWifi::SecurityObjects::LinkActions::SUB_VERIFY_EMAIL) && !StorageService()->SubDB().GetUserById(i.userId,UInfo)) {
-                    StorageService()->ActionLinksDB().CancelAction(i.id);
-                    continue;
-                }
-
-                switch(i.action) {
-                    case OpenWifi::SecurityObjects::LinkActions::FORGOT_PASSWORD: {
-                            if(AuthService::SendEmailToUser(i.id, UInfo.email, AuthService::FORGOT_PASSWORD)) {
-                                Logger().information(Poco::format("Send password reset link to %s",UInfo.email));
-                            }
-                            StorageService()->ActionLinksDB().SentAction(i.id);
-                        }
-                        break;
-
-                    case OpenWifi::SecurityObjects::LinkActions::VERIFY_EMAIL: {
-                            if(AuthService::SendEmailToUser(i.id, UInfo.email, AuthService::EMAIL_VERIFICATION)) {
-                                Logger().information(Poco::format("Send email verification link to %s",UInfo.email));
-                            }
-                            StorageService()->ActionLinksDB().SentAction(i.id);
-                        }
-                        break;
-
-                    case OpenWifi::SecurityObjects::LinkActions::SUB_FORGOT_PASSWORD: {
-                            if(AuthService::SendEmailToSubUser(i.id, UInfo.email, AuthService::FORGOT_PASSWORD)) {
-                                Logger().information(Poco::format("Send subscriber password reset link to %s",UInfo.email));
-                            }
-                            StorageService()->ActionLinksDB().SentAction(i.id);
-                        }
-                        break;
-
-                    case OpenWifi::SecurityObjects::LinkActions::SUB_VERIFY_EMAIL: {
-                            if(AuthService::SendEmailToSubUser(i.id, UInfo.email, AuthService::EMAIL_VERIFICATION)) {
-                                Logger().information(Poco::format("Send subscriber email verification link to %s",UInfo.email));
-                            }
-                            StorageService()->ActionLinksDB().SentAction(i.id);
-                        }
-                        break;
-
-                    default: {
-                        StorageService()->ActionLinksDB().SentAction(i.id);
-                    }
-                }
-            }
-        }
-    }
-
-}
--- a/src/ActionLinkManager.h
+++ b/src/ActionLinkManager.h
@@ -1,43 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-08.
-//
-
-#ifndef OWSEC_ACTIONLINKMANAGER_H
-#define OWSEC_ACTIONLINKMANAGER_H
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-
-    class ActionLinkManager : public SubSystemServer, Poco::Runnable {
-    public:
-
-/*        enum Actions {
-            FORGOT_PASSWORD,
-            VERIFY_EMAIL,
-            SUB_FORGOT_PASSWORD,
-            SUB_VERIFY_EMAIL
-        };
-*/
-        static ActionLinkManager * instance() {
-            static auto * instance_ = new ActionLinkManager;
-            return instance_;
-        }
-
-        int Start() final;
-        void Stop() final;
-        void run();
-
-    private:
-        Poco::Thread        Thr_;
-        std::atomic_bool    Running_ = false;
-
-        ActionLinkManager() noexcept:
-            SubSystemServer("ActionLinkManager", "ACTION-SVR", "action.server")
-                {
-                }
-    };
-    inline ActionLinkManager * ActionLinkManager() { return ActionLinkManager::instance(); }
-}
-
-#endif //OWSEC_ACTIONLINKMANAGER_H
--- a/src/AuthClient.cpp
+++ b/src/AuthClient.cpp
@@ -0,0 +1,88 @@
+//
+// Created by stephane bourque on 2021-06-30.
+//
+#include <utility>
+
+#include "AuthClient.h"
+#include "RESTAPI_SecurityObjects.h"
+#include "Daemon.h"
+#include "OpenAPIRequest.h"
+
+namespace OpenWifi {
+	class AuthClient * AuthClient::instance_ = nullptr;
+
+	int AuthClient::Start() {
+		return 0;
+	}
+
+	void AuthClient::Stop() {
+
+	}
+
+	void AuthClient::RemovedCachedToken(const std::string &Token) {
+		SubMutexGuard G(Mutex_);
+		UserCache_.erase(Token);
+	}
+
+	bool IsTokenExpired(const SecurityObjects::WebToken &T) {
+		return ((T.expires_in_+T.created_)<std::time(nullptr));
+	}
+
+	bool AuthClient::IsAuthorized(Poco::Net::HTTPServerRequest & Request, std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo ) {
+		SubMutexGuard G(Mutex_);
+
+		auto User = UserCache_.find(SessionToken);
+		if(User != UserCache_.end() && !IsTokenExpired(User->second.webtoken)) {
+			UInfo = User->second;
+			return true;
+		} else {
+			Types::StringPairVec QueryData;
+			QueryData.push_back(std::make_pair("token",SessionToken));
+			OpenAPIRequestGet	Req(    uSERVICE_SECURITY,
+								  	"/api/v1/validateToken",
+									 QueryData,
+								  5000);
+			Poco::JSON::Object::Ptr Response;
+			if(Req.Do(Response)==Poco::Net::HTTPResponse::HTTP_OK) {
+				if(Response->has("tokenInfo") && Response->has("userInfo")) {
+					SecurityObjects::UserInfoAndPolicy	P;
+					P.from_json(Response);
+					UserCache_[SessionToken] = P;
+					UInfo = P;
+				}
+				return true;
+			}
+
+		}
+		return false;
+	}
+
+	bool AuthClient::IsTokenAuthorized(const std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo) {
+		SubMutexGuard G(Mutex_);
+
+		auto User = UserCache_.find(SessionToken);
+		if(User != UserCache_.end() && !IsTokenExpired(User->second.webtoken)) {
+			UInfo = User->second;
+			return true;
+		} else {
+			Types::StringPairVec QueryData;
+			QueryData.push_back(std::make_pair("token",SessionToken));
+			OpenAPIRequestGet	Req(uSERVICE_SECURITY,
+									 "/api/v1/validateToken",
+									 QueryData,
+									 5000);
+			Poco::JSON::Object::Ptr Response;
+			if(Req.Do(Response)==Poco::Net::HTTPResponse::HTTP_OK) {
+				if(Response->has("tokenInfo") && Response->has("userInfo")) {
+					SecurityObjects::UserInfoAndPolicy	P;
+					P.from_json(Response);
+					UserCache_[SessionToken] = P;
+					UInfo = P;
+				}
+				return true;
+			}
+
+		}
+		return false;
+	}
+}
--- a/src/AuthClient.h
+++ b/src/AuthClient.h
@@ -0,0 +1,45 @@
+//
+// Created by stephane bourque on 2021-06-30.
+//
+
+#ifndef UCENTRALGW_AUTHCLIENT_H
+#define UCENTRALGW_AUTHCLIENT_H
+
+#include "Poco/JSON/Object.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/JWT/Signer.h"
+#include "Poco/SHA2Engine.h"
+#include "RESTAPI_SecurityObjects.h"
+#include "SubSystemServer.h"
+
+namespace OpenWifi {
+
+class AuthClient : public SubSystemServer {
+	  public:
+		explicit AuthClient() noexcept:
+			SubSystemServer("Authentication", "AUTH-CLNT", "authentication")
+		{
+		}
+
+		static AuthClient *instance() {
+			if (instance_ == nullptr) {
+				instance_ = new AuthClient;
+			}
+			return instance_;
+		}
+
+		int Start() override;
+		void Stop() override;
+		bool IsAuthorized(Poco::Net::HTTPServerRequest & Request, std::string &SessionToken, OpenWifi::SecurityObjects::UserInfoAndPolicy & UInfo );
+		void RemovedCachedToken(const std::string &Token);
+		bool IsTokenAuthorized(const std::string &Token, SecurityObjects::UserInfoAndPolicy & UInfo);
+	  private:
+		static AuthClient 					*instance_;
+		OpenWifi::SecurityObjects::UserInfoCache 		UserCache_;
+	};
+
+	inline AuthClient * AuthClient() { return AuthClient::instance(); }
+}
+
+#endif // UCENTRALGW_AUTHCLIENT_H
--- a/src/AuthService.cpp
+++ b/src/AuthService.cpp
@@ -11,17 +11,19 @@
 #include "Poco/Net/OAuth20Credentials.h"
 #include "Poco/JWT/Token.h"
 #include "Poco/JWT/Signer.h"
-#include "Poco/StringTokenizer.h"

-#include "framework/MicroService.h"
+#include "Daemon.h"
+#include "RESTAPI_handler.h"
 #include "StorageService.h"
 #include "AuthService.h"
-#include "framework/KafkaTopics.h"
+#include "Utils.h"
+#include "KafkaManager.h"
+#include "Kafka_topics.h"

 #include "SMTPMailerService.h"
-#include "MFAServer.h"

 namespace OpenWifi {
+    class AuthService *AuthService::instance_ = nullptr;

    AuthService::ACCESS_TYPE AuthService::IntToAccessType(int C) {
 		switch (C) {
@@ -43,175 +45,85 @@ namespace OpenWifi {
 	}

    int AuthService::Start() {
-		Signer_.setRSAKey(MicroService::instance().Key());
+		Signer_.setRSAKey(Daemon()->Key());
 		Signer_.addAllAlgorithms();
-		Logger().notice("Starting...");
-        TokenAging_ = (uint64_t) MicroService::instance().ConfigGetInt("authentication.token.ageing", 30 * 24 * 60 * 60);
-        HowManyOldPassword_ = MicroService::instance().ConfigGetInt("authentication.oldpasswords", 5);
-
-        AccessPolicy_ = MicroService::instance().ConfigPath("openwifi.document.policy.access", "/wwwassets/access_policy.html");
-        PasswordPolicy_ = MicroService::instance().ConfigPath("openwifi.document.policy.password", "/wwwassets/password_policy.html");
-        PasswordValidation_ = PasswordValidationStr_ = MicroService::instance().ConfigGetString("authentication.validation.expression","^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$");
-
-        SubPasswordValidation_ = SubPasswordValidationStr_ = MicroService::instance().ConfigGetString("subscriber.validation.expression","^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$");
-        SubAccessPolicy_ = MicroService::instance().ConfigPath("subscriber.policy.access", "/wwwassets/access_policy.html");
-        SubPasswordPolicy_ = MicroService::instance().ConfigPath("subscriber.policy.password", "/wwwassets/password_policy.html");
-
+		Logger_.notice("Starting...");
+        Secure_ = Daemon()->ConfigGetBool("authentication.enabled",true);
+        DefaultPassword_ = Daemon()->ConfigGetString("authentication.default.password","");
+        DefaultUserName_ = Daemon()->ConfigGetString("authentication.default.username","");
+        Mechanism_ = Daemon()->ConfigGetString("authentication.service.type","internal");
+        PasswordValidation_ = PasswordValidationStr_ = Daemon()->ConfigGetString("authentication.validation.expression","^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$");
+        TokenAging_ = (uint64_t) Daemon()->ConfigGetInt("authentication.token.ageing", 30 * 24 * 60 * 60);
+        HowManyOldPassword_ = Daemon()->ConfigGetInt("authentication.oldpasswords", 5);
        return 0;
    }

    void AuthService::Stop() {
-		Logger().notice("Stopping...");
+		Logger_.notice("Stopping...");
    }

-	bool AuthService::IsAuthorized(Poco::Net::HTTPServerRequest & Request, std::string & SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, bool & Expired )
+	bool AuthService::IsAuthorized(Poco::Net::HTTPServerRequest & Request, std::string & SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo )
    {
-        std::lock_guard	Guard(Mutex_);
-        Expired = false;
+        if(!Secure_)
+            return true;
+
+		SubMutexGuard		Guard(Mutex_);
+
+		std::string CallToken;
+
 		try {
-		    std::string CallToken;
-		    Poco::Net::OAuth20Credentials Auth(Request);
-		    if (Auth.getScheme() == "Bearer") {
-		        CallToken = Auth.getBearerToken();
-		    }
+			Poco::Net::OAuth20Credentials Auth(Request);

-            if(CallToken.empty()) {
-                return false;
-            }
-
-            SecurityObjects::WebToken   WT;
-            uint64_t                    RevocationDate=0;
-            std::string                 UserId;
-            if(StorageService()->UserTokenDB().GetToken(CallToken, WT, UserId, RevocationDate)) {
-                if(RevocationDate!=0)
-                    return false;
-                Expired = (WT.created_ + WT.expires_in_) < time(nullptr);
-                if(StorageService()->UserDB().GetUserById(UserId,UInfo.userinfo)) {
-                    UInfo.webtoken = WT;
-                    SessionToken = CallToken;
-                    return true;
-                }
-            }
-            return false;
+			if (Auth.getScheme() == "Bearer") {
+				CallToken = Auth.getBearerToken();
+			}
 		} catch(const Poco::Exception &E) {
-		    Logger().log(E);
 		}
+
+		if(CallToken.empty())
+			CallToken = Request.get("X-API-KEY ", "");
+
+		if(CallToken.empty())
+			return false;
+
+		auto Client = UserCache_.find(CallToken);
+
+		if( Client == UserCache_.end() )
+			return ValidateToken(CallToken, CallToken, UInfo);
+
+		if((Client->second.webtoken.created_ + Client->second.webtoken.expires_in_) > time(nullptr)) {
+			SessionToken = CallToken;
+            UInfo = Client->second ;
+			return true;
+		}
+		UserCache_.erase(CallToken);
 		return false;
    }

-    bool AuthService::IsSubAuthorized(Poco::Net::HTTPServerRequest & Request, std::string & SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, bool & Expired )
-    {
-        std::lock_guard	Guard(Mutex_);
-        Expired = false;
-        try {
-            std::string CallToken;
-            Poco::Net::OAuth20Credentials Auth(Request);
-            if (Auth.getScheme() == "Bearer") {
-                CallToken = Auth.getBearerToken();
-            }
-
-            if(CallToken.empty()) {
-                return false;
-            }
-
-            SecurityObjects::WebToken   WT;
-            uint64_t                    RevocationDate=0;
-            std::string                 UserId;
-            if(StorageService()->SubTokenDB().GetToken(CallToken, WT, UserId, RevocationDate)) {
-                if(RevocationDate!=0)
-                    return false;
-                Expired = (WT.created_ + WT.expires_in_) < time(nullptr);
-                if(StorageService()->SubDB().GetUserById(UserId,UInfo.userinfo)) {
-                    UInfo.webtoken = WT;
-                    SessionToken = CallToken;
-                    return true;
-                }
-            }
-            return false;
-        } catch(const Poco::Exception &E) {
-            Logger().log(E);
-        }
-        return false;
-    }
-
-    void AuthService::RevokeToken(std::string & Token) {
-        StorageService()->UserTokenDB().RevokeToken(Token);
-    }
-
-    void AuthService::RevokeSubToken(std::string & Token) {
-        StorageService()->SubTokenDB().RevokeToken(Token);
-    }
-
-    bool AuthService::DeleteUserFromCache(const std::string &Id) {
-        return StorageService()->UserTokenDB().DeleteRecordsFromCache("userName",Id);
-    }
-
-    bool AuthService::DeleteSubUserFromCache(const std::string &Id) {
-        return StorageService()->SubTokenDB().DeleteRecordsFromCache("userName",Id);
-    }
-
-    bool AuthService::RequiresMFA(const SecurityObjects::UserInfoAndPolicy &UInfo) {
-        return (UInfo.userinfo.userTypeProprietaryInfo.mfa.enabled && MFAServer::MethodEnabled(UInfo.userinfo.userTypeProprietaryInfo.mfa.method));
-    }
-
    bool AuthService::ValidatePassword(const std::string &Password) {
        return std::regex_match(Password, PasswordValidation_);
    }

-    bool AuthService::ValidateSubPassword(const std::string &Password) {
-        return std::regex_match(Password, SubPasswordValidation_);
-    }
+    void AuthService::Logout(const std::string &token) {
+		SubMutexGuard		Guard(Mutex_);
+        UserCache_.erase(token);

-    void AuthService::RemoveTokenSystemWide(const std::string &token) {
        try {
-            if(KafkaManager()->Enabled()) {
-                Poco::JSON::Object Obj;
-                Obj.set("event", "remove-token");
-                Obj.set("id", MicroService::instance().ID());
-                Obj.set("token", token);
-                std::stringstream ResultText;
-                Poco::JSON::Stringifier::stringify(Obj, ResultText);
-                KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS, MicroService::instance().PrivateEndPoint(),
-                                            ResultText.str(),
-                                            false);
-            }
+            Poco::JSON::Object Obj;
+            Obj.set("event", "remove-token");
+            Obj.set("id", Daemon()->ID());
+            Obj.set("token", token);
+            std::stringstream ResultText;
+            Poco::JSON::Stringifier::stringify(Obj, ResultText);
+            KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS, Daemon()->PrivateEndPoint(), ResultText.str(),
+                                        false);
        } catch (const Poco::Exception &E) {
-            Logger().log(E);
+            Logger_.log(E);
        }
    }

-    void AuthService::Logout(const std::string &Token, bool EraseFromCache) {
-		std::lock_guard		Guard(Mutex_);
-
-        try {
-            auto tToken{Token};
-            StorageService()->UserTokenDB().DeleteRecord("token",tToken);
-            StorageService()->LoginDB().AddLogout(Token);
-        } catch (const Poco::Exception &E) {
-            Logger().log(E);
-        }
-    }
-
-    void AuthService::SubLogout(const std::string &Token, bool EraseFromCache) {
-        std::lock_guard		Guard(Mutex_);
-
-        try {
-            auto tToken{Token};
-            StorageService()->SubTokenDB().DeleteRecord("token",tToken);
-            StorageService()->SubLoginDB().AddLogout(Token);
-        } catch (const Poco::Exception &E) {
-            Logger().log(E);
-        }
-    }
-
-    [[nodiscard]] std::string AuthService::GenerateTokenHMAC(const std::string & UserName, ACCESS_TYPE Type) {
-        std::string Identity(UserName + ":" + Poco::format("%d",(int)std::time(nullptr)) + ":" + std::to_string(rand()));
-        HMAC_.update(Identity);
-        return Poco::DigestEngine::digestToHex(HMAC_.digest());
-    }
-
-    std::string AuthService::GenerateTokenJWT(const std::string & Identity, ACCESS_TYPE Type) {
-        std::lock_guard		Guard(Mutex_);
+    std::string AuthService::GenerateToken(const std::string & Identity, ACCESS_TYPE Type) {
+		SubMutexGuard		Guard(Mutex_);

 		Poco::JWT::Token	T;

@@ -230,180 +142,96 @@ namespace OpenWifi {
 		return JWT;
    }

+	bool AuthService::ValidateToken(const std::string & Token, std::string & SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo  ) {
+		SubMutexGuard		Guard(Mutex_);
+		Poco::JWT::Token	DecryptedToken;
+
+		try {
+            auto E = UserCache_.find(SessionToken);
+            if(E == UserCache_.end()) {
+                if (Signer_.tryVerify(Token, DecryptedToken)) {
+                    auto Expires = DecryptedToken.getExpiration();
+                    if (Expires > Poco::Timestamp()) {
+                        auto Identity = DecryptedToken.payload().get("identity").toString();
+                        if(Storage()->GetUserById(Identity,UInfo.userinfo)) {
+                            auto IssuedAt = DecryptedToken.getIssuedAt();
+                            auto Subject = DecryptedToken.getSubject();
+                            UInfo.webtoken.access_token_ = Token;
+                            UInfo.webtoken.refresh_token_ = Token;
+                            UInfo.webtoken.username_ = Identity;
+                            UInfo.webtoken.id_token_ = Token;
+                            UInfo.webtoken.token_type_ = "Bearer";
+                            UInfo.webtoken.created_ = IssuedAt.epochTime();
+                            UInfo.webtoken.expires_in_ = Expires.epochTime() - IssuedAt.epochTime();
+                            UInfo.webtoken.idle_timeout_ = 5 * 60;
+                            UserCache_[UInfo.webtoken.access_token_] = UInfo;
+                            return true;
+                        }
+                    }
+                }
+            } else {
+                UInfo = E->second;
+                return true;
+            }
+
+		} catch (const Poco::Exception &E ) {
+			Logger_.log(E);
+		}
+		return false;
+	}
+
    void AuthService::CreateToken(const std::string & UserName, SecurityObjects::UserInfoAndPolicy &UInfo)
    {
-        std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);

+		std::string Token = GenerateToken(UInfo.userinfo.Id,USERNAME);
        SecurityObjects::AclTemplate	ACL;
        ACL.PortalLogin_ = ACL.Read_ = ACL.ReadWrite_ = ACL.ReadWriteCreate_ = ACL.Delete_ = true;
        UInfo.webtoken.acl_template_ = ACL;
        UInfo.webtoken.expires_in_ = TokenAging_ ;
        UInfo.webtoken.idle_timeout_ = 5 * 60;
        UInfo.webtoken.token_type_ = "Bearer";
-        UInfo.webtoken.access_token_ = GenerateTokenHMAC(UInfo.userinfo.id,USERNAME);
-        UInfo.webtoken.id_token_ = GenerateTokenHMAC(UInfo.userinfo.id,USERNAME);
-        UInfo.webtoken.refresh_token_ = GenerateTokenHMAC(UInfo.userinfo.id,CUSTOM);
+        UInfo.webtoken.access_token_ = Token;
+        UInfo.webtoken.id_token_ = Token;
+        UInfo.webtoken.refresh_token_ = Token;
        UInfo.webtoken.created_ = time(nullptr);
        UInfo.webtoken.username_ = UserName;
        UInfo.webtoken.errorCode = 0;
        UInfo.webtoken.userMustChangePassword = false;
-        StorageService()->UserDB().SetLastLogin(UInfo.userinfo.id);
-        StorageService()->UserTokenDB().AddToken(UInfo.userinfo.id, UInfo.webtoken.access_token_,
-                            UInfo.webtoken.refresh_token_, UInfo.webtoken.token_type_,
-                                UInfo.webtoken.expires_in_, UInfo.webtoken.idle_timeout_);
-        StorageService()->LoginDB().AddLogin(UInfo.userinfo.id, UInfo.userinfo.email,UInfo.webtoken.access_token_ );
-    }
-
-    void AuthService::CreateSubToken(const std::string & UserName, SecurityObjects::UserInfoAndPolicy &UInfo)
-    {
-        std::lock_guard		Guard(Mutex_);
-
-        SecurityObjects::AclTemplate	ACL;
-        ACL.PortalLogin_ = ACL.Read_ = ACL.ReadWrite_ = ACL.ReadWriteCreate_ = ACL.Delete_ = true;
-        UInfo.webtoken.acl_template_ = ACL;
-        UInfo.webtoken.expires_in_ = TokenAging_ ;
-        UInfo.webtoken.idle_timeout_ = 5 * 60;
-        UInfo.webtoken.token_type_ = "Bearer";
-        UInfo.webtoken.access_token_ = GenerateTokenHMAC(UInfo.userinfo.id,USERNAME);
-        UInfo.webtoken.id_token_ = GenerateTokenHMAC(UInfo.userinfo.id,USERNAME);
-        UInfo.webtoken.refresh_token_ = GenerateTokenHMAC(UInfo.userinfo.id,CUSTOM);
-        UInfo.webtoken.created_ = time(nullptr);
-        UInfo.webtoken.username_ = UserName;
-        UInfo.webtoken.errorCode = 0;
-        UInfo.webtoken.userMustChangePassword = false;
-        StorageService()->SubDB().SetLastLogin(UInfo.userinfo.id);
-        StorageService()->SubTokenDB().AddToken(UInfo.userinfo.id, UInfo.webtoken.access_token_,
-                                   UInfo.webtoken.refresh_token_, UInfo.webtoken.token_type_,
-                                   UInfo.webtoken.expires_in_, UInfo.webtoken.idle_timeout_);
-        StorageService()->SubLoginDB().AddLogin(UInfo.userinfo.id, UInfo.userinfo.email,UInfo.webtoken.access_token_ );
+        UserCache_[Token] = UInfo;
+        Storage()->SetLastLogin(UInfo.userinfo.Id);
    }

    bool AuthService::SetPassword(const std::string &NewPassword, SecurityObjects::UserInfo & UInfo) {
-        std::lock_guard     G(Mutex_);
-
-        Poco::toLowerInPlace(UInfo.email);
-        for (const auto &i:UInfo.lastPasswords) {
-            auto Tokens = Poco::StringTokenizer(i,"|");
-            if(Tokens.count()==2) {
-                const auto & Salt = Tokens[0];
-                for(const auto &j:UInfo.lastPasswords) {
-                    auto OldTokens = Poco::StringTokenizer(j,"|");
-                    if(OldTokens.count()==2) {
-                        SHA2_.update(Salt+NewPassword+UInfo.email);
-                        if(OldTokens[1]==Utils::ToHex(SHA2_.digest()))
-                            return false;
-                    }
-                }
-            } else {
-                SHA2_.update(NewPassword+UInfo.email);
-                if(Tokens[0]==Utils::ToHex(SHA2_.digest()))
-                    return false;
+        auto NewPasswordHash = ComputePasswordHash(UInfo.email, NewPassword);
+        for (auto const &i:UInfo.lastPasswords) {
+            if (i == NewPasswordHash) {
+                return false;
            }
        }
-
        if(UInfo.lastPasswords.size()==HowManyOldPassword_) {
            UInfo.lastPasswords.erase(UInfo.lastPasswords.begin());
        }
-
-        auto NewHash = ComputeNewPasswordHash(UInfo.email,NewPassword);
-        UInfo.lastPasswords.push_back(NewHash);
-        UInfo.currentPassword = NewHash;
+        UInfo.lastPasswords.push_back(NewPasswordHash);
+        UInfo.currentPassword = NewPasswordHash;
        UInfo.changePassword = false;
        return true;
    }

-    bool AuthService::SetSubPassword(const std::string &NewPassword, SecurityObjects::UserInfo & UInfo) {
-        std::lock_guard     G(Mutex_);
-
-        Poco::toLowerInPlace(UInfo.email);
-        for (const auto &i:UInfo.lastPasswords) {
-            auto Tokens = Poco::StringTokenizer(i,"|");
-            if(Tokens.count()==2) {
-                const auto & Salt = Tokens[0];
-                for(const auto &j:UInfo.lastPasswords) {
-                    auto OldTokens = Poco::StringTokenizer(j,"|");
-                    if(OldTokens.count()==2) {
-                        SHA2_.update(Salt+NewPassword+UInfo.email);
-                        if(OldTokens[1]==Utils::ToHex(SHA2_.digest()))
-                            return false;
-                    }
-                }
-            } else {
-                SHA2_.update(NewPassword+UInfo.email);
-                if(Tokens[0]==Utils::ToHex(SHA2_.digest()))
-                    return false;
-            }
-        }
-
-        if(UInfo.lastPasswords.size()==HowManyOldPassword_) {
-            UInfo.lastPasswords.erase(UInfo.lastPasswords.begin());
-        }
-
-        auto NewHash = ComputeNewPasswordHash(UInfo.email,NewPassword);
-        UInfo.lastPasswords.push_back(NewHash);
-        UInfo.currentPassword = NewHash;
-        UInfo.changePassword = false;
-        return true;
-    }
-
-    static std::string GetMeSomeSalt() {
-        auto start = std::chrono::high_resolution_clock::now();
-        return std::to_string(start.time_since_epoch().count());
-    }
-
-    std::string AuthService::ComputeNewPasswordHash(const std::string &UserName, const std::string &Password) {
-        std::string UName = Poco::trim(Poco::toLower(UserName));
-        auto Salt = GetMeSomeSalt();
-        SHA2_.update(Salt + Password + UName );
-        return Salt + "|" + Utils::ToHex(SHA2_.digest());
-    }
-
-    bool AuthService::ValidatePasswordHash(const std::string & UserName, const std::string & Password, const std::string &StoredPassword) {
-        std::lock_guard G(Mutex_);
-
-        std::string UName = Poco::trim(Poco::toLower(UserName));
-        auto Tokens = Poco::StringTokenizer(StoredPassword,"|");
-        if(Tokens.count()==1) {
-            SHA2_.update(Password+UName);
-            if(Tokens[0]==Utils::ToHex(SHA2_.digest()))
-                return true;
-        } else if (Tokens.count()==2) {
-            SHA2_.update(Tokens[0]+Password+UName);
-            if(Tokens[1]==Utils::ToHex(SHA2_.digest()))
-                return true;
-        }
-        return false;
-    }
-
-    bool AuthService::ValidateSubPasswordHash(const std::string & UserName, const std::string & Password, const std::string &StoredPassword) {
-        std::lock_guard G(Mutex_);
-
-        std::string UName = Poco::trim(Poco::toLower(UserName));
-        auto Tokens = Poco::StringTokenizer(StoredPassword,"|");
-        if(Tokens.count()==1) {
-            SHA2_.update(Password+UName);
-            if(Tokens[0]==Utils::ToHex(SHA2_.digest()))
-                return true;
-        } else if (Tokens.count()==2) {
-            SHA2_.update(Tokens[0]+Password+UName);
-            if(Tokens[1]==Utils::ToHex(SHA2_.digest()))
-                return true;
-        }
-        return false;
-    }
-
-    UNAUTHORIZED_REASON AuthService::Authorize( std::string & UserName, const std::string & Password, const std::string & NewPassword, SecurityObjects::UserInfoAndPolicy & UInfo , bool & Expired )
+    AuthService::AUTH_ERROR AuthService::Authorize( std::string & UserName, const std::string & Password, const std::string & NewPassword, SecurityObjects::UserInfoAndPolicy & UInfo )
    {
-        std::lock_guard		Guard(Mutex_);
+		SubMutexGuard					Guard(Mutex_);
+        SecurityObjects::AclTemplate	ACL;

        Poco::toLowerInPlace(UserName);
+        auto PasswordHash = ComputePasswordHash(UserName, Password);

-        if(StorageService()->UserDB().GetUserByEmail(UserName,UInfo.userinfo)) {
+        if(Storage()->GetUserByEmail(UserName,UInfo.userinfo)) {
            if(UInfo.userinfo.waitingForEmailCheck) {
                return USERNAME_PENDING_VERIFICATION;
            }

-            if(!ValidatePasswordHash(UserName,Password,UInfo.userinfo.currentPassword)) {
+            if(PasswordHash != UInfo.userinfo.currentPassword) {
                return INVALID_CREDENTIALS;
            }

@@ -423,89 +251,60 @@ namespace OpenWifi {
                }
                UInfo.userinfo.lastPasswordChange = std::time(nullptr);
                UInfo.userinfo.changePassword = false;
-                UInfo.userinfo.modified = std::time(nullptr);
-                StorageService()->UserDB().UpdateUserInfo(AUTHENTICATION_SYSTEM, UInfo.userinfo.id,UInfo.userinfo);
+                Storage()->UpdateUserInfo(AUTHENTICATION_SYSTEM, UInfo.userinfo.Id,UInfo.userinfo);
            }

            //  so we have a good password, password up date has taken place if need be, now generate the token.
            UInfo.userinfo.lastLogin=std::time(nullptr);
-            StorageService()->UserDB().SetLastLogin(UInfo.userinfo.id);
+            Storage()->SetLastLogin(UInfo.userinfo.Id);
            CreateToken(UserName, UInfo );
-
            return SUCCESS;
        }

-        return INVALID_CREDENTIALS;
-    }
-
-    UNAUTHORIZED_REASON AuthService::AuthorizeSub( std::string & UserName, const std::string & Password, const std::string & NewPassword, SecurityObjects::UserInfoAndPolicy & UInfo , bool & Expired )
-    {
-        std::lock_guard		Guard(Mutex_);
-
-        Poco::toLowerInPlace(UserName);
-
-        if(StorageService()->SubDB().GetUserByEmail(UserName,UInfo.userinfo)) {
-            if(UInfo.userinfo.waitingForEmailCheck) {
-                return USERNAME_PENDING_VERIFICATION;
-            }
-
-            if(!ValidateSubPasswordHash(UserName,Password,UInfo.userinfo.currentPassword)) {
-                return INVALID_CREDENTIALS;
-            }
-
-            if(UInfo.userinfo.changePassword && NewPassword.empty()) {
-                UInfo.webtoken.userMustChangePassword = true ;
-                return PASSWORD_CHANGE_REQUIRED;
-            }
-
-            if(!NewPassword.empty() && !ValidateSubPassword(NewPassword)) {
-                return PASSWORD_INVALID;
-            }
-
-            if(UInfo.userinfo.changePassword || !NewPassword.empty()) {
-                if(!SetSubPassword(NewPassword,UInfo.userinfo)) {
-                    UInfo.webtoken.errorCode = 1;
-                    return PASSWORD_ALREADY_USED;
-                }
-                UInfo.userinfo.lastPasswordChange = std::time(nullptr);
-                UInfo.userinfo.changePassword = false;
-                UInfo.userinfo.modified = std::time(nullptr);
-                StorageService()->SubDB().UpdateUserInfo(AUTHENTICATION_SYSTEM, UInfo.userinfo.id,UInfo.userinfo);
-            }
-
-            //  so we have a good password, password up date has taken place if need be, now generate the token.
-            UInfo.userinfo.lastLogin=std::time(nullptr);
-            StorageService()->SubDB().SetLastLogin(UInfo.userinfo.id);
-            CreateSubToken(UserName, UInfo );
-
+        if(((UserName == DefaultUserName_) && (DefaultPassword_== ComputePasswordHash(UserName,Password))) || !Secure_)
+        {
+            ACL.PortalLogin_ = ACL.Read_ = ACL.ReadWrite_ = ACL.ReadWriteCreate_ = ACL.Delete_ = true;
+            UInfo.webtoken.acl_template_ = ACL;
+            UInfo.userinfo.email = DefaultUserName_;
+            UInfo.userinfo.currentPassword = DefaultPassword_;
+            UInfo.userinfo.name = DefaultUserName_;
+            CreateToken(UserName, UInfo );
            return SUCCESS;
        }
-
        return INVALID_CREDENTIALS;
    }

-    bool AuthService::SendEmailToUser(const std::string &LinkId, std::string &Email, EMAIL_REASON Reason) {
+    std::string AuthService::ComputePasswordHash(const std::string &UserName, const std::string &Password) {
+        std::string UName = Poco::trim(Poco::toLower(UserName));
+        SHA2_.update(Password + UName);
+        return Utils::ToHex(SHA2_.digest());
+    }
+
+    bool AuthService::SendEmailToUser(std::string &Email, EMAIL_REASON Reason) {
        SecurityObjects::UserInfo   UInfo;

-        if(StorageService()->UserDB().GetUserByEmail(Email,UInfo)) {
+        if(Storage()->GetUserByEmail(Email,UInfo)) {
            switch (Reason) {
-
                case FORGOT_PASSWORD: {
                        MessageAttributes Attrs;
+
                        Attrs[RECIPIENT_EMAIL] = UInfo.email;
-                        Attrs[LOGO] = GetLogoAssetURI();
+                        Attrs[LOGO] = "logo.jpg";
                        Attrs[SUBJECT] = "Password reset link";
-                        Attrs[ACTION_LINK] = MicroService::instance().GetPublicAPIEndPoint() + "/actionLink?action=password_reset&id=" + LinkId ;
+                        Attrs[ACTION_LINK] =
+                                Daemon()->GetPublicAPIEndPoint() + "/actionLink?action=password_reset&id=" + UInfo.Id ;
                        SMTPMailerService()->SendMessage(UInfo.email, "password_reset.txt", Attrs);
                    }
                    break;

                case EMAIL_VERIFICATION: {
                        MessageAttributes Attrs;
+
                        Attrs[RECIPIENT_EMAIL] = UInfo.email;
-                        Attrs[LOGO] = GetLogoAssetURI();
+                        Attrs[LOGO] = "logo.jpg";
                        Attrs[SUBJECT] = "EMail Address Verification";
-                        Attrs[ACTION_LINK] = MicroService::instance().GetPublicAPIEndPoint() + "/actionLink?action=email_verification&id=" + LinkId ;
+                        Attrs[ACTION_LINK] =
+                                Daemon()->GetPublicAPIEndPoint() + "/actionLink?action=email_verification&id=" + UInfo.Id ;
                        SMTPMailerService()->SendMessage(UInfo.email, "email_verification.txt", Attrs);
                        UInfo.waitingForEmailCheck = true;
                    }
@@ -514,113 +313,26 @@ namespace OpenWifi {
                default:
                    break;
            }
-            return true;
-        }
-        return false;
-    }
-
-    bool AuthService::SendEmailToSubUser(const std::string &LinkId, std::string &Email, EMAIL_REASON Reason) {
-        SecurityObjects::UserInfo   UInfo;
-
-        if(StorageService()->SubDB().GetUserByEmail(Email,UInfo)) {
-            switch (Reason) {
-
-                case FORGOT_PASSWORD: {
-                    MessageAttributes Attrs;
-                    Attrs[RECIPIENT_EMAIL] = UInfo.email;
-                    Attrs[LOGO] = GetLogoAssetURI();
-                    Attrs[SUBJECT] = "Password reset link";
-                    Attrs[ACTION_LINK] = MicroService::instance().GetPublicAPIEndPoint() + "/actionLink?action=password_reset&id=" + LinkId ;
-                    SMTPMailerService()->SendMessage(UInfo.email, "password_reset.txt", Attrs);
-                }
-                break;
-
-                case EMAIL_VERIFICATION: {
-                    MessageAttributes Attrs;
-                    Attrs[RECIPIENT_EMAIL] = UInfo.email;
-                    Attrs[LOGO] = GetLogoAssetURI();
-                    Attrs[SUBJECT] = "EMail Address Verification";
-                    Attrs[ACTION_LINK] = MicroService::instance().GetPublicAPIEndPoint() + "/actionLink?action=email_verification&id=" + LinkId ;
-                    SMTPMailerService()->SendMessage(UInfo.email, "email_verification.txt", Attrs);
-                    UInfo.waitingForEmailCheck = true;
-                }
-                break;
-
-                default:
-                    break;
-            }
-            return true;
        }
        return false;
    }

    bool AuthService::VerifyEmail(SecurityObjects::UserInfo &UInfo) {
-        SecurityObjects::ActionLink A;
+        MessageAttributes Attrs;

-        A.action = OpenWifi::SecurityObjects::LinkActions::VERIFY_EMAIL;
-        A.userId = UInfo.email;
-        A.id = MicroService::CreateUUID();
-        A.created = std::time(nullptr);
-        A.expires = A.created + 24*60*60;
-        A.userAction = true;
-        StorageService()->ActionLinksDB().CreateAction(A);
+        Attrs[RECIPIENT_EMAIL] = UInfo.email;
+        Attrs[LOGO] = "logo.jpg";
+        Attrs[SUBJECT] = "EMail Address Verification";
+        Attrs[ACTION_LINK] =
+                Daemon()->GetPublicAPIEndPoint() + "/actionLink?action=email_verification&id=" + UInfo.Id ;
+        SMTPMailerService()->SendMessage(UInfo.email, "email_verification.txt", Attrs);
        UInfo.waitingForEmailCheck = true;
        return true;
    }

-    bool AuthService::VerifySubEmail(SecurityObjects::UserInfo &UInfo) {
-        SecurityObjects::ActionLink A;
-
-        A.action = OpenWifi::SecurityObjects::LinkActions::SUB_VERIFY_EMAIL;
-        A.userId = UInfo.email;
-        A.id = MicroService::CreateUUID();
-        A.created = std::time(nullptr);
-        A.expires = A.created + 24*60*60;
-        A.userAction = false;
-        StorageService()->ActionLinksDB().CreateAction(A);
-        UInfo.waitingForEmailCheck = true;
+    bool AuthService::IsValidToken(const std::string &Token, SecurityObjects::WebToken &WebToken, SecurityObjects::UserInfo &UserInfo) {
        return true;
    }

-    bool AuthService::IsValidToken(const std::string &Token, SecurityObjects::WebToken &WebToken, SecurityObjects::UserInfo &UserInfo, bool & Expired) {
-
-        std::lock_guard G(Mutex_);
-        Expired = false;
-
-        std::string TToken{Token}, UserId;
-        SecurityObjects::WebToken   WT;
-        uint64_t RevocationDate=0;
-        if(StorageService()->UserTokenDB().GetToken(TToken, WT, UserId, RevocationDate)) {
-            if(RevocationDate!=0)
-                return false;
-            Expired = (WT.created_ + WT.expires_in_) < std::time(nullptr);
-            if(StorageService()->UserDB().GetUserById(UserId,UserInfo)) {
-                WebToken = WT;
-                return true;
-            }
-            return false;
-        }
-        return IsValidSubToken(Token, WebToken, UserInfo, Expired);
-    }
-
-    bool AuthService::IsValidSubToken(const std::string &Token, SecurityObjects::WebToken &WebToken, SecurityObjects::UserInfo &UserInfo, bool & Expired) {
-        std::lock_guard G(Mutex_);
-        Expired = false;
-
-        std::string TToken{Token}, UserId;
-        SecurityObjects::WebToken   WT;
-        uint64_t RevocationDate=0;
-        if(StorageService()->SubTokenDB().GetToken(TToken, WT, UserId, RevocationDate)) {
-            if(RevocationDate!=0)
-                return false;
-            Expired = (WT.created_ + WT.expires_in_) < std::time(nullptr);
-            if(StorageService()->SubDB().GetUserById(UserId,UserInfo)) {
-                WebToken = WT;
-                return true;
-            }
-            return false;
-        }
-        return false;
-    }

 }  // end of namespace
--- a/src/AuthService.h
+++ b/src/AuthService.h
@@ -11,17 +11,15 @@

 #include <regex>

+#include "SubSystemServer.h"
+
 #include "Poco/JSON/Object.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "Poco/JWT/Signer.h"
 #include "Poco/SHA2Engine.h"
-#include "Poco/Crypto/DigestEngine.h"
-#include "Poco/HMACEngine.h"
-#include "Poco/ExpireLRUCache.h"

-#include "framework/MicroService.h"
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
+#include "RESTAPI_SecurityObjects.h"

 namespace OpenWifi{

@@ -36,6 +34,16 @@ namespace OpenWifi{
            CUSTOM
        };

+        enum AUTH_ERROR {
+            SUCCESS,
+            PASSWORD_CHANGE_REQUIRED,
+            INVALID_CREDENTIALS,
+            PASSWORD_ALREADY_USED,
+            USERNAME_PENDING_VERIFICATION,
+            PASSWORD_INVALID,
+            INTERNAL_ERROR
+        };
+
        enum EMAIL_REASON {
            FORGOT_PASSWORD,
            EMAIL_VERIFICATION
@@ -44,122 +52,57 @@ namespace OpenWifi{
        static ACCESS_TYPE IntToAccessType(int C);
        static int AccessTypeToInt(ACCESS_TYPE T);

-        static auto instance() {
-            static auto instance_ = new AuthService;
+        static AuthService *instance() {
+            if (instance_ == nullptr) {
+                instance_ = new AuthService;
+            }
            return instance_;
        }

        int Start() override;
        void Stop() override;

-        [[nodiscard]] bool IsAuthorized(Poco::Net::HTTPServerRequest & Request,std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, bool & Expired);
-        [[nodiscard]] UNAUTHORIZED_REASON Authorize( std::string & UserName, const std::string & Password, const std::string & NewPassword, SecurityObjects::UserInfoAndPolicy & UInfo, bool & Expired );
+        [[nodiscard]] bool IsAuthorized(Poco::Net::HTTPServerRequest & Request,std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo );
+        [[nodiscard]] AUTH_ERROR Authorize( std::string & UserName, const std::string & Password, const std::string & NewPassword, SecurityObjects::UserInfoAndPolicy & UInfo );
        void CreateToken(const std::string & UserName, SecurityObjects::UserInfoAndPolicy &UInfo);
+        [[nodiscard]] bool ValidateToken(const std::string & Token, std::string & SessionToken, SecurityObjects::UserInfoAndPolicy & UserInfo  );
        [[nodiscard]] bool SetPassword(const std::string &Password, SecurityObjects::UserInfo & UInfo);
        [[nodiscard]] const std:: string & PasswordValidationExpression() const { return PasswordValidationStr_;};
-        void Logout(const std::string &token, bool EraseFromCache=true);
-
-        [[nodiscard]] bool IsSubAuthorized(Poco::Net::HTTPServerRequest & Request,std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, bool & Expired);
-        [[nodiscard]] UNAUTHORIZED_REASON AuthorizeSub( std::string & UserName, const std::string & Password, const std::string & NewPassword, SecurityObjects::UserInfoAndPolicy & UInfo, bool & Expired );
-        void CreateSubToken(const std::string & UserName, SecurityObjects::UserInfoAndPolicy &UInfo);
-        [[nodiscard]] bool SetSubPassword(const std::string &Password, SecurityObjects::UserInfo & UInfo);
-        [[nodiscard]] const std:: string & SubPasswordValidationExpression() const { return PasswordValidationStr_;};
-        void SubLogout(const std::string &token, bool EraseFromCache=true);
-
-        void RemoveTokenSystemWide(const std::string &token);
+        void Logout(const std::string &token);

        bool ValidatePassword(const std::string &pwd);
-        bool ValidateSubPassword(const std::string &pwd);
-
-        [[nodiscard]] bool IsValidToken(const std::string &Token, SecurityObjects::WebToken &WebToken, SecurityObjects::UserInfo &UserInfo, bool & Expired);
-        [[nodiscard]] bool IsValidSubToken(const std::string &Token, SecurityObjects::WebToken &WebToken, SecurityObjects::UserInfo &UserInfo, bool & Expired);
-        [[nodiscard]] std::string GenerateTokenJWT(const std::string & UserName, ACCESS_TYPE Type);
-        [[nodiscard]] std::string GenerateTokenHMAC(const std::string & UserName, ACCESS_TYPE Type);
-
-        [[nodiscard]] std::string ComputeNewPasswordHash(const std::string &UserName, const std::string &Password);
-        [[nodiscard]] bool ValidatePasswordHash(const std::string & UserName, const std::string & Password, const std::string &StoredPassword);
-        [[nodiscard]] bool ValidateSubPasswordHash(const std::string & UserName, const std::string & Password, const std::string &StoredPassword);

+        [[nodiscard]] bool IsValidToken(const std::string &Token, SecurityObjects::WebToken &WebToken, SecurityObjects::UserInfo &UserInfo);
+        [[nodiscard]] bool IsValidAPIKEY(const Poco::Net::HTTPServerRequest &Request);
+        [[nodiscard]] std::string GenerateToken(const std::string & UserName, ACCESS_TYPE Type);
+        [[nodiscard]] bool ValidateToken(const std::string & Token, std::string & SessionToken, SecurityObjects::WebToken & UserInfo  );
+        [[nodiscard]] std::string ComputePasswordHash(const std::string &UserName, const std::string &Password);
        [[nodiscard]] bool UpdatePassword(const std::string &Admin, const std::string &UserName, const std::string & OldPassword, const std::string &NewPassword);
        [[nodiscard]] std::string ResetPassword(const std::string &Admin, const std::string &UserName);

-        [[nodiscard]] bool UpdateSubPassword(const std::string &Admin, const std::string &UserName, const std::string & OldPassword, const std::string &NewPassword);
-        [[nodiscard]] std::string ResetSubPassword(const std::string &Admin, const std::string &UserName);
-
        [[nodiscard]] static bool VerifyEmail(SecurityObjects::UserInfo &UInfo);
-        [[nodiscard]] static bool VerifySubEmail(SecurityObjects::UserInfo &UInfo);
-
-        [[nodiscard]] static bool SendEmailToUser(const std::string &LinkId, std::string &Email, EMAIL_REASON Reason);
-        [[nodiscard]] static bool SendEmailToSubUser(const std::string &LinkId, std::string &Email, EMAIL_REASON Reason);
-        [[nodiscard]] bool RequiresMFA(const SecurityObjects::UserInfoAndPolicy &UInfo);
-
-        bool DeleteUserFromCache(const std::string &UserName);
-        bool DeleteSubUserFromCache(const std::string &UserName);
-        void RevokeToken(std::string & Token);
-        void RevokeSubToken(std::string & Token);
-
-        [[nodiscard]] static inline const std::string GetLogoAssetURI() {
-            return MicroService::instance().PublicEndPoint() + "/wwwassets/the_logo.png";
-        }
-
-        [[nodiscard]] static inline const std::string GetLogoAssetFileName() {
-            return MicroService::instance().WWWAssetsDir() + "/the_logo.png";
-        }
-
-        inline const std::string & GetPasswordPolicy() const { return PasswordPolicy_; }
-        inline const std::string & GetAccessPolicy() const { return AccessPolicy_; }
-
-        inline const std::string & GetSubPasswordPolicy() const { return SubPasswordPolicy_; }
-        inline const std::string & GetSubAccessPolicy() const { return SubAccessPolicy_; }
+        [[nodiscard]] static bool SendEmailToUser(std::string &Email, EMAIL_REASON Reason);

    private:
+		static AuthService *instance_;
+		bool    			Secure_ = false ;
+		std::string     	DefaultUserName_;
+		std::string			DefaultPassword_;
+		std::string     	Mechanism_;
 		Poco::JWT::Signer	Signer_;
 		Poco::SHA2Engine	SHA2_;
-
-		std::string         AccessPolicy_;
-		std::string         PasswordPolicy_;
-		std::string         SubAccessPolicy_;
-		std::string         SubPasswordPolicy_;
-		std::string         PasswordValidationStr_;
-        std::string         SubPasswordValidationStr_;
-        std::regex          PasswordValidation_;
-        std::regex          SubPasswordValidation_;
-
-        uint64_t            TokenAging_ = 30 * 24 * 60 * 60;
+		SecurityObjects::UserInfoCache UserCache_;
+        std::string          PasswordValidationStr_;
+		std::regex          PasswordValidation_;
+		uint64_t            TokenAging_ = 30 * 24 * 60 * 60;
        uint64_t            HowManyOldPassword_=5;
-
-        class SHA256Engine : public Poco::Crypto::DigestEngine
-                {
-                public:
-                    enum
-                    {
-                        BLOCK_SIZE = 64,
-                        DIGEST_SIZE = 32
-                    };
-
-                    SHA256Engine()
-                    : DigestEngine("SHA256")
-                    {
-                    }
-
-                };
-
-        Poco::HMACEngine<SHA256Engine> HMAC_{"tipopenwifi"};
-
        AuthService() noexcept:
            SubSystemServer("Authentication", "AUTH-SVR", "authentication")
        {
        }
    };

-    inline auto AuthService() { return AuthService::instance(); }
-
-    [[nodiscard]] inline bool AuthServiceIsAuthorized(Poco::Net::HTTPServerRequest & Request,std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo , bool & Expired, bool Sub ) {
-        if(Sub)
-            return AuthService()->IsSubAuthorized(Request, SessionToken, UInfo, Expired );
-        else
-            return AuthService()->IsAuthorized(Request, SessionToken, UInfo, Expired );
-    }
+    inline AuthService * AuthService() { return AuthService::instance(); }

 } // end of namespace

--- a/src/Daemon.cpp
+++ b/src/Daemon.cpp
@@ -19,19 +19,13 @@

 #include "Daemon.h"

-#include <aws/core/Aws.h>
-#include <aws/s3/model/CreateBucketRequest.h>
-#include <aws/s3/model/PutObjectRequest.h>
-#include <aws/s3/model/AccessControlPolicy.h>
-#include <aws/s3/model/PutBucketAclRequest.h>
-#include <aws/s3/model/GetBucketAclRequest.h>
-
+#include "ALBHealthCheckServer.h"
+#include "KafkaManager.h"
 #include "StorageService.h"
+#include "RESTAPI_server.h"
 #include "SMTPMailerService.h"
+#include "RESTAPI_InternalServer.h"
 #include "AuthService.h"
-#include "SMSSender.h"
-#include "ActionLinkManager.h"
-#include "TotpCache.h"

 namespace OpenWifi {
    class Daemon *Daemon::instance_ = nullptr;
@@ -43,47 +37,32 @@ namespace OpenWifi {
                                   vDAEMON_CONFIG_ENV_VAR,
                                   vDAEMON_APP_NAME,
                                   vDAEMON_BUS_TIMER,
-                                   SubSystemVec{
-                                           StorageService(),
-                                           SMSSender(),
-                                           ActionLinkManager(),
+                                   Types::SubSystemVec{
+                                           Storage(),
+                                           RESTAPI_Server(),
+                                           RESTAPI_InternalServer(),
                                           SMTPMailerService(),
-                                           RESTAPI_RateLimiter(),
-                                           TotpCache(),
                                           AuthService()
                                   });
        }
        return instance_;
    }

-    void Daemon::initialize() {
-        AssetDir_ = MicroService::instance().ConfigPath("openwifi.restapi.wwwassets");
-    }
-
-    void MicroServicePostInitialization() {
-        Daemon()->initialize();
+    void Daemon::initialize(Poco::Util::Application &self) {
+        MicroService::initialize(*this);
    }
 }

 int main(int argc, char **argv) {
    try {
-        SSL_library_init();
-        Aws::SDKOptions AwsOptions;
-        AwsOptions.memoryManagementOptions.memoryManager = nullptr;
-        AwsOptions.cryptoOptions.initAndCleanupOpenSSL = false;
-        AwsOptions.httpOptions.initAndCleanupCurl = true;
+        auto App = OpenWifi::Daemon::instance();
+        auto ExitCode =  App->run(argc, argv);
+        delete App;

-        Aws::InitAPI(AwsOptions);
-
-        int ExitCode=0;
-        {
-            auto App = OpenWifi::Daemon::instance();
-            ExitCode =  App->run(argc, argv);
-        }
-        ShutdownAPI(AwsOptions);
        return ExitCode;
+
    } catch (Poco::Exception &exc) {
-        std::cout << exc.displayText() << std::endl;
+        std::cerr << exc.displayText() << std::endl;
        return Poco::Util::Application::EXIT_SOFTWARE;
    }
 }
--- a/src/Daemon.h
+++ b/src/Daemon.h
@@ -20,32 +20,32 @@
 #include "Poco/Crypto/CipherFactory.h"
 #include "Poco/Crypto/Cipher.h"

-#include "framework/MicroService.h"
+
+#include "OpenWifiTypes.h"
+#include "MicroService.h"

 namespace OpenWifi {

-    static const char * vDAEMON_PROPERTIES_FILENAME = "owsec.properties";
-    static const char * vDAEMON_ROOT_ENV_VAR = "OWSEC_ROOT";
-    static const char * vDAEMON_CONFIG_ENV_VAR = "OWSEC_CONFIG";
+    static const char * vDAEMON_PROPERTIES_FILENAME = "ucentralsec.properties";
+    static const char * vDAEMON_ROOT_ENV_VAR = "UCENTRALSEC_ROOT";
+    static const char * vDAEMON_CONFIG_ENV_VAR = "UCENTRALSEC_CONFIG";
    static const char * vDAEMON_APP_NAME = uSERVICE_SECURITY.c_str();
    static const uint64_t vDAEMON_BUS_TIMER = 5000;

    class Daemon : public MicroService {
    public:
-        explicit Daemon(const std::string & PropFile,
-                        const std::string & RootEnv,
-                        const std::string & ConfigEnv,
-                        const std::string & AppName,
+        explicit Daemon(std::string PropFile,
+                        std::string RootEnv,
+                        std::string ConfigEnv,
+                        std::string AppName,
                        uint64_t BusTimer,
-                        const SubSystemVec & SubSystems) :
+                        Types::SubSystemVec SubSystems) :
                MicroService( PropFile, RootEnv, ConfigEnv, AppName, BusTimer, SubSystems) {};

-        void initialize();
+        void initialize(Poco::Util::Application &self);
        static Daemon *instance();
-        inline const std::string & AssetDir() { return AssetDir_; }
    private:
-        static Daemon 		*instance_;
-        std::string         AssetDir_;
+        static Daemon 				*instance_;
    };

    inline Daemon * Daemon() { return Daemon::instance(); }
--- a/src/KafkaManager.cpp
+++ b/src/KafkaManager.cpp
@@ -0,0 +1,221 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+#include <thread>
+
+#include "KafkaManager.h"
+
+#include "Daemon.h"
+#include "Utils.h"
+
+namespace OpenWifi {
+
+	class KafkaManager *KafkaManager::instance_ = nullptr;
+
+	KafkaManager::KafkaManager() noexcept:
+		SubSystemServer("KafkaManager", "KAFKA-SVR", "ucentral.kafka")
+	{
+	}
+
+	void KafkaManager::initialize(Poco::Util::Application & self) {
+		SubSystemServer::initialize(self);
+		KafkaEnabled_ = Daemon()->ConfigGetBool("ucentral.kafka.enable",false);
+	}
+
+#ifdef SMALL_BUILD
+
+	int KafkaManager::Start() {
+		return 0;
+	}
+	void KafkaManager::Stop() {
+	}
+
+#else
+
+	int KafkaManager::Start() {
+		if(!KafkaEnabled_)
+			return 0;
+		ProducerThr_ = std::make_unique<std::thread>([this]() { this->ProducerThr(); });
+		ConsumerThr_ = std::make_unique<std::thread>([this]() { this->ConsumerThr(); });
+		return 0;
+	}
+
+	void KafkaManager::Stop() {
+		if(KafkaEnabled_) {
+			ProducerRunning_ = ConsumerRunning_ = false;
+			ProducerThr_->join();
+			ConsumerThr_->join();
+			return;
+		}
+	}
+
+	void KafkaManager::ProducerThr() {
+		cppkafka::Configuration Config({
+										   { "client.id", Daemon()->ConfigGetString("ucentral.kafka.client.id") },
+										   { "metadata.broker.list", Daemon()->ConfigGetString("ucentral.kafka.brokerlist") }
+									   });
+		SystemInfoWrapper_ = 	R"lit({ "system" : { "id" : )lit" +
+								  	std::to_string(Daemon()->ID()) +
+									R"lit( , "host" : ")lit" + Daemon()->PrivateEndPoint() +
+									R"lit(" } , "payload" : )lit" ;
+		cppkafka::Producer	Producer(Config);
+		ProducerRunning_ = true;
+		while(ProducerRunning_) {
+			std::this_thread::sleep_for(std::chrono::milliseconds(200));
+			try
+			{
+				SubMutexGuard G(ProducerMutex_);
+				auto Num=0;
+				while (!Queue_.empty()) {
+					const auto M = Queue_.front();
+					Producer.produce(
+						cppkafka::MessageBuilder(M.Topic).key(M.Key).payload(M.PayLoad));
+					Queue_.pop();
+					Num++;
+				}
+				if(Num)
+					Producer.flush();
+			} catch (const cppkafka::HandleException &E ) {
+				Logger_.warning(Poco::format("Caught a Kafka exception (producer): %s",std::string{E.what()}));
+			} catch (const Poco::Exception &E) {
+				Logger_.log(E);
+			}
+		}
+	}
+
+	void KafkaManager::PartitionAssignment(const cppkafka::TopicPartitionList& partitions) {
+		Logger_.information(Poco::format("Partition assigned: %Lu...",(uint64_t )partitions.front().get_partition()));
+	}
+	void KafkaManager::PartitionRevocation(const cppkafka::TopicPartitionList& partitions) {
+		Logger_.information(Poco::format("Partition revocation: %Lu...",(uint64_t )partitions.front().get_partition()));
+	}
+
+	void KafkaManager::ConsumerThr() {
+		cppkafka::Configuration Config({
+										   { "client.id", Daemon()->ConfigGetString("ucentral.kafka.client.id") },
+										   { "metadata.broker.list", Daemon()->ConfigGetString("ucentral.kafka.brokerlist") },
+										   { "group.id", Daemon()->ConfigGetString("ucentral.kafka.group.id") },
+										   { "enable.auto.commit", Daemon()->ConfigGetBool("ucentral.kafka.auto.commit",false) },
+										   { "auto.offset.reset", "latest" } ,
+										   { "enable.partition.eof", false }
+									   });
+
+		cppkafka::TopicConfiguration topic_config = {
+			{ "auto.offset.reset", "smallest" }
+		};
+
+		// Now configure it to be the default topic config
+		Config.set_default_topic_configuration(topic_config);
+
+		cppkafka::Consumer Consumer(Config);
+		Consumer.set_assignment_callback([this](cppkafka::TopicPartitionList& partitions) {
+			if(!partitions.empty()) {
+				Logger_.information(Poco::format("Partition assigned: %Lu...",
+												 (uint64_t)partitions.front().get_partition()));
+			}
+		});
+		Consumer.set_revocation_callback([this](const cppkafka::TopicPartitionList& partitions) {
+			if(!partitions.empty()) {
+				Logger_.information(Poco::format("Partition revocation: %Lu...",
+												 (uint64_t)partitions.front().get_partition()));
+			}
+		});
+
+        bool AutoCommit = Daemon()->ConfigGetBool("ucentral.kafka.auto.commit",false);
+        auto BatchSize = Daemon()->ConfigGetInt("ucentral.kafka.consumer.batchsize",20);
+
+        Types::StringVec    Topics;
+		for(const auto &i:Notifiers_)
+			Topics.push_back(i.first);
+
+		Consumer.subscribe(Topics);
+
+		ConsumerRunning_ = true;
+		while(ConsumerRunning_) {
+			try {
+				std::vector<cppkafka::Message> MsgVec = Consumer.poll_batch(BatchSize, std::chrono::milliseconds(200));
+				for(auto const &Msg:MsgVec) {
+                    if (!Msg)
+                        continue;
+                    if (Msg.get_error()) {
+                        if (!Msg.is_eof()) {
+                            Logger_.error(Poco::format("Error: %s", Msg.get_error().to_string()));
+                        }if(!AutoCommit)
+                            Consumer.async_commit(Msg);
+                        continue;
+                    }
+                    SubMutexGuard G(ConsumerMutex_);
+                    auto It = Notifiers_.find(Msg.get_topic());
+                    if (It != Notifiers_.end()) {
+                        Types::TopicNotifyFunctionList &FL = It->second;
+                        std::string Key{Msg.get_key()};
+                        std::string Payload{Msg.get_payload()};
+                        for (auto &F : FL) {
+                            std::thread T(F.first, Key, Payload);
+                            T.detach();
+                        }
+                    }
+                    if (!AutoCommit)
+                        Consumer.async_commit(Msg);
+                }
+			} catch (const cppkafka::HandleException &E) {
+				Logger_.warning(Poco::format("Caught a Kafka exception (consumer): %s",std::string{E.what()}));
+			} catch (const Poco::Exception &E) {
+				Logger_.log(E);
+			}
+		}
+	}
+
+	std::string KafkaManager::WrapSystemId(const std::string & PayLoad) {
+		return std::move( SystemInfoWrapper_ + PayLoad + "}");
+	}
+
+	void KafkaManager::PostMessage(std::string topic, std::string key, std::string PayLoad, bool WrapMessage ) {
+		if(KafkaEnabled_) {
+			SubMutexGuard G(Mutex_);
+			KMessage M{
+				.Topic = topic,
+				.Key = key,
+				.PayLoad = WrapMessage ? WrapSystemId(PayLoad) : PayLoad };
+			Queue_.push(M);
+		}
+	}
+
+	int KafkaManager::RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F) {
+		if(KafkaEnabled_) {
+			SubMutexGuard G(Mutex_);
+			auto It = Notifiers_.find(Topic);
+			if(It == Notifiers_.end()) {
+				Types::TopicNotifyFunctionList L;
+				L.emplace(L.end(),std::make_pair(F,FunctionId_));
+				Notifiers_[Topic] = std::move(L);
+			} else {
+				It->second.emplace(It->second.end(),std::make_pair(F,FunctionId_));
+			}
+			return FunctionId_++;
+		} else {
+			return 0;
+		}
+	}
+
+	void KafkaManager::UnregisterTopicWatcher(const std::string &Topic, int Id) {
+		if(KafkaEnabled_) {
+			SubMutexGuard G(Mutex_);
+			auto It = Notifiers_.find(Topic);
+			if(It != Notifiers_.end()) {
+				Types::TopicNotifyFunctionList & L = It->second;
+				for(auto it=L.begin(); it!=L.end(); it++)
+					if(it->second == Id) {
+						L.erase(it);
+						break;
+					}
+			}
+		}
+	}
+
+#endif
+} // namespace
--- a/src/KafkaManager.h
+++ b/src/KafkaManager.h
@@ -0,0 +1,74 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#ifndef UCENTRALGW_KAFKAMANAGER_H
+#define UCENTRALGW_KAFKAMANAGER_H
+
+#include <queue>
+#include <thread>
+
+#include "SubSystemServer.h"
+#include "OpenWifiTypes.h"
+
+#include "cppkafka/cppkafka.h"
+
+namespace OpenWifi {
+
+	class KafkaManager : public SubSystemServer {
+	  public:
+
+		struct KMessage {
+					std::string Topic,
+								Key,
+								PayLoad;
+		};
+
+		void initialize(Poco::Util::Application & self) override;
+		static KafkaManager *instance() {
+			if(instance_== nullptr)
+				instance_ = new KafkaManager;
+			return instance_;
+		}
+
+		void ProducerThr();
+		void ConsumerThr();
+
+		int Start() override;
+		void Stop() override;
+
+		void PostMessage(std::string topic, std::string key, std::string payload, bool WrapMessage = true);
+		[[nodiscard]] std::string WrapSystemId(const std::string & PayLoad);
+		[[nodiscard]] bool Enabled() { return KafkaEnabled_; }
+		int RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction & F);
+		void UnregisterTopicWatcher(const std::string &Topic, int FunctionId);
+		void WakeUp();
+		void PartitionAssignment(const cppkafka::TopicPartitionList& partitions);
+		void PartitionRevocation(const cppkafka::TopicPartitionList& partitions);
+
+	  private:
+		static KafkaManager 			*instance_;
+		SubMutex 						ProducerMutex_;
+		SubMutex 						ConsumerMutex_;
+		bool 							KafkaEnabled_ = false;
+		std::atomic_bool 				ProducerRunning_ = false;
+		std::atomic_bool 				ConsumerRunning_ = false;
+		std::queue<KMessage>			Queue_;
+		std::string 					SystemInfoWrapper_;
+		std::unique_ptr<std::thread>	ConsumerThr_;
+		std::unique_ptr<std::thread>	ProducerThr_;
+		int                       		FunctionId_=1;
+		Types::NotifyTable        		Notifiers_;
+		std::unique_ptr<cppkafka::Configuration>    Config_;
+
+		KafkaManager() noexcept;
+	};
+
+	inline KafkaManager * KafkaManager() { return KafkaManager::instance(); }
+}	// NameSpace
+
+#endif // UCENTRALGW_KAFKAMANAGER_H
--- a/src/framework/KafkaTopics.h
+++ b/src/framework/KafkaTopics.h
@@ -1,12 +1,9 @@
 //
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
+// Created by stephane bourque on 2021-06-07.
 //

-#pragma once
+#ifndef UCENTRALGW_KAFKA_TOPICS_H
+#define UCENTRALGW_KAFKA_TOPICS_H

 namespace OpenWifi::KafkaTopics {
 	static const std::string HEALTHCHECK{"healthcheck"};
@@ -17,7 +14,6 @@ namespace OpenWifi::KafkaTopics {
 	static const std::string COMMAND{"command"};
 	static const std::string SERVICE_EVENTS{"service_events"};
 	static const std::string DEVICE_EVENT_QUEUE{"device_event_queue"};
-	static const std::string DEVICE_TELEMETRY{"device_telemetry"};

 	namespace ServiceEvents {
 		static const std::string EVENT_JOIN{"join"};
@@ -38,3 +34,4 @@ namespace OpenWifi::KafkaTopics {
 	}
 }

+#endif // UCENTRALGW_KAFKA_TOPICS_H
--- a/src/MFAServer.cpp
+++ b/src/MFAServer.cpp
@@ -1,119 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-11.
-//
-
-#include "MFAServer.h"
-#include "SMSSender.h"
-#include "SMTPMailerService.h"
-#include "framework/MicroService.h"
-#include "AuthService.h"
-#include "TotpCache.h"
-
-namespace OpenWifi {
-
-    int MFAServer::Start() {
-        return 0;
-    }
-
-    void MFAServer::Stop() {
-    }
-
-    bool MFAServer::StartMFAChallenge(const SecurityObjects::UserInfoAndPolicy &UInfo, Poco::JSON::Object &ChallengeStart) {
-        std::lock_guard G(Mutex_);
-
-        CleanCache();
-
-        if(!MethodEnabled(UInfo.userinfo.userTypeProprietaryInfo.mfa.method))
-            return false;
-
-        std::string Challenge = MakeChallenge();
-        std::string uuid = MicroService::CreateUUID();
-        uint64_t Created = std::time(nullptr);
-
-        ChallengeStart.set("uuid",uuid);
-        ChallengeStart.set("created", Created);
-        ChallengeStart.set("question", "mfa challenge");
-        ChallengeStart.set("method", UInfo.userinfo.userTypeProprietaryInfo.mfa.method);
-
-        Cache_[uuid] = MFACacheEntry{ .UInfo = UInfo, .Answer=Challenge, .Created=Created, .Method=UInfo.userinfo.userTypeProprietaryInfo.mfa.method };
-        return SendChallenge(UInfo, UInfo.userinfo.userTypeProprietaryInfo.mfa.method, Challenge);
-    }
-
-    bool MFAServer::SendChallenge(const SecurityObjects::UserInfoAndPolicy &UInfo, const std::string &Method, const std::string &Challenge) {
-        if(Method==MFAMETHODS::SMS && SMSSender()->Enabled() && !UInfo.userinfo.userTypeProprietaryInfo.mobiles.empty()) {
-            std::string Message = "This is your login code: " + Challenge + " Please enter this in your login screen.";
-            return SMSSender()->Send(UInfo.userinfo.userTypeProprietaryInfo.mobiles[0].number, Message);
-        } else if(Method==MFAMETHODS::EMAIL && SMTPMailerService()->Enabled() && !UInfo.userinfo.email.empty()) {
-            MessageAttributes Attrs;
-            Attrs[RECIPIENT_EMAIL] = UInfo.userinfo.email;
-            Attrs[LOGO] = AuthService::GetLogoAssetURI();
-            Attrs[SUBJECT] = "Login validation code";
-            Attrs[CHALLENGE_CODE] = Challenge;
-            return SMTPMailerService()->SendMessage(UInfo.userinfo.email, "verification_code.txt", Attrs);
-        } else if(Method==MFAMETHODS::AUTHENTICATOR && !UInfo.userinfo.userTypeProprietaryInfo.authenticatorSecret.empty()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    bool MFAServer::ResendCode(const std::string &uuid) {
-        std::lock_guard G(Mutex_);
-        auto Hint = Cache_.find(uuid);
-        if(Hint==Cache_.end())
-            return false;
-        return SendChallenge(Hint->second.UInfo, Hint->second.Method, Hint->second.Answer);
-    }
-
-    bool MFAServer::CompleteMFAChallenge(Poco::JSON::Object::Ptr &ChallengeResponse, SecurityObjects::UserInfoAndPolicy &UInfo) {
-        std::lock_guard G(Mutex_);
-
-        if(!ChallengeResponse->has("uuid") || !ChallengeResponse->has("answer"))
-            return false;
-
-        auto uuid = ChallengeResponse->get("uuid").toString();
-        auto Hint = Cache_.find(uuid);
-        if(Hint == end(Cache_)) {
-            return false;
-        }
-
-        auto answer = ChallengeResponse->get("answer").toString();
-        std::string Expecting;
-        if(Hint->second.Method==MFAMETHODS::AUTHENTICATOR) {
-            if(!TotpCache()->ValidateCode(Hint->second.UInfo.userinfo.userTypeProprietaryInfo.authenticatorSecret,answer, Expecting)) {
-                return false;
-            }
-        } else if(Hint->second.Answer!=answer) {
-            return false;
-        }
-
-        UInfo = Hint->second.UInfo;
-        Cache_.erase(Hint);
-        return true;
-    }
-
-    bool MFAServer::MethodEnabled(const std::string &Method) {
-        if(Method==MFAMETHODS::SMS)
-            return SMSSender()->Enabled();
-
-        if(Method==MFAMETHODS::EMAIL)
-            return SMTPMailerService()->Enabled();
-
-        if(Method==MFAMETHODS::AUTHENTICATOR)
-            return true;
-
-        return false;
-    }
-
-    void MFAServer::CleanCache() {
-        // it is assumed that you have locked Cache_ at this point.
-        uint64_t Now = std::time(nullptr);
-        for(auto i=begin(Cache_);i!=end(Cache_);) {
-            if((Now-i->second.Created)>300) {
-                i = Cache_.erase(i);
-            } else {
-                ++i;
-            }
-        }
-    }
-}
--- a/src/MFAServer.h
+++ b/src/MFAServer.h
@@ -1,68 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-11.
-//
-
-#ifndef OWSEC_MFASERVER_H
-#define OWSEC_MFASERVER_H
-
-#include "framework/MicroService.h"
-#include "Poco/JSON/Object.h"
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
-
-namespace OpenWifi {
-
-    namespace MFAMETHODS {
-        inline const static std::string SMS{"sms"};
-        inline const static std::string EMAIL{"email"};
-        inline const static std::string AUTHENTICATOR{"authenticator"};
-        inline const static std::vector<std::string> Methods{ SMS, EMAIL, AUTHENTICATOR };
-        inline bool Validate(const std::string &M) {
-            return std::find(cbegin(Methods), cend(Methods),M)!=Methods.end();
-        }
-    }
-
-    struct MFACacheEntry {
-        SecurityObjects::UserInfoAndPolicy  UInfo;
-        std::string                         Answer;
-        uint64_t                            Created;
-        std::string                         Method;
-    };
-
-
-    typedef std::map<std::string,MFACacheEntry>     MFAChallengeCache;
-
-    class MFAServer : public SubSystemServer{
-    public:
-        int Start() override;
-        void Stop() override;
-        static auto instance() {
-            static auto instance_ = new MFAServer;
-            return instance_;
-        }
-
-        bool StartMFAChallenge(const SecurityObjects::UserInfoAndPolicy &UInfo, Poco::JSON::Object &Challenge);
-        bool CompleteMFAChallenge(Poco::JSON::Object::Ptr &ChallengeResponse, SecurityObjects::UserInfoAndPolicy &UInfo);
-        static bool MethodEnabled(const std::string &Method);
-        bool ResendCode(const std::string &uuid);
-        static bool SendChallenge(const SecurityObjects::UserInfoAndPolicy &UInfo, const std::string &Method, const std::string &Challenge);
-
-        static inline std::string MakeChallenge() {
-            char buf[16];
-            std::sprintf(buf,"%06llu",MicroService::instance().Random(1,999999));
-            return buf;
-        }
-
-    private:
-        MFAChallengeCache   Cache_;
-        MFAServer() noexcept:
-            SubSystemServer("MFServer", "MFA-SVR", "mfa")
-            {
-            }
-
-        void CleanCache();
-    };
-
-    inline auto MFAServer() { return MFAServer::instance(); }
-}
-
-#endif //OWSEC_MFASERVER_H
--- a/src/MicroService.cpp
+++ b/src/MicroService.cpp
@@ -0,0 +1,501 @@
+//
+// Created by stephane bourque on 2021-06-22.
+//
+#include <cstdlib>
+#include <boost/algorithm/string.hpp>
+
+#include "Poco/Util/Application.h"
+#include "Poco/Util/ServerApplication.h"
+#include "Poco/Util/Option.h"
+#include "Poco/Util/OptionSet.h"
+#include "Poco/Util/HelpFormatter.h"
+#include "Poco/Environment.h"
+#include "Poco/Net/HTTPSStreamFactory.h"
+#include "Poco/Net/HTTPStreamFactory.h"
+#include "Poco/Net/FTPSStreamFactory.h"
+#include "Poco/Net/FTPStreamFactory.h"
+#include "Poco/Path.h"
+#include "Poco/File.h"
+#include "Poco/String.h"
+#include "Poco/JSON/Object.h"
+#include "Poco/JSON/Parser.h"
+#include "Poco/JSON/Stringifier.h"
+
+#include "ALBHealthCheckServer.h"
+#ifndef SMALL_BUILD
+#include "KafkaManager.h"
+#endif
+#include "Kafka_topics.h"
+
+#include "MicroService.h"
+#include "Utils.h"
+
+#ifndef TIP_SECURITY_SERVICE
+#include "AuthClient.h"
+#endif
+
+namespace OpenWifi {
+
+	void MyErrorHandler::exception(const Poco::Exception & E) {
+		Poco::Thread * CurrentThread = Poco::Thread::current();
+		App_.logger().log(E);
+		App_.logger().error(Poco::format("Exception occurred in %s",CurrentThread->getName()));
+	}
+
+	void MyErrorHandler::exception(const std::exception & E) {
+		Poco::Thread * CurrentThread = Poco::Thread::current();
+		App_.logger().warning(Poco::format("std::exception on %s",CurrentThread->getName()));
+	}
+
+	void MyErrorHandler::exception() {
+		Poco::Thread * CurrentThread = Poco::Thread::current();
+		App_.logger().warning(Poco::format("exception on %s",CurrentThread->getName()));
+	}
+
+	void MicroService::Exit(int Reason) {
+		std::exit(Reason);
+	}
+
+	void MicroService::BusMessageReceived(const std::string &Key, const std::string & Message) {
+		SubMutexGuard G(InfraMutex_);
+		try {
+			Poco::JSON::Parser P;
+			auto Object = P.parse(Message).extract<Poco::JSON::Object::Ptr>();
+			if (Object->has(KafkaTopics::ServiceEvents::Fields::ID) &&
+				Object->has(KafkaTopics::ServiceEvents::Fields::EVENT)) {
+				uint64_t 	ID = Object->get(KafkaTopics::ServiceEvents::Fields::ID);
+				auto 		Event = Object->get(KafkaTopics::ServiceEvents::Fields::EVENT).toString();
+				if (ID != ID_) {
+					if(	Event==KafkaTopics::ServiceEvents::EVENT_JOIN ||
+						Event==KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE ||
+						Event==KafkaTopics::ServiceEvents::EVENT_LEAVE ) {
+						if(	Object->has(KafkaTopics::ServiceEvents::Fields::TYPE) &&
+						   	Object->has(KafkaTopics::ServiceEvents::Fields::PUBLIC) &&
+							Object->has(KafkaTopics::ServiceEvents::Fields::PRIVATE) &&
+						   	Object->has(KafkaTopics::ServiceEvents::Fields::VRSN) &&
+							Object->has(KafkaTopics::ServiceEvents::Fields::KEY)) {
+
+							if (Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE && Services_.find(ID) != Services_.end()) {
+								Services_[ID].LastUpdate = std::time(nullptr);
+							} else if (Event == KafkaTopics::ServiceEvents::EVENT_LEAVE) {
+								Services_.erase(ID);
+								logger().information(Poco::format("Service %s ID=%Lu leaving system.",Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString(),ID));
+							} else if (Event == KafkaTopics::ServiceEvents::EVENT_JOIN || Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE) {
+								logger().information(Poco::format("Service %s ID=%Lu joining system.",Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString(),ID));
+								Services_[ID] = MicroServiceMeta{
+									.Id = ID,
+									.Type = Poco::toLower(Object->get(KafkaTopics::ServiceEvents::Fields::TYPE).toString()),
+									.PrivateEndPoint = Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString(),
+									.PublicEndPoint = Object->get(KafkaTopics::ServiceEvents::Fields::PUBLIC).toString(),
+									.AccessKey = Object->get(KafkaTopics::ServiceEvents::Fields::KEY).toString(),
+									.Version = Object->get(KafkaTopics::ServiceEvents::Fields::VRSN).toString(),
+									.LastUpdate = (uint64_t)std::time(nullptr)};
+								for (const auto &[Id, Svc] : Services_) {
+									logger().information(Poco::format("ID: %Lu Type: %s EndPoint: %s",Id,Svc.Type,Svc.PrivateEndPoint));
+								}
+							}
+						} else {
+							logger().error(Poco::format("KAFKA-MSG: invalid event '%s', missing a field.",Event));
+						}
+					} else if (Event==KafkaTopics::ServiceEvents::EVENT_REMOVE_TOKEN) {
+						if(Object->has(KafkaTopics::ServiceEvents::Fields::TOKEN)) {
+#ifndef TIP_SECURITY_SERVICE
+							AuthClient()->RemovedCachedToken(Object->get(KafkaTopics::ServiceEvents::Fields::TOKEN).toString());
+#endif
+						} else {
+							logger().error(Poco::format("KAFKA-MSG: invalid event '%s', missing token",Event));
+						}
+					} else {
+						logger().error(Poco::format("Unknown Event: %s Source: %Lu", Event, ID));
+					}
+				}
+			} else {
+				logger().error("Bad bus message.");
+			}
+
+			auto i=Services_.begin();
+			auto Now = (uint64_t )std::time(nullptr);
+			for(;i!=Services_.end();) {
+			    if((Now - i->second.LastUpdate)>60) {
+			        i = Services_.erase(i);
+			    } else
+			        ++i;
+			}
+
+		} catch (const Poco::Exception &E) {
+			logger().log(E);
+		}
+	}
+
+	MicroServiceMetaVec MicroService::GetServices(const std::string & Type) {
+		SubMutexGuard G(InfraMutex_);
+
+		auto T = Poco::toLower(Type);
+		MicroServiceMetaVec	Res;
+		for(const auto &[Id,ServiceRec]:Services_) {
+			if(ServiceRec.Type==T)
+				Res.push_back(ServiceRec);
+		}
+		return Res;
+	}
+
+	MicroServiceMetaVec MicroService::GetServices() {
+		SubMutexGuard G(InfraMutex_);
+
+		MicroServiceMetaVec	Res;
+		for(const auto &[Id,ServiceRec]:Services_) {
+			Res.push_back(ServiceRec);
+		}
+		return Res;
+	}
+
+	void MicroService::initialize(Poco::Util::Application &self) {
+		// add the default services
+		SubSystems_.push_back(KafkaManager());
+		SubSystems_.push_back(ALBHealthCheckServer());
+
+		Poco::Net::initializeSSL();
+		Poco::Net::HTTPStreamFactory::registerFactory();
+		Poco::Net::HTTPSStreamFactory::registerFactory();
+		Poco::Net::FTPStreamFactory::registerFactory();
+		Poco::Net::FTPSStreamFactory::registerFactory();
+		std::string Location = Poco::Environment::get(DAEMON_CONFIG_ENV_VAR,".");
+		Poco::Path ConfigFile;
+
+		ConfigFile = ConfigFileName_.empty() ? Location + "/" + DAEMON_PROPERTIES_FILENAME : ConfigFileName_;
+
+		if(!ConfigFile.isFile())
+		{
+			std::cerr << DAEMON_APP_NAME << ": Configuration "
+					  << ConfigFile.toString() << " does not seem to exist. Please set " + DAEMON_CONFIG_ENV_VAR
+												  + " env variable the path of the " + DAEMON_PROPERTIES_FILENAME + " file." << std::endl;
+			std::exit(Poco::Util::Application::EXIT_CONFIG);
+		}
+
+		static const char * LogFilePathKey = "logging.channels.c2.path";
+
+		loadConfiguration(ConfigFile.toString());
+
+		if(LogDir_.empty()) {
+			std::string OriginalLogFileValue = ConfigPath(LogFilePathKey);
+			config().setString(LogFilePathKey, OriginalLogFileValue);
+		} else {
+			config().setString(LogFilePathKey, LogDir_);
+		}
+		Poco::File	DataDir(ConfigPath("ucentral.system.data"));
+		DataDir_ = DataDir.path();
+		if(!DataDir.exists()) {
+			try {
+				DataDir.createDirectory();
+			} catch (const Poco::Exception &E) {
+				logger().log(E);
+			}
+		}
+		std::string KeyFile = ConfigPath("ucentral.service.key");
+		std::string KeyFilePassword = ConfigPath("ucentral.service.key.password" , "" );
+		AppKey_ = Poco::SharedPtr<Poco::Crypto::RSAKey>(new Poco::Crypto::RSAKey("", KeyFile, KeyFilePassword));
+		Cipher_ = CipherFactory_.createCipher(*AppKey_);
+		ID_ = Utils::GetSystemId();
+		if(!DebugMode_)
+			DebugMode_ = ConfigGetBool("ucentral.system.debug",false);
+		MyPrivateEndPoint_ = ConfigGetString("ucentral.system.uri.private");
+		MyPublicEndPoint_ = ConfigGetString("ucentral.system.uri.public");
+		UIURI_ = ConfigGetString("ucentral.system.uri.ui");
+		MyHash_ = CreateHash(MyPublicEndPoint_);
+		InitializeSubSystemServers();
+		ServerApplication::initialize(self);
+
+		Types::TopicNotifyFunction F = [this](std::string s1,std::string s2) { this->BusMessageReceived(s1,s2); };
+		KafkaManager()->RegisterTopicWatcher(KafkaTopics::SERVICE_EVENTS, F);
+	}
+
+	void MicroService::uninitialize() {
+		// add your own uninitialization code here
+		ServerApplication::uninitialize();
+	}
+
+	void MicroService::reinitialize(Poco::Util::Application &self) {
+		ServerApplication::reinitialize(self);
+		// add your own reinitialization code here
+	}
+
+	void MicroService::defineOptions(Poco::Util::OptionSet &options) {
+		ServerApplication::defineOptions(options);
+
+		options.addOption(
+			Poco::Util::Option("help", "", "display help information on command line arguments")
+				.required(false)
+				.repeatable(false)
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleHelp)));
+
+		options.addOption(
+			Poco::Util::Option("file", "", "specify the configuration file")
+				.required(false)
+				.repeatable(false)
+				.argument("file")
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleConfig)));
+
+		options.addOption(
+			Poco::Util::Option("debug", "", "to run in debug, set to true")
+				.required(false)
+				.repeatable(false)
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleDebug)));
+
+		options.addOption(
+			Poco::Util::Option("logs", "", "specify the log directory and file (i.e. dir/file.log)")
+				.required(false)
+				.repeatable(false)
+				.argument("dir")
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleLogs)));
+
+		options.addOption(
+			Poco::Util::Option("version", "", "get the version and quit.")
+				.required(false)
+				.repeatable(false)
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleVersion)));
+
+	}
+
+	void MicroService::handleHelp(const std::string &name, const std::string &value) {
+		HelpRequested_ = true;
+		displayHelp();
+		stopOptionsProcessing();
+	}
+
+	void MicroService::handleVersion(const std::string &name, const std::string &value) {
+		HelpRequested_ = true;
+		std::cout << Version() << std::endl;
+		stopOptionsProcessing();
+	}
+
+	void MicroService::handleDebug(const std::string &name, const std::string &value) {
+		if(value == "true")
+			DebugMode_ = true ;
+	}
+
+	void MicroService::handleLogs(const std::string &name, const std::string &value) {
+		LogDir_ = value;
+	}
+
+	void MicroService::handleConfig(const std::string &name, const std::string &value) {
+		ConfigFileName_ = value;
+	}
+
+	void MicroService::displayHelp() {
+		Poco::Util::HelpFormatter helpFormatter(options());
+		helpFormatter.setCommand(commandName());
+		helpFormatter.setUsage("OPTIONS");
+		helpFormatter.setHeader("A " + DAEMON_APP_NAME + " implementation for TIP.");
+		helpFormatter.format(std::cout);
+	}
+
+	void MicroService::InitializeSubSystemServers() {
+		for(auto i:SubSystems_)
+			addSubsystem(i);
+	}
+
+	void MicroService::StartSubSystemServers() {
+		for(auto i:SubSystems_) {
+			i->Start();
+		}
+		BusEventManager_.Start();
+	}
+
+	void MicroService::StopSubSystemServers() {
+		BusEventManager_.Stop();
+		for(auto i=SubSystems_.rbegin(); i!=SubSystems_.rend(); ++i)
+			(*i)->Stop();
+	}
+
+	std::string MicroService::CreateUUID() {
+		return UUIDGenerator_.create().toString();
+	}
+
+	bool MicroService::SetSubsystemLogLevel(const std::string &SubSystem, const std::string &Level) {
+		try {
+			auto P = Poco::Logger::parseLevel(Level);
+			auto Sub = Poco::toLower(SubSystem);
+
+			if (Sub == "all") {
+				for (auto i : SubSystems_) {
+					i->Logger().setLevel(P);
+				}
+				return true;
+			} else {
+				// std::cout << "Sub:" << SubSystem << " Level:" << Level << std::endl;
+				for (auto i : SubSystems_) {
+					if (Sub == Poco::toLower(i->Name())) {
+						i->Logger().setLevel(P);
+						return true;
+					}
+				}
+			}
+		} catch (const Poco::Exception & E) {
+			std::cout << "Exception" << std::endl;
+		}
+		return false;
+	}
+
+	Types::StringVec MicroService::GetSubSystems() const {
+		Types::StringVec Result;
+		for(auto i:SubSystems_)
+			Result.push_back(i->Name());
+		return Result;
+	}
+
+	Types::StringPairVec MicroService::GetLogLevels() const {
+		Types::StringPairVec Result;
+
+		for(auto &i:SubSystems_) {
+			auto P = std::make_pair( i->Name(), Utils::LogLevelToString(i->GetLoggingLevel()));
+			Result.push_back(P);
+		}
+		return Result;
+	}
+
+	const Types::StringVec & MicroService::GetLogLevelNames() const {
+		static Types::StringVec LevelNames{"none", "fatal", "critical", "error", "warning", "notice", "information", "debug", "trace" };
+		return LevelNames;
+	}
+
+	uint64_t MicroService::ConfigGetInt(const std::string &Key,uint64_t Default) {
+		return (uint64_t) config().getInt64(Key,Default);
+	}
+
+	uint64_t MicroService::ConfigGetInt(const std::string &Key) {
+		return config().getInt(Key);
+	}
+
+	uint64_t MicroService::ConfigGetBool(const std::string &Key,bool Default) {
+		return config().getBool(Key,Default);
+	}
+
+	uint64_t MicroService::ConfigGetBool(const std::string &Key) {
+		return config().getBool(Key);
+	}
+
+	std::string MicroService::ConfigGetString(const std::string &Key,const std::string & Default) {
+		return config().getString(Key, Default);
+	}
+
+	std::string MicroService::ConfigGetString(const std::string &Key) {
+		return config().getString(Key);
+	}
+
+	std::string MicroService::ConfigPath(const std::string &Key,const std::string & Default) {
+		std::string R = config().getString(Key, Default);
+		return Poco::Path::expand(R);
+	}
+
+	std::string MicroService::ConfigPath(const std::string &Key) {
+		std::string R = config().getString(Key);
+		return Poco::Path::expand(R);
+	}
+
+	std::string MicroService::Encrypt(const std::string &S) {
+		return Cipher_->encryptString(S, Poco::Crypto::Cipher::Cipher::ENC_BASE64);;
+	}
+
+	std::string MicroService::Decrypt(const std::string &S) {
+		return Cipher_->decryptString(S, Poco::Crypto::Cipher::Cipher::ENC_BASE64);;
+	}
+
+	std::string MicroService::CreateHash(const std::string &S) {
+		SHA2_.update(S);
+		return Utils::ToHex(SHA2_.digest());
+	}
+
+	std::string MicroService::MakeSystemEventMessage( const std::string & Type ) const {
+		Poco::JSON::Object	Obj;
+		Obj.set(KafkaTopics::ServiceEvents::Fields::EVENT,Type);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::ID,ID_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::TYPE,Poco::toLower(DAEMON_APP_NAME));
+		Obj.set(KafkaTopics::ServiceEvents::Fields::PUBLIC,MyPublicEndPoint_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::PRIVATE,MyPrivateEndPoint_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::KEY,MyHash_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::VRSN,Version_);
+		std::stringstream ResultText;
+		Poco::JSON::Stringifier::stringify(Obj, ResultText);
+		return ResultText.str();
+	}
+
+	void BusEventManager::run() {
+		Running_ = true;
+		auto Msg = Daemon()->MakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_JOIN);
+		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,Daemon()->PrivateEndPoint(),Msg, false);
+		while(Running_) {
+			Poco::Thread::trySleep((unsigned long)Daemon()->DaemonBusTimer());
+			if(!Running_)
+				break;
+			auto Msg = Daemon()->MakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE);
+			KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,Daemon()->PrivateEndPoint(),Msg, false);
+		}
+		Msg = Daemon()->MakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_LEAVE);
+		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,Daemon()->PrivateEndPoint(),Msg, false);
+	};
+
+	void BusEventManager::Start() {
+		if(KafkaManager()->Enabled()) {
+			Thread_.start(*this);
+		}
+	}
+
+	void BusEventManager::Stop() {
+		if(KafkaManager()->Enabled()) {
+			Running_ = false;
+			Thread_.wakeUp();
+			Thread_.join();
+		}
+	}
+
+	[[nodiscard]] bool MicroService::IsValidAPIKEY(const Poco::Net::HTTPServerRequest &Request) {
+		try {
+			auto APIKEY = Request.get("X-API-KEY");
+			return APIKEY == MyHash_;
+		} catch (const Poco::Exception &E) {
+			logger().log(E);
+		}
+		return false;
+	}
+
+	void MicroService::SavePID() {
+		try {
+			std::ofstream O;
+			O.open(Daemon()->DataDir() + "/pidfile",std::ios::binary | std::ios::trunc);
+			O << Poco::Process::id();
+			O.close();
+		} catch (...)
+		{
+			std::cout << "Could not save system ID" << std::endl;
+		}
+	}
+
+	int MicroService::main(const ArgVec &args) {
+
+		MyErrorHandler	ErrorHandler(*this);
+		Poco::ErrorHandler::set(&ErrorHandler);
+
+		if (!HelpRequested_) {
+			SavePID();
+			Poco::Logger &logger = Poco::Logger::get(DAEMON_APP_NAME);
+			logger.notice(Poco::format("Starting %s version %s.",DAEMON_APP_NAME, Version()));
+
+			if(Poco::Net::Socket::supportsIPv6())
+				logger.information("System supports IPv6.");
+			else
+				logger.information("System does NOT support IPv6.");
+
+			if (config().getBool("application.runAsDaemon", false)) {
+				logger.information("Starting as a daemon.");
+			}
+			logger.information(Poco::format("System ID set to %Lu",ID_));
+			StartSubSystemServers();
+			waitForTerminationRequest();
+			StopSubSystemServers();
+
+			logger.notice(Poco::format("Stopped %s...",DAEMON_APP_NAME));
+		}
+
+		return Application::EXIT_OK;
+	}
+}
--- a/src/MicroService.h
+++ b/src/MicroService.h
@@ -0,0 +1,174 @@
+//
+// Created by stephane bourque on 2021-06-22.
+//
+
+#ifndef UCENTRALGW_MICROSERVICE_H
+#define UCENTRALGW_MICROSERVICE_H
+
+#include <array>
+#include <iostream>
+#include <cstdlib>
+#include <vector>
+#include <set>
+
+#include "Poco/Util/Application.h"
+#include "Poco/Util/ServerApplication.h"
+#include "Poco/Util/Option.h"
+#include "Poco/Util/OptionSet.h"
+#include "Poco/UUIDGenerator.h"
+#include "Poco/ErrorHandler.h"
+#include "Poco/Crypto/RSAKey.h"
+#include "Poco/Crypto/CipherFactory.h"
+#include "Poco/Crypto/Cipher.h"
+#include "Poco/SHA2Engine.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Process.h"
+
+#include "OpenWifiTypes.h"
+#include "SubSystemServer.h"
+
+namespace OpenWifi {
+
+	static const std::string uSERVICE_SECURITY{"ucentralsec"};
+	static const std::string uSERVICE_GATEWAY{"ucentralgw"};
+	static const std::string uSERVICE_FIRMWARE{ "ucentralfms"};
+    static const std::string uSERVICE_TOPOLOGY{ "owtopo"};
+    static const std::string uSERVICE_PROVISIONING{ "owprov"};
+
+	class MyErrorHandler : public Poco::ErrorHandler {
+	  public:
+		explicit MyErrorHandler(Poco::Util::Application &App) : App_(App) {}
+		void exception(const Poco::Exception & E) override;
+		void exception(const std::exception & E) override;
+		void exception() override;
+	  private:
+		Poco::Util::Application	&App_;
+	};
+
+	class BusEventManager : public Poco::Runnable {
+	  public:
+		void run() override;
+		void Start();
+		void Stop();
+	  private:
+		std::atomic_bool 	Running_ = false;
+		Poco::Thread		Thread_;
+	};
+
+	struct MicroServiceMeta {
+		uint64_t 		Id=0;
+		std::string 	Type;
+		std::string 	PrivateEndPoint;
+		std::string 	PublicEndPoint;
+		std::string 	AccessKey;
+		std::string		Version;
+		uint64_t 		LastUpdate=0;
+	};
+
+	typedef std::map<uint64_t, MicroServiceMeta>	MicroServiceMetaMap;
+	typedef std::vector<MicroServiceMeta>			MicroServiceMetaVec;
+
+	class MicroService : public Poco::Util::ServerApplication {
+	  public:
+		explicit MicroService( 	std::string PropFile,
+					 	std::string RootEnv,
+					 	std::string ConfigVar,
+					 	std::string AppName,
+					  	uint64_t BusTimer,
+					  	Types::SubSystemVec Subsystems) :
+			DAEMON_PROPERTIES_FILENAME(std::move(PropFile)),
+			DAEMON_ROOT_ENV_VAR(std::move(RootEnv)),
+			DAEMON_CONFIG_ENV_VAR(std::move(ConfigVar)),
+			DAEMON_APP_NAME(std::move(AppName)),
+			DAEMON_BUS_TIMER(BusTimer),
+			SubSystems_(std::move(Subsystems)) {
+			std::string V{APP_VERSION};
+			std::string B{BUILD_NUMBER};
+			Version_ =  V + "(" + B +  ")";
+		}
+
+		int main(const ArgVec &args) override;
+		void initialize(Application &self) override;
+		void uninitialize() override;
+		void reinitialize(Application &self) override;
+		void defineOptions(Poco::Util::OptionSet &options) override;
+		void handleHelp(const std::string &name, const std::string &value);
+		void handleVersion(const std::string &name, const std::string &value);
+		void handleDebug(const std::string &name, const std::string &value);
+		void handleLogs(const std::string &name, const std::string &value);
+		void handleConfig(const std::string &name, const std::string &value);
+		void displayHelp();
+
+		void InitializeSubSystemServers();
+		void StartSubSystemServers();
+		void StopSubSystemServers();
+		void Exit(int Reason);
+		bool SetSubsystemLogLevel(const std::string & SubSystem, const std::string & Level);
+		[[nodiscard]] std::string Version() { return Version_; }
+		[[nodiscard]] const Poco::SharedPtr<Poco::Crypto::RSAKey> & Key() { return AppKey_; }
+		[[nodiscard]] inline const std::string & DataDir() { return DataDir_; }
+		[[nodiscard]] std::string CreateUUID();
+		[[nodiscard]] bool Debug() const { return DebugMode_; }
+		[[nodiscard]] uint64_t ID() const { return ID_; }
+		[[nodiscard]] Types::StringVec GetSubSystems() const;
+		[[nodiscard]] Types::StringPairVec GetLogLevels() const;
+		[[nodiscard]] const Types::StringVec & GetLogLevelNames() const;
+		[[nodiscard]] std::string ConfigGetString(const std::string &Key,const std::string & Default);
+		[[nodiscard]] std::string ConfigGetString(const std::string &Key);
+		[[nodiscard]] std::string ConfigPath(const std::string &Key,const std::string & Default);
+		[[nodiscard]] std::string ConfigPath(const std::string &Key);
+		[[nodiscard]] uint64_t ConfigGetInt(const std::string &Key,uint64_t Default);
+		[[nodiscard]] uint64_t ConfigGetInt(const std::string &Key);
+		[[nodiscard]] uint64_t ConfigGetBool(const std::string &Key,bool Default);
+		[[nodiscard]] uint64_t ConfigGetBool(const std::string &Key);
+		[[nodiscard]] std::string Encrypt(const std::string &S);
+		[[nodiscard]] std::string Decrypt(const std::string &S);
+		[[nodiscard]] std::string CreateHash(const std::string &S);
+		[[nodiscard]] std::string Hash() const { return MyHash_; };
+		[[nodiscard]] std::string ServiceType() const { return DAEMON_APP_NAME; };
+		[[nodiscard]] std::string PrivateEndPoint() const { return MyPrivateEndPoint_; };
+		[[nodiscard]] std::string PublicEndPoint() const { return MyPublicEndPoint_; };
+		[[nodiscard]] std::string MakeSystemEventMessage( const std::string & Type ) const ;
+		inline uint64_t DaemonBusTimer() const { return DAEMON_BUS_TIMER; };
+
+		void BusMessageReceived( const std::string & Key, const std::string & Message);
+		[[nodiscard]] MicroServiceMetaVec GetServices(const std::string & type);
+		[[nodiscard]] MicroServiceMetaVec GetServices();
+		[[nodiscard]] bool IsValidAPIKEY(const Poco::Net::HTTPServerRequest &Request);
+
+		void SavePID();
+		inline uint64_t GetPID() { return Poco::Process::id(); };
+		[[nodiscard]] inline const std::string GetPublicAPIEndPoint() const { return MyPublicEndPoint_ + "/api/v1"; };
+		[[nodiscard]] inline const std::string & GetUIURI() const { return UIURI_;};
+
+	  private:
+		bool                        HelpRequested_ = false;
+		std::string                 LogDir_;
+		std::string                 ConfigFileName_;
+		Poco::UUIDGenerator         UUIDGenerator_;
+		uint64_t                    ID_ = 1;
+		Poco::SharedPtr<Poco::Crypto::RSAKey>	AppKey_ = nullptr;
+		bool                        DebugMode_ = false;
+		std::string 				DataDir_;
+		Types::SubSystemVec			SubSystems_;
+		Poco::Crypto::CipherFactory & CipherFactory_ = Poco::Crypto::CipherFactory::defaultFactory();
+		Poco::Crypto::Cipher        * Cipher_ = nullptr;
+		Poco::SHA2Engine			SHA2_;
+		MicroServiceMetaMap			Services_;
+		std::string 				MyHash_;
+		std::string 				MyPrivateEndPoint_;
+		std::string 				MyPublicEndPoint_;
+		std::string                 UIURI_;
+		std::string 				Version_;
+		BusEventManager				BusEventManager_;
+		SubMutex 					InfraMutex_;
+
+		std::string DAEMON_PROPERTIES_FILENAME;
+		std::string DAEMON_ROOT_ENV_VAR;
+		std::string DAEMON_CONFIG_ENV_VAR;
+		std::string DAEMON_APP_NAME;
+		uint64_t 	DAEMON_BUS_TIMER;
+	};
+}
+
+#endif // UCENTRALGW_MICROSERVICE_H
--- a/src/OpenAPIRequest.cpp
+++ b/src/OpenAPIRequest.cpp
@@ -0,0 +1,68 @@
+//
+// Created by stephane bourque on 2021-07-01.
+//
+#include <iostream>
+
+#include "OpenAPIRequest.h"
+
+#include "Poco/Net/HTTPSClientSession.h"
+#include <Poco/Net/HTTPClientSession.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Poco/Net/HTTPResponse.h>
+#include <Poco/StreamCopier.h>
+#include <Poco/JSON/Parser.h>
+#include <Poco/Path.h>
+#include <Poco/URI.h>
+#include <Poco/Exception.h>
+#include "Utils.h"
+#include "Daemon.h"
+
+namespace OpenWifi {
+
+	OpenAPIRequestGet::OpenAPIRequestGet( 	const std::string & ServiceType,
+											const std::string & EndPoint,
+									 		Types::StringPairVec & QueryData,
+											uint64_t msTimeout):
+ 		Type_(ServiceType),
+ 		EndPoint_(EndPoint),
+		QueryData_(QueryData),
+		msTimeout_(msTimeout) {
+
+	}
+
+	int OpenAPIRequestGet::Do(Poco::JSON::Object::Ptr &ResponseObject) {
+		try {
+		    auto Services = Daemon()->GetServices(Type_);
+			for(auto const &Svc:Services) {
+				Poco::URI	URI(Svc.PrivateEndPoint);
+				Poco::Net::HTTPSClientSession Session(URI.getHost(), URI.getPort());
+
+				URI.setPath(EndPoint_);
+				for (const auto &qp : QueryData_)
+					URI.addQueryParameter(qp.first, qp.second);
+
+				std::string Path(URI.getPathAndQuery());
+				Session.setTimeout(Poco::Timespan(msTimeout_/1000, msTimeout_ % 1000));
+
+				Poco::Net::HTTPRequest Request(Poco::Net::HTTPRequest::HTTP_GET,
+											   Path,
+											   Poco::Net::HTTPMessage::HTTP_1_1);
+				Request.add("X-API-KEY", Svc.AccessKey);
+				Session.sendRequest(Request);
+
+				Poco::Net::HTTPResponse Response;
+				std::istream &is = Session.receiveResponse(Response);
+				if(Response.getStatus()==Poco::Net::HTTPResponse::HTTP_OK) {
+					Poco::JSON::Parser	P;
+					ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
+				}
+				return Response.getStatus();
+			}
+		}
+		catch (const Poco::Exception &E)
+		{
+			std::cerr << E.displayText() << std::endl;
+		}
+		return -1;
+	}
+}
--- a/src/OpenAPIRequest.h
+++ b/src/OpenAPIRequest.h
@@ -0,0 +1,29 @@
+//
+// Created by stephane bourque on 2021-07-01.
+//
+
+#ifndef UCENTRALGW_OPENAPIREQUEST_H
+#define UCENTRALGW_OPENAPIREQUEST_H
+
+#include "Poco/JSON/Object.h"
+
+#include "OpenWifiTypes.h"
+
+namespace OpenWifi {
+
+	class OpenAPIRequestGet {
+	  public:
+		explicit OpenAPIRequestGet( const std::string & Type,
+								   	const std::string & EndPoint,
+									Types::StringPairVec & QueryData,
+									uint64_t msTimeout);
+		int Do(Poco::JSON::Object::Ptr &ResponseObject);
+	  private:
+		std::string 			Type_;
+		std::string 			EndPoint_;
+		Types::StringPairVec 	QueryData_;
+		uint64_t 				msTimeout_;
+	};
+}
+
+#endif // UCENTRALGW_OPENAPIREQUEST_H
--- a/src/OpenWifiTypes.h
+++ b/src/OpenWifiTypes.h
@@ -0,0 +1,68 @@
+//
+// Created by stephane bourque on 2021-06-13.
+//
+
+#ifndef UCENTRALGW_UCENTRALTYPES_H
+#define UCENTRALGW_UCENTRALTYPES_H
+
+#include "SubSystemServer.h"
+
+#include <vector>
+#include <string>
+#include <map>
+#include <functional>
+#include <list>
+#include <utility>
+#include <queue>
+
+#include "Poco/StringTokenizer.h"
+
+namespace OpenWifi::Types {
+    typedef std::pair<std::string,std::string>              StringPair;
+	typedef std::vector<StringPair>	                        StringPairVec;
+    typedef std::queue<StringPair>	                        StringPairQueue;
+	typedef std::vector<std::string>						StringVec;
+	typedef std::set<std::string>                           StringSet;
+	typedef std::vector<SubSystemServer*>					SubSystemVec;
+	typedef std::map<std::string,std::set<std::string>>		StringMapStringSet;
+	typedef std::function<void(std::string, std::string)>   TopicNotifyFunction;
+	typedef std::list<std::pair<TopicNotifyFunction,int>>   TopicNotifyFunctionList;
+	typedef std::map<std::string, TopicNotifyFunctionList>  NotifyTable;
+    typedef std::map<std::string,uint64_t>                  CountedMap;
+
+    typedef std::string         UUID_t;
+    typedef std::vector<UUID_t> UUIDvec_t;
+
+    inline void UpdateCountedMap(CountedMap &M, const std::string &S, uint64_t Increment=1) {
+        auto it = M.find(S);
+        if(it==M.end())
+            M[S] = Increment;
+        else
+            it->second += Increment;
+    }
+
+    inline std::string to_string( const StringVec &V) {
+        std::string Result;
+
+        bool first=true;
+        for(const auto &i:V) {
+            if(first) {
+                Result += i;
+                first = false;
+            } else {
+                Result += ",";
+                Result += i;
+            }
+        }
+        return Result;
+    }
+
+    inline void from_string(const std::string &S, StringVec &V) {
+        Poco::StringTokenizer   Tokens(S,",",Poco::StringTokenizer::TOK_TRIM | Poco::StringTokenizer::TOK_IGNORE_EMPTY);
+
+        for(auto const &i:Tokens)
+            V.emplace_back(i);
+    }
+};
+
+#endif // UCENTRALGW_UCENTRALTYPES_H
--- a/src/RESTAPI/RESTAPI_action_links.cpp
+++ b/src/RESTAPI/RESTAPI_action_links.cpp
@@ -1,162 +0,0 @@
-//
-// Created by stephane bourque on 2021-06-22.
-//
-
-#include "Poco/JSON/Parser.h"
-#include "Poco/Net/HTMLForm.h"
-
-#include "RESTAPI_action_links.h"
-#include "StorageService.h"
-#include "framework/MicroService.h"
-#include "Daemon.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_action_links::DoGet() {
-
-        auto Action = GetParameter("action","");
-        auto Id = GetParameter("id","");
-
-        SecurityObjects::ActionLink Link;
-        if(!StorageService()->ActionLinksDB().GetActionLink(Id,Link))
-            return DoReturnA404();
-
-        if(Action=="password_reset")
-            return RequestResetPassword(Link);
-        else if(Action=="email_verification")
-            return DoEmailVerification(Link);
-        else
-            return DoReturnA404();
-    }
-
-    void RESTAPI_action_links::DoPost() {
-        auto Action = GetParameter("action","");
-
-        if(Action=="password_reset")
-            return CompleteResetPassword();
-        else
-            return DoReturnA404();
-    }
-
-    void RESTAPI_action_links::RequestResetPassword(SecurityObjects::ActionLink &Link) {
-        Logger_.information(Poco::format("REQUEST-PASSWORD-RESET(%s): For ID=%s", Request->clientAddress().toString(), Link.userId));
-        Poco::File  FormFile{ Daemon()->AssetDir() + "/password_reset.html"};
-        Types::StringPairVec    FormVars{ {"UUID", Link.id},
-                                          {"PASSWORD_VALIDATION", AuthService()->PasswordValidationExpression()}};
-        SendHTMLFileBack(FormFile,FormVars);
-    }
-
-    void RESTAPI_action_links::CompleteResetPassword() {
-        //  form has been posted...
-        RESTAPI_PartHandler PartHandler;
-        Poco::Net::HTMLForm Form(*Request, Request->stream(), PartHandler);
-        if (!Form.empty()) {
-
-            auto Password1 = Form.get("password1","bla");
-            auto Password2 = Form.get("password1","blu");
-            auto Id = Form.get("id","");
-            auto Now = std::time(nullptr);
-
-            SecurityObjects::ActionLink Link;
-            if(!StorageService()->ActionLinksDB().GetActionLink(Id,Link))
-                return DoReturnA404();
-
-            if(Now > Link.expires) {
-                StorageService()->ActionLinksDB().CancelAction(Id);
-                return DoReturnA404();
-            }
-
-            if(Password1!=Password2 || !AuthService()->ValidatePassword(Password2) || !AuthService()->ValidatePassword(Password1)) {
-                Poco::File  FormFile{ Daemon()->AssetDir() + "/password_reset_error.html"};
-                Types::StringPairVec    FormVars{ {"UUID", Id},
-                                                  {"ERROR_TEXT", "For some reason, the passwords entered do not match or they do not comply with"
-                                                                 " accepted password creation restrictions. Please consult our on-line help"
-                                                                 " to look at the our password policy. If you would like to contact us, please mention"
-                                                                 " id(" + Id + ")"}};
-                return SendHTMLFileBack(FormFile,FormVars);
-            }
-
-            SecurityObjects::UserInfo   UInfo;
-
-            bool Found = Link.userAction ? StorageService()->UserDB().GetUserById(Link.userId,UInfo) : StorageService()->SubDB().GetUserById(Link.userId,UInfo);
-            if(!Found) {
-                Poco::File  FormFile{ Daemon()->AssetDir() + "/password_reset_error.html"};
-                Types::StringPairVec    FormVars{ {"UUID", Id},
-                                                  {"ERROR_TEXT", "This request does not contain a valid user ID. Please contact your system administrator."}};
-                return SendHTMLFileBack(FormFile,FormVars);
-            }
-
-            if(UInfo.blackListed || UInfo.suspended) {
-                Poco::File  FormFile{ Daemon()->AssetDir() + "/password_reset_error.html"};
-                Types::StringPairVec    FormVars{ {"UUID", Id},
-                                                  {"ERROR_TEXT", "Please contact our system administrators. We have identified an error in your account that must be resolved first."}};
-                return SendHTMLFileBack(FormFile,FormVars);
-            }
-
-            bool GoodPassword = Link.userAction ? AuthService()->SetPassword(Password1,UInfo) : AuthService()->SetSubPassword(Password1,UInfo);
-            if(!GoodPassword) {
-                Poco::File  FormFile{ Daemon()->AssetDir() + "/password_reset_error.html"};
-                Types::StringPairVec    FormVars{ {"UUID", Id},
-                                                  {"ERROR_TEXT", "You cannot reuse one of your recent passwords."}};
-                return SendHTMLFileBack(FormFile,FormVars);
-            }
-
-            UInfo.modified = std::time(nullptr);
-            if(Link.userAction)
-                StorageService()->UserDB().UpdateUserInfo(UInfo.email,Link.userId,UInfo);
-            else
-                StorageService()->SubDB().UpdateUserInfo(UInfo.email,Link.userId,UInfo);
-
-            Poco::File  FormFile{ Daemon()->AssetDir() + "/password_reset_success.html"};
-            Types::StringPairVec    FormVars{ {"UUID", Id},
-                                              {"USERNAME", UInfo.email},
-                                              {"ACTION_LINK",MicroService::instance().GetUIURI()}};
-            StorageService()->ActionLinksDB().CompleteAction(Id);
-            SendHTMLFileBack(FormFile,FormVars);
-        } else {
-            DoReturnA404();
-        }
-    }
-
-    void RESTAPI_action_links::DoEmailVerification(SecurityObjects::ActionLink &Link) {
-        auto Now = std::time(nullptr);
-
-        if(Now > Link.expires) {
-            StorageService()->ActionLinksDB().CancelAction(Link.id);
-            return DoReturnA404();
-        }
-
-        SecurityObjects::UserInfo UInfo;
-        bool Found = Link.userAction ? StorageService()->UserDB().GetUserById(Link.userId,UInfo) : StorageService()->SubDB().GetUserById(Link.userId,UInfo);
-        if (!Found) {
-            Types::StringPairVec FormVars{{"UUID",       Link.id},
-                                          {"ERROR_TEXT", "This does not appear to be a valid email verification link.."}};
-            Poco::File FormFile{Daemon()->AssetDir() + "/email_verification_error.html"};
-            return SendHTMLFileBack(FormFile, FormVars);
-        }
-
-        Logger_.information(Poco::format("EMAIL-VERIFICATION(%s): For ID=%s", Request->clientAddress().toString(), UInfo.email));
-        UInfo.waitingForEmailCheck = false;
-        UInfo.validated = true;
-        UInfo.lastEmailCheck = std::time(nullptr);
-        UInfo.validationDate = std::time(nullptr);
-        UInfo.modified  = std::time(nullptr);
-        if(Link.userAction)
-            StorageService()->UserDB().UpdateUserInfo(UInfo.email, Link.userId, UInfo);
-        else
-            StorageService()->SubDB().UpdateUserInfo(UInfo.email, Link.userId, UInfo);
-        Types::StringPairVec FormVars{{"UUID",     Link.id},
-                                      {"USERNAME", UInfo.email},
-                                      {"ACTION_LINK",MicroService::instance().GetUIURI()}};
-        Poco::File FormFile{Daemon()->AssetDir() + "/email_verification_success.html"};
-        StorageService()->ActionLinksDB().CompleteAction(Link.id);
-        SendHTMLFileBack(FormFile, FormVars);
-    }
-
-    void RESTAPI_action_links::DoReturnA404() {
-        Types::StringPairVec FormVars;
-        Poco::File FormFile{Daemon()->AssetDir() + "/404_error.html"};
-        SendHTMLFileBack(FormFile, FormVars);
-    }
-
-}
--- a/src/RESTAPI/RESTAPI_action_links.h
+++ b/src/RESTAPI/RESTAPI_action_links.h
@@ -1,34 +0,0 @@
-//
-// Created by stephane bourque on 2021-06-22.
-//
-
-#pragma once
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-    class RESTAPI_action_links : public RESTAPIHandler {
-    public:
-        RESTAPI_action_links(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
-                : RESTAPIHandler(bindings, L,
-             std::vector<std::string>{
-                                        Poco::Net::HTTPRequest::HTTP_GET,
-                                        Poco::Net::HTTPRequest::HTTP_POST,
-                                        Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                        Server,
-                                        TransactionId,
-                                        Internal,
-                                        false,
-                                        true, RateLimit{.Interval=1000,.MaxCalls=10}) {}
-        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/actionLink"}; };
-        void RequestResetPassword(SecurityObjects::ActionLink &Link);
-        void CompleteResetPassword();
-        void DoEmailVerification(SecurityObjects::ActionLink &Link);
-        void DoReturnA404();
-
-        void DoGet() final;
-        void DoPost() final;
-        void DoDelete() final {};
-        void DoPut() final {};
-    };
-}
--- a/src/RESTAPI/RESTAPI_asset_server.cpp
+++ b/src/RESTAPI/RESTAPI_asset_server.cpp
@@ -1,25 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-10.
-//
-
-#include "RESTAPI_asset_server.h"
-#include "Poco/File.h"
-#include "framework/RESTAPI_protocol.h"
-#include "Daemon.h"
-
-namespace OpenWifi {
-    void RESTAPI_asset_server::DoGet() {
-        Poco::File  AssetFile;
-
-        if(Request->getURI().find("/favicon.ico") != std::string::npos) {
-            AssetFile = Daemon()->AssetDir() + "/favicon.ico";
-        } else {
-            std::string AssetName = GetBinding(RESTAPI::Protocol::ID, "");
-            AssetFile = Daemon()->AssetDir() + "/" + AssetName;
-        }
-        if(!AssetFile.isFile()) {
-            return NotFound();
-        }
-        SendFile(AssetFile);
-    }
-}
--- a/src/RESTAPI/RESTAPI_avatar_handler.cpp
+++ b/src/RESTAPI/RESTAPI_avatar_handler.cpp
@@ -1,80 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-15.
-//
-
-#include <fstream>
-#include <iostream>
-
-#include "RESTAPI_avatar_handler.h"
-#include "StorageService.h"
-#include "Poco/Net/HTMLForm.h"
-#include "framework/RESTAPI_protocol.h"
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-
-    void AvatarPartHandler::handlePart(const Poco::Net::MessageHeader &Header, std::istream &Stream) {
-        FileType_ = Header.get(RESTAPI::Protocol::CONTENTTYPE, RESTAPI::Protocol::UNSPECIFIED);
-        if (Header.has(RESTAPI::Protocol::CONTENTDISPOSITION)) {
-            std::string Disposition;
-            Poco::Net::NameValueCollection Parameters;
-            Poco::Net::MessageHeader::splitParameters(Header[RESTAPI::Protocol::CONTENTDISPOSITION], Disposition, Parameters);
-            Name_ = Parameters.get(RESTAPI::Protocol::NAME, RESTAPI::Protocol::UNNAMED);
-        }
-        Poco::CountingInputStream InputStream(Stream);
-        Poco::StreamCopier::copyStream(InputStream, OutputStream_);
-        Length_ = OutputStream_.str().size();
-    };
-
-    void RESTAPI_avatar_handler::DoPost() {
-        std::string Id = UserInfo_.userinfo.id;
-        SecurityObjects::UserInfo UInfo;
-
-        std::stringstream SS;
-        AvatarPartHandler partHandler(Id, Logger_, SS);
-        Poco::Net::HTMLForm form(*Request, Request->stream(), partHandler);
-        Poco::JSON::Object Answer;
-
-        if (!partHandler.Name().empty() && partHandler.Length()< MicroService::instance().ConfigGetInt("openwifi.avatar.maxsize",2000000)) {
-            Answer.set(RESTAPI::Protocol::AVATARID, Id);
-            Answer.set(RESTAPI::Protocol::ERRORCODE, 0);
-            Logger_.information(Poco::format("Uploaded avatar: %s Type: %s", partHandler.Name(), partHandler.ContentType()));
-            StorageService()->AvatarDB().SetAvatar(UserInfo_.userinfo.email,
-                                 Id, SS.str(), partHandler.ContentType(), partHandler.Name());
-            StorageService()->UserDB().SetAvatar(Id,"1");
-        } else {
-            Answer.set(RESTAPI::Protocol::AVATARID, Id);
-            Answer.set(RESTAPI::Protocol::ERRORCODE, 13);
-            Answer.set(RESTAPI::Protocol::ERRORTEXT, "Avatar upload could not complete.");
-        }
-        ReturnObject(Answer);
-    }
-
-    void RESTAPI_avatar_handler::DoGet() {
-        std::string Id = GetBinding(RESTAPI::Protocol::ID, "");
-        if (Id.empty()) {
-            return NotFound();
-        }
-
-        std::string Type, Name, AvatarContent;
-        if (!StorageService()->AvatarDB().GetAvatar(UserInfo_.userinfo.email, Id, AvatarContent, Type, Name)) {
-            return NotFound();
-        }
-        return SendFileContent(AvatarContent, Type, Name);
-    }
-
-    void RESTAPI_avatar_handler::DoDelete() {
-        std::string Id = GetBinding(RESTAPI::Protocol::ID, "");
-
-        if(UserInfo_.userinfo.userRole!=SecurityObjects::ROOT && Id!=UserInfo_.userinfo.id) {
-            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
-        }
-
-        if (!StorageService()->AvatarDB().DeleteAvatar(UserInfo_.userinfo.email, Id)) {
-            return NotFound();
-        }
-
-        StorageService()->UserDB().SetAvatar(Id,"");
-        OK();
-    }
-}
--- a/src/RESTAPI/RESTAPI_db_helpers.h
+++ b/src/RESTAPI/RESTAPI_db_helpers.h
@@ -1,17 +0,0 @@
-//
-// Created by stephane bourque on 2022-01-01.
-//
-
-#pragma once
-
-#include "framework/orm.h"
-
-namespace OpenWifi {
-
-    inline void Sanitize(const SecurityObjects::UserInfoAndPolicy &User, SecurityObjects::UserInfo & U) {
-        U.currentPassword.clear();
-        U.lastPasswords.clear();
-        U.oauthType.clear();
-    }
-
-}
--- a/src/RESTAPI/RESTAPI_email_handler.cpp
+++ b/src/RESTAPI/RESTAPI_email_handler.cpp
@@ -1,38 +0,0 @@
-//
-// Created by stephane bourque on 2021-09-02.
-//
-
-#include "RESTAPI_email_handler.h"
-
-
-#include "Poco/Exception.h"
-#include "Poco/JSON/Parser.h"
-
-#include "SMTPMailerService.h"
-#include "framework/RESTAPI_errors.h"
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-    void RESTAPI_email_handler::DoPost() {
-        auto Obj = ParseStream();
-        if (Obj->has("subject") &&
-            Obj->has("from") &&
-            Obj->has("text") &&
-            Obj->has("recipients") &&
-            Obj->isArray("recipients")) {
-
-            Poco::JSON::Array::Ptr Recipients = Obj->getArray("recipients");
-            auto Recipient = Recipients->get(0).toString();
-            MessageAttributes Attrs;
-            Attrs[RECIPIENT_EMAIL] = Recipient;
-            Attrs[SUBJECT] = Obj->get("subject").toString();
-            Attrs[TEXT] = Obj->get("text").toString();
-            Attrs[SENDER] = Obj->get("from").toString();
-            if(SMTPMailerService()->SendMessage(Recipient, "password_reset.txt", Attrs)) {
-                return OK();
-            }
-            return ReturnStatus(Poco::Net::HTTPResponse::HTTP_SERVICE_UNAVAILABLE);
-        }
-        BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-    }
-}
--- a/src/RESTAPI/RESTAPI_email_handler.h
+++ b/src/RESTAPI/RESTAPI_email_handler.h
@@ -1,25 +0,0 @@
-//
-// Created by stephane bourque on 2021-09-02.
-//
-
-#pragma once
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-    class RESTAPI_email_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_email_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_POST,
-                                                  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                                  Server,
-                                                  TransactionId,
-                                                  Internal) {}
-        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/email"};}
-        void DoGet() final {};
-        void DoPost() final;
-        void DoDelete() final {};
-        void DoPut() final {};
-    };
-}
--- a/src/RESTAPI/RESTAPI_oauth2_handler.cpp
+++ b/src/RESTAPI/RESTAPI_oauth2_handler.cpp
@@ -1,159 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-#include "Poco/JSON/Parser.h"
-
-#include "AuthService.h"
-#include "RESTAPI_oauth2_handler.h"
-#include "MFAServer.h"
-#include "framework/RESTAPI_protocol.h"
-#include "framework/MicroService.h"
-#include "StorageService.h"
-#include "RESTAPI_db_helpers.h"
-
-namespace OpenWifi {
-
-	void RESTAPI_oauth2_handler::DoGet() {
-	    bool Expired = false, Contacted = false;
-        if (!IsAuthorized(Expired, Contacted)) {
-            if(Expired)
-                return UnAuthorized(RESTAPI::Errors::ExpiredToken,EXPIRED_TOKEN);
-            return UnAuthorized(RESTAPI::Errors::MissingAuthenticationInformation, INVALID_TOKEN);
-        }
-        bool GetMe = GetBoolParameter(RESTAPI::Protocol::ME, false);
-        if(GetMe) {
-            Logger_.information(Poco::format("REQUEST-ME(%s): Request for %s", Request->clientAddress().toString(), UserInfo_.userinfo.email));
-            Poco::JSON::Object Me;
-            SecurityObjects::UserInfo   ReturnedUser = UserInfo_.userinfo;
-            Sanitize(UserInfo_, ReturnedUser);
-            ReturnedUser.to_json(Me);
-            return ReturnObject(Me);
-        }
-        BadRequest(RESTAPI::Errors::UnrecognizedRequest);
-	}
-
-    void RESTAPI_oauth2_handler::DoDelete() {
-	    bool Expired = false, Contacted=false;
-	    if (!IsAuthorized(Expired, Contacted)) {
-	        if(Expired)
-	            return UnAuthorized(RESTAPI::Errors::ExpiredToken,EXPIRED_TOKEN);
-	        return UnAuthorized(RESTAPI::Errors::MissingAuthenticationInformation, INVALID_TOKEN);
-	    }
-
-        auto Token = GetBinding(RESTAPI::Protocol::TOKEN, "...");
-        if (Token == SessionToken_) {
-            AuthService()->Logout(Token);
-            return ReturnStatus(Poco::Net::HTTPResponse::HTTP_NO_CONTENT, true);
-        }
-
-        Logger_.information(Poco::format("BAD-LOGOUT(%s): Request for %s", Request->clientAddress().toString(), UserInfo_.userinfo.email));
-        NotFound();
-	}
-
-	void RESTAPI_oauth2_handler::DoPost() {
-        auto Obj = ParseStream();
-        auto userId = GetS(RESTAPI::Protocol::USERID, Obj);
-        auto password = GetS(RESTAPI::Protocol::PASSWORD, Obj);
-        auto newPassword = GetS(RESTAPI::Protocol::NEWPASSWORD, Obj);
-
-        Poco::toLowerInPlace(userId);
-
-        if(GetBoolParameter(RESTAPI::Protocol::REQUIREMENTS, false)) {
-            Logger_.information(Poco::format("POLICY-REQUEST(%s): Request.", Request->clientAddress().toString()));
-            Poco::JSON::Object  Answer;
-            Answer.set(RESTAPI::Protocol::PASSWORDPATTERN, AuthService()->PasswordValidationExpression());
-            Answer.set(RESTAPI::Protocol::ACCESSPOLICY, AuthService()->GetAccessPolicy());
-            Answer.set(RESTAPI::Protocol::PASSWORDPOLICY, AuthService()->GetPasswordPolicy());
-            return ReturnObject(Answer);
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::FORGOTPASSWORD,false)) {
-            SecurityObjects::UserInfo UInfo1;
-            auto UserExists = StorageService()->UserDB().GetUserByEmail(userId,UInfo1);
-            if(UserExists) {
-                Logger_.information(Poco::format("FORGOTTEN-PASSWORD(%s): Request for %s", Request->clientAddress().toString(), userId));
-                SecurityObjects::ActionLink NewLink;
-
-                NewLink.action = OpenWifi::SecurityObjects::LinkActions::FORGOT_PASSWORD;
-                NewLink.id = MicroService::CreateUUID();
-                NewLink.userId = UInfo1.id;
-                NewLink.created = std::time(nullptr);
-                NewLink.expires = NewLink.created + (24*60*60);
-                NewLink.userAction = true;
-                StorageService()->ActionLinksDB().CreateAction(NewLink);
-
-                Poco::JSON::Object ReturnObj;
-                SecurityObjects::UserInfoAndPolicy UInfo;
-                UInfo.webtoken.userMustChangePassword = true;
-                UInfo.webtoken.to_json(ReturnObj);
-                return ReturnObject(ReturnObj);
-            } else {
-                Poco::JSON::Object ReturnObj;
-                SecurityObjects::UserInfoAndPolicy UInfo;
-                UInfo.webtoken.userMustChangePassword = true;
-                UInfo.webtoken.to_json(ReturnObj);
-                return ReturnObject(ReturnObj);
-            }
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::RESENDMFACODE,false)) {
-            Logger_.information(Poco::format("RESEND-MFA-CODE(%s): Request for %s", Request->clientAddress().toString(), userId));
-            if(Obj->has("uuid")) {
-                auto uuid = Obj->get("uuid").toString();
-                if(MFAServer()->ResendCode(uuid))
-                    return OK();
-            }
-            return UnAuthorized(RESTAPI::Errors::InvalidCredentials, BAD_MFA_TRANSACTION);
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::COMPLETEMFACHALLENGE,false)) {
-            Logger_.information(Poco::format("COMPLETE-MFA-CHALLENGE(%s): Request for %s", Request->clientAddress().toString(), userId));
-            if(Obj->has("uuid")) {
-                SecurityObjects::UserInfoAndPolicy UInfo;
-                if(MFAServer()->CompleteMFAChallenge(Obj,UInfo)) {
-                    Poco::JSON::Object ReturnObj;
-                    UInfo.webtoken.to_json(ReturnObj);
-                    return ReturnObject(ReturnObj);
-                }
-            }
-            return UnAuthorized(RESTAPI::Errors::InvalidCredentials, MFA_FAILURE);
-        }
-
-        SecurityObjects::UserInfoAndPolicy UInfo;
-        bool Expired=false;
-        auto Code=AuthService()->Authorize(userId, password, newPassword, UInfo, Expired);
-        if (Code==SUCCESS) {
-            Poco::JSON::Object ReturnObj;
-            if(AuthService()->RequiresMFA(UInfo)) {
-                if(MFAServer()->StartMFAChallenge(UInfo, ReturnObj)) {
-                    return ReturnObject(ReturnObj);
-                }
-                Logger_.warning("MFA Seems to be broken. Please fix. Disabling MFA checking for now.");
-            }
-            UInfo.webtoken.to_json(ReturnObj);
-            return ReturnObject(ReturnObj);
-        } else {
-
-            switch(Code) {
-                case INVALID_CREDENTIALS:
-                    return UnAuthorized(RESTAPI::Errors::InvalidCredentials, Code);
-                case PASSWORD_INVALID:
-                    return UnAuthorized(RESTAPI::Errors::InvalidPassword, Code);
-                case PASSWORD_ALREADY_USED:
-                    return UnAuthorized(RESTAPI::Errors::PasswordRejected, Code);
-                case USERNAME_PENDING_VERIFICATION:
-                    return UnAuthorized(RESTAPI::Errors::UserPendingVerification, Code);
-                case PASSWORD_CHANGE_REQUIRED:
-                    return UnAuthorized(RESTAPI::Errors::PasswordMustBeChanged, Code);
-                default:
-                    return UnAuthorized(RESTAPI::Errors::InvalidCredentials); break;
-            }
-            return;
-        }
-	}
-}
--- a/src/RESTAPI/RESTAPI_preferences.cpp
+++ b/src/RESTAPI/RESTAPI_preferences.cpp
@@ -1,36 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-16.
-//
-
-#include "RESTAPI_preferences.h"
-#include "StorageService.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_preferences::DoGet() {
-        SecurityObjects::Preferences    P;
-        Poco::JSON::Object  Answer;
-        StorageService()->PreferencesDB().GetPreferences(UserInfo_.userinfo.id, P);
-        P.to_json(Answer);
-        ReturnObject(Answer);
-    }
-
-    void RESTAPI_preferences::DoPut() {
-
-        SecurityObjects::Preferences    P;
-
-        auto RawObject = ParseStream();
-        if(!P.from_json(RawObject)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
-        P.id = UserInfo_.userinfo.id;
-        P.modified = std::time(nullptr);
-        StorageService()->PreferencesDB().SetPreferences(P);
-
-        Poco::JSON::Object  Answer;
-        P.to_json(Answer);
-        ReturnObject(Answer);
-    }
-
-}
--- a/src/RESTAPI/RESTAPI_preferences.h
+++ b/src/RESTAPI/RESTAPI_preferences.h
@@ -1,27 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-16.
-//
-
-#pragma once
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-    class RESTAPI_preferences : public RESTAPIHandler {
-    public:
-        RESTAPI_preferences(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>{
-            Poco::Net::HTTPRequest::HTTP_GET,
-            Poco::Net::HTTPRequest::HTTP_PUT,
-            Poco::Net::HTTPRequest::HTTP_OPTIONS},
-            Server,
-            TransactionId,
-            Internal) {}
-            static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/preferences"}; };
-        void DoGet() final;
-        void DoPut() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-    };
-}
--- a/src/RESTAPI/RESTAPI_routers.cpp
+++ b/src/RESTAPI/RESTAPI_routers.cpp
@@ -1,73 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-23.
-//
-
-#include "framework/MicroService.h"
-
-#include "RESTAPI/RESTAPI_oauth2_handler.h"
-#include "RESTAPI/RESTAPI_user_handler.h"
-#include "RESTAPI/RESTAPI_users_handler.h"
-#include "RESTAPI/RESTAPI_action_links.h"
-#include "RESTAPI/RESTAPI_system_endpoints_handler.h"
-#include "RESTAPI/RESTAPI_asset_server.h"
-#include "RESTAPI/RESTAPI_avatar_handler.h"
-#include "RESTAPI/RESTAPI_subavatar_handler.h"
-#include "RESTAPI/RESTAPI_email_handler.h"
-#include "RESTAPI/RESTAPI_sms_handler.h"
-#include "RESTAPI/RESTAPI_validate_token_handler.h"
-#include "RESTAPI/RESTAPI_preferences.h"
-#include "RESTAPI/RESTAPI_subpreferences.h"
-#include "RESTAPI/RESTAPI_suboauth2_handler.h"
-#include "RESTAPI/RESTAPI_subuser_handler.h"
-#include "RESTAPI/RESTAPI_subusers_handler.h"
-#include "RESTAPI/RESTAPI_validate_sub_token_handler.h"
-#include "RESTAPI/RESTAPI_submfa_handler.h"
-#include "RESTAPI/RESTAPI_totp_handler.h"
-#include "RESTAPI/RESTAPI_subtotp_handler.h"
-
-namespace OpenWifi {
-
-    Poco::Net::HTTPRequestHandler * RESTAPI_ExtRouter(const char *Path, RESTAPIHandler::BindingMap &Bindings,
-                                                            Poco::Logger & L, RESTAPI_GenericServer & S, uint64_t TransactionId) {
-        return RESTAPI_Router<
-            RESTAPI_oauth2_handler,
-            RESTAPI_users_handler,
-            RESTAPI_user_handler,
-            RESTAPI_system_command,
-            RESTAPI_asset_server,
-            RESTAPI_system_endpoints_handler,
-            RESTAPI_action_links,
-            RESTAPI_avatar_handler,
-            RESTAPI_subavatar_handler,
-            RESTAPI_email_handler,
-            RESTAPI_sms_handler,
-            RESTAPI_preferences,
-            RESTAPI_subpreferences,
-            RESTAPI_suboauth2_handler,
-            RESTAPI_subuser_handler,
-            RESTAPI_subusers_handler,
-            RESTAPI_submfa_handler,
-            RESTAPI_totp_handler,
-            RESTAPI_subtotp_handler
-        >(Path, Bindings, L, S,TransactionId);
-    }
-
-    Poco::Net::HTTPRequestHandler * RESTAPI_IntRouter(const char *Path, RESTAPIHandler::BindingMap &Bindings,
-                                                            Poco::Logger & L, RESTAPI_GenericServer & S, uint64_t TransactionId) {
-        return RESTAPI_Router_I<
-            RESTAPI_users_handler,
-            RESTAPI_user_handler,
-            RESTAPI_subuser_handler,
-            RESTAPI_subusers_handler,
-            RESTAPI_system_command,
-            RESTAPI_action_links,
-            RESTAPI_validate_token_handler,
-            RESTAPI_validate_sub_token_handler,
-            RESTAPI_sms_handler,
-            RESTAPI_preferences,
-            RESTAPI_subpreferences,
-            RESTAPI_suboauth2_handler,
-            RESTAPI_submfa_handler
-        >(Path, Bindings, L, S, TransactionId);
-    }
-}
--- a/src/RESTAPI/RESTAPI_sms_handler.cpp
+++ b/src/RESTAPI/RESTAPI_sms_handler.cpp
@@ -1,55 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-09.
-//
-
-#include "RESTAPI_sms_handler.h"
-#include "SMSSender.h"
-#include "framework/RESTAPI_errors.h"
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-
-    void OpenWifi::RESTAPI_sms_handler::DoPost() {
-        auto Obj = ParseStream();
-
-        std::string Arg;
-        if(HasParameter("validateNumber",Arg) && Arg=="true" && Obj->has("to")) {
-            auto Number = Obj->get("to").toString();
-            if(SMSSender()->StartValidation(Number, UserInfo_.userinfo.email)) {
-                return OK();
-            }
-            return BadRequest(RESTAPI::Errors::SMSCouldNotBeSentRetry);
-        }
-
-        std::string Code;
-        if( HasParameter("completeValidation",Arg) &&
-            Arg=="true" &&
-            HasParameter("validationCode", Code) &&
-            Obj->has("to")) {
-            auto Number = Obj->get("to").toString();
-            if(SMSSender()->CompleteValidation(Number, Code, UserInfo_.userinfo.email)) {
-                return OK();
-            }
-            return BadRequest(RESTAPI::Errors::SMSCouldNotValidate);
-        }
-
-        if( UserInfo_.userinfo.userRole!=SecurityObjects::ROOT &&
-            UserInfo_.userinfo.userRole!=SecurityObjects::PARTNER &&
-            UserInfo_.userinfo.userRole!=SecurityObjects::ADMIN) {
-            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights,ACCESS_DENIED);
-        }
-
-        if (Obj->has("to") &&
-            Obj->has("text")) {
-
-            std::string PhoneNumber = Obj->get("to").toString();
-            std::string Text = Obj->get("text").toString();
-            if(SMSSender()->Send(PhoneNumber, Text))
-                return OK();
-
-            return InternalError(RESTAPI::Errors::SMSCouldNotBeSentRetry);
-        }
-        BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-    }
-
-}
--- a/src/RESTAPI/RESTAPI_sms_handler.h
+++ b/src/RESTAPI/RESTAPI_sms_handler.h
@@ -1,25 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-09.
-//
-
-#pragma once
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-    class RESTAPI_sms_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_sms_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_POST,
-                                                  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                                  Server,
-                                                  TransactionId,
-                                                  Internal) {}
-                                                  static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/sms"};}
-        void DoGet() final {};
-        void DoPost() final;
-        void DoDelete() final {};
-        void DoPut() final {};
-    };
-}
--- a/src/RESTAPI/RESTAPI_subavatar_handler.cpp
+++ b/src/RESTAPI/RESTAPI_subavatar_handler.cpp
@@ -1,79 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-15.
-//
-
-#include <fstream>
-#include <iostream>
-
-#include "RESTAPI_subavatar_handler.h"
-#include "StorageService.h"
-#include "Poco/Net/HTMLForm.h"
-#include "framework/RESTAPI_protocol.h"
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-
-    void SubAvatarPartHandler::handlePart(const Poco::Net::MessageHeader &Header, std::istream &Stream) {
-        FileType_ = Header.get(RESTAPI::Protocol::CONTENTTYPE, RESTAPI::Protocol::UNSPECIFIED);
-        if (Header.has(RESTAPI::Protocol::CONTENTDISPOSITION)) {
-            std::string Disposition;
-            Poco::Net::NameValueCollection Parameters;
-            Poco::Net::MessageHeader::splitParameters(Header[RESTAPI::Protocol::CONTENTDISPOSITION], Disposition, Parameters);
-            Name_ = Parameters.get(RESTAPI::Protocol::NAME, RESTAPI::Protocol::UNNAMED);
-        }
-        Poco::CountingInputStream InputStream(Stream);
-        Poco::StreamCopier::copyStream(InputStream, OutputStream_);
-        Length_ = OutputStream_.str().size();
-    };
-
-    void RESTAPI_subavatar_handler::DoPost() {
-        std::string Id = UserInfo_.userinfo.id;
-        SecurityObjects::UserInfo UInfo;
-
-        std::stringstream SS;
-        SubAvatarPartHandler partHandler(Id, Logger_, SS);
-        Poco::Net::HTMLForm form(*Request, Request->stream(), partHandler);
-        Poco::JSON::Object Answer;
-
-        if (!partHandler.Name().empty() && partHandler.Length()< MicroService::instance().ConfigGetInt("openwifi.avatar.maxsize",2000000)) {
-            Answer.set(RESTAPI::Protocol::AVATARID, Id);
-            Answer.set(RESTAPI::Protocol::ERRORCODE, 0);
-            Logger_.information(Poco::format("Uploaded avatar: %s Type: %s", partHandler.Name(), partHandler.ContentType()));
-            StorageService()->SubAvatarDB().SetAvatar(UserInfo_.userinfo.email,
-                                 Id, SS.str(), partHandler.ContentType(), partHandler.Name());
-            StorageService()->SubDB().SetAvatar(Id,"1");
-        } else {
-            Answer.set(RESTAPI::Protocol::AVATARID, Id);
-            Answer.set(RESTAPI::Protocol::ERRORCODE, 13);
-            Answer.set(RESTAPI::Protocol::ERRORTEXT, "Avatar upload could not complete.");
-        }
-        ReturnObject(Answer);
-    }
-
-    void RESTAPI_subavatar_handler::DoGet() {
-        std::string Id = GetBinding(RESTAPI::Protocol::ID, "");
-        if (Id.empty()) {
-            return NotFound();
-        }
-
-        std::string Type, Name, AvatarContent;
-        if (!StorageService()->SubAvatarDB().GetAvatar(UserInfo_.userinfo.email, Id, AvatarContent, Type, Name)) {
-            return NotFound();
-        }
-        return SendFileContent(AvatarContent, Type, Name);
-    }
-
-    void RESTAPI_subavatar_handler::DoDelete() {
-        std::string Id = GetBinding(RESTAPI::Protocol::ID, "");
-
-        if(UserInfo_.userinfo.userRole!=SecurityObjects::ROOT && Id!=UserInfo_.userinfo.id) {
-            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
-        }
-
-        if (!StorageService()->SubAvatarDB().DeleteAvatar(UserInfo_.userinfo.email, Id)) {
-            return NotFound();
-        }
-        StorageService()->SubDB().SetAvatar(Id,"");
-        OK();
-    }
-}
--- a/src/RESTAPI/RESTAPI_subavatar_handler.h
+++ b/src/RESTAPI/RESTAPI_subavatar_handler.h
@@ -1,51 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-15.
-//
-#pragma once
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-
-    class SubAvatarPartHandler : public Poco::Net::PartHandler {
-    public:
-        SubAvatarPartHandler(std::string Id, Poco::Logger &Logger, std::stringstream & ofs) :
-                Id_(std::move(Id)),
-                Logger_(Logger),
-                OutputStream_(ofs){
-        }
-        void handlePart(const Poco::Net::MessageHeader &Header, std::istream &Stream);
-        [[nodiscard]] uint64_t Length() const { return Length_; }
-        [[nodiscard]] std::string &Name() { return Name_; }
-        [[nodiscard]] std::string &ContentType() { return FileType_; }
-
-    private:
-        uint64_t        Length_ = 0;
-        std::string     FileType_;
-        std::string     Name_;
-        std::string     Id_;
-        Poco::Logger    &Logger_;
-        std::stringstream &OutputStream_;
-    };
-
-    class RESTAPI_subavatar_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_subavatar_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
-                : RESTAPIHandler(bindings, L,
-                                 std::vector<std::string>{
-                                         Poco::Net::HTTPRequest::HTTP_GET,
-                                         Poco::Net::HTTPRequest::HTTP_POST,
-                                         Poco::Net::HTTPRequest::HTTP_DELETE,
-                                         Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                         Server,
-                                         TransactionId,
-                                         Internal) {}
-        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/subavatar/{id}"}; };
-
-        void DoGet() final;
-        void DoPost() final;
-        void DoDelete() final;
-        void DoPut() final {};
-
-    };
-}
--- a/src/RESTAPI/RESTAPI_submfa_handler.cpp
+++ b/src/RESTAPI/RESTAPI_submfa_handler.cpp
@@ -1,129 +0,0 @@
-//
-// Created by stephane bourque on 2021-12-01.
-//
-
-#include "RESTAPI_submfa_handler.h"
-#include "StorageService.h"
-#include "SMSSender.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_submfa_handler::DoGet() {
-        SecurityObjects::UserInfo   User;
-
-        // std::cout << "submfa get " << UserInfo_.userinfo.Id << "   user:" << UserInfo_.userinfo.email << std::endl;
-        if (StorageService()->SubDB().GetUserById(UserInfo_.userinfo.id,User)) {
-            Poco::JSON::Object              Answer;
-            SecurityObjects::SubMfaConfig   MFC;
-
-            MFC.id = User.id;
-            if(User.userTypeProprietaryInfo.mfa.enabled) {
-                if(User.userTypeProprietaryInfo.mfa.method == "sms") {
-                    MFC.sms = User.userTypeProprietaryInfo.mobiles[0].number;
-                    MFC.type = "sms";
-                } else if(User.userTypeProprietaryInfo.mfa.method == "email") {
-                    MFC.email = User.email;
-                    MFC.type = "email";
-                }
-            } else {
-                MFC.type = "disabled";
-            }
-            MFC.to_json(Answer);
-            return ReturnObject(Answer);
-        }
-        NotFound();
-    }
-
-    void RESTAPI_submfa_handler::DoPut() {
-
-        try {
-            auto Body = ParseStream();
-
-            SecurityObjects::SubMfaConfig MFC;
-
-            if (!MFC.from_json(Body)) {
-                return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-            }
-
-            if (MFC.type == "disabled") {
-                SecurityObjects::UserInfo User;
-                StorageService()->SubDB().GetUserById(UserInfo_.userinfo.id, User);
-                User.userTypeProprietaryInfo.mfa.enabled = false;
-                StorageService()->SubDB().UpdateUserInfo(UserInfo_.userinfo.email, UserInfo_.userinfo.id, User);
-
-                Poco::JSON::Object Answer;
-                MFC.to_json(Answer);
-                return ReturnObject(Answer);
-            } else if (MFC.type == "email") {
-                SecurityObjects::UserInfo User;
-
-                StorageService()->SubDB().GetUserById(UserInfo_.userinfo.id, User);
-                User.userTypeProprietaryInfo.mfa.enabled = true;
-                User.userTypeProprietaryInfo.mfa.method = "email";
-                StorageService()->SubDB().UpdateUserInfo(UserInfo_.userinfo.email, UserInfo_.userinfo.id, User);
-
-                MFC.sms = MFC.sms;
-                MFC.type = "email";
-                MFC.email = UserInfo_.userinfo.email;
-                MFC.id = MicroService::instance().CreateUUID();
-
-                Poco::JSON::Object Answer;
-                MFC.to_json(Answer);
-                return ReturnObject(Answer);
-
-            } else if (MFC.type == "sms") {
-                if (GetBoolParameter("startValidation", false)) {
-                    if (MFC.sms.empty()) {
-                        return BadRequest("Missing phone number");
-                    }
-
-                    if (SMSSender()->StartValidation(MFC.sms, UserInfo_.userinfo.email)) {
-                        return OK();
-                    } else {
-                        return InternalError("SMS could not be sent. Verify the number or try again later.");
-                    }
-                } else if (GetBoolParameter("completeValidation", false)) {
-                    auto ChallengeCode = GetParameter("challengeCode", "");
-                    if (ChallengeCode.empty()) {
-                        return BadRequest("Missing 'challengeCode'");
-                    }
-                    if (MFC.sms.empty()) {
-                        return BadRequest("Missing phone number");
-                    }
-                    if (SMSSender()->CompleteValidation(MFC.sms, ChallengeCode, UserInfo_.userinfo.email)) {
-                        SecurityObjects::UserInfo User;
-
-                        StorageService()->SubDB().GetUserById(UserInfo_.userinfo.id, User);
-                        User.userTypeProprietaryInfo.mfa.enabled = true;
-                        User.userTypeProprietaryInfo.mfa.method = "sms";
-                        SecurityObjects::MobilePhoneNumber PhoneNumber;
-                        PhoneNumber.number = MFC.sms;
-                        PhoneNumber.primary = true;
-                        PhoneNumber.verified = true;
-                        User.userTypeProprietaryInfo.mobiles.clear();
-                        User.userTypeProprietaryInfo.mobiles.push_back(PhoneNumber);
-
-                        StorageService()->SubDB().UpdateUserInfo(UserInfo_.userinfo.email, UserInfo_.userinfo.id, User);
-
-                        MFC.sms = MFC.sms;
-                        MFC.type = "sms";
-                        MFC.email = UserInfo_.userinfo.email;
-                        MFC.id = MicroService::instance().CreateUUID();
-
-                        Poco::JSON::Object Answer;
-                        MFC.to_json(Answer);
-
-                        return ReturnObject(Answer);
-
-                    } else {
-                        return InternalError("SMS could not be sent. Verify the number or try again later.");
-                    }
-                }
-            }
-        } catch (const Poco::Exception &E) {
-            Logger_.log(E);
-        }
-        return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-    }
-
-}
--- a/src/RESTAPI/RESTAPI_submfa_handler.h
+++ b/src/RESTAPI/RESTAPI_submfa_handler.h
@@ -1,27 +0,0 @@
-//
-// Created by stephane bourque on 2021-12-01.
-//
-
-#pragma once
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-    class RESTAPI_submfa_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_submfa_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_PUT,
-                                                  Poco::Net::HTTPRequest::HTTP_GET,
-                                                  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                                  Server,
-                                                  TransactionId,
-                                                  Internal, true, false , RateLimit{.Interval=1000,.MaxCalls=10},
-                                                  true) {}
-                                                  static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/submfa"}; };
-        void DoGet() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-        void DoPut() final ;
-    };
-}
--- a/src/RESTAPI/RESTAPI_suboauth2_handler.cpp
+++ b/src/RESTAPI/RESTAPI_suboauth2_handler.cpp
@@ -1,153 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#include "RESTAPI_suboauth2_handler.h"
-#include "AuthService.h"
-#include "MFAServer.h"
-#include "framework/RESTAPI_protocol.h"
-#include "framework/MicroService.h"
-#include "StorageService.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_suboauth2_handler::DoGet() {
-        bool Expired = false, Contacted = false;
-        if (!IsAuthorized(Expired, Contacted, true)) {
-            if(Expired)
-                return UnAuthorized(RESTAPI::Errors::ExpiredToken,EXPIRED_TOKEN);
-            return UnAuthorized(RESTAPI::Errors::MissingAuthenticationInformation, INVALID_TOKEN);
-        }
-        bool GetMe = GetBoolParameter(RESTAPI::Protocol::ME, false);
-        if(GetMe) {
-            Logger_.information(Poco::format("REQUEST-ME(%s): Request for %s", Request->clientAddress().toString(),
-                                             UserInfo_.userinfo.email));
-            Poco::JSON::Object Me;
-            SecurityObjects::UserInfo   ReturnedUser = UserInfo_.userinfo;
-            Sanitize(UserInfo_, ReturnedUser);
-            ReturnedUser.to_json(Me);
-            return ReturnObject(Me);
-        }
-        BadRequest(RESTAPI::Errors::UnrecognizedRequest);
-    }
-
-    void RESTAPI_suboauth2_handler::DoDelete() {
-        bool Expired = false, Contacted = false;
-        if (!IsAuthorized(Expired, Contacted, true)) {
-            if(Expired)
-                return UnAuthorized(RESTAPI::Errors::ExpiredToken,EXPIRED_TOKEN);
-            return UnAuthorized(RESTAPI::Errors::MissingAuthenticationInformation, INVALID_TOKEN);
-        }
-
-        auto Token = GetBinding(RESTAPI::Protocol::TOKEN, "...");
-        if (Token == SessionToken_) {
-            AuthService()->SubLogout(Token);
-            return ReturnStatus(Poco::Net::HTTPResponse::HTTP_NO_CONTENT, true);
-        }
-
-        Logger_.information(Poco::format("BAD-LOGOUT(%s): Request for %s", Request->clientAddress().toString(), UserInfo_.userinfo.email));
-        NotFound();
-    }
-
-    void RESTAPI_suboauth2_handler::DoPost() {
-        auto Obj = ParseStream();
-        auto userId = GetS(RESTAPI::Protocol::USERID, Obj);
-        auto password = GetS(RESTAPI::Protocol::PASSWORD, Obj);
-        auto newPassword = GetS(RESTAPI::Protocol::NEWPASSWORD, Obj);
-
-        Poco::toLowerInPlace(userId);
-
-        if(GetBoolParameter(RESTAPI::Protocol::REQUIREMENTS, false)) {
-            Logger_.information(Poco::format("POLICY-REQUEST(%s): Request.", Request->clientAddress().toString()));
-            Poco::JSON::Object  Answer;
-            Answer.set(RESTAPI::Protocol::PASSWORDPATTERN, AuthService()->SubPasswordValidationExpression());
-            Answer.set(RESTAPI::Protocol::ACCESSPOLICY, AuthService()->GetSubAccessPolicy());
-            Answer.set(RESTAPI::Protocol::PASSWORDPOLICY, AuthService()->GetSubPasswordPolicy());
-            return ReturnObject(Answer);
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::FORGOTPASSWORD,false)) {
-            SecurityObjects::UserInfo UInfo1;
-            auto UserExists = StorageService()->SubDB().GetUserByEmail(userId,UInfo1);
-            if(UserExists) {
-                Logger_.information(Poco::format("FORGOTTEN-PASSWORD(%s): Request for %s", Request->clientAddress().toString(), userId));
-                SecurityObjects::ActionLink NewLink;
-
-                NewLink.action = OpenWifi::SecurityObjects::LinkActions::SUB_FORGOT_PASSWORD;
-                NewLink.id = MicroService::CreateUUID();
-                NewLink.userId = UInfo1.id;
-                NewLink.created = std::time(nullptr);
-                NewLink.expires = NewLink.created + (24*60*60);
-                NewLink.userAction = false;
-                StorageService()->ActionLinksDB().CreateAction(NewLink);
-
-                Poco::JSON::Object ReturnObj;
-                SecurityObjects::UserInfoAndPolicy UInfo;
-                UInfo.webtoken.userMustChangePassword = true;
-                UInfo.webtoken.to_json(ReturnObj);
-                return ReturnObject(ReturnObj);
-            } else {
-                Poco::JSON::Object ReturnObj;
-                SecurityObjects::UserInfoAndPolicy UInfo;
-                UInfo.webtoken.userMustChangePassword = true;
-                UInfo.webtoken.to_json(ReturnObj);
-                return ReturnObject(ReturnObj);
-            }
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::RESENDMFACODE,false)) {
-            Logger_.information(Poco::format("RESEND-MFA-CODE(%s): Request for %s", Request->clientAddress().toString(), userId));
-            if(Obj->has("uuid")) {
-                auto uuid = Obj->get("uuid").toString();
-                if(MFAServer()->ResendCode(uuid))
-                    return OK();
-            }
-            return UnAuthorized(RESTAPI::Errors::InvalidCredentials, BAD_MFA_TRANSACTION);
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::COMPLETEMFACHALLENGE,false)) {
-            Logger_.information(Poco::format("COMPLETE-MFA-CHALLENGE(%s): Request for %s", Request->clientAddress().toString(), userId));
-            if(Obj->has("uuid") && Obj->has("answer")) {
-                SecurityObjects::UserInfoAndPolicy UInfo;
-                if(MFAServer()->CompleteMFAChallenge(Obj,UInfo)) {
-                    Poco::JSON::Object ReturnObj;
-                    UInfo.webtoken.to_json(ReturnObj);
-                    return ReturnObject(ReturnObj);
-                }
-            }
-            return UnAuthorized(RESTAPI::Errors::InvalidCredentials, MFA_FAILURE);
-        }
-
-        SecurityObjects::UserInfoAndPolicy UInfo;
-        bool Expired=false;
-        auto Code=AuthService()->AuthorizeSub(userId, password, newPassword, UInfo, Expired);
-        if (Code==SUCCESS) {
-            Poco::JSON::Object ReturnObj;
-            if(AuthService()->RequiresMFA(UInfo)) {
-                if(MFAServer()->StartMFAChallenge(UInfo, ReturnObj)) {
-                    return ReturnObject(ReturnObj);
-                }
-                Logger_.warning("MFA Seems to be broken. Please fix. Disabling MFA checking for now.");
-            }
-            UInfo.webtoken.to_json(ReturnObj);
-            return ReturnObject(ReturnObj);
-        } else {
-            switch(Code) {
-                case INVALID_CREDENTIALS:
-                    return UnAuthorized(RESTAPI::Errors::InvalidCredentials, Code);
-                case PASSWORD_INVALID:
-                    return UnAuthorized(RESTAPI::Errors::InvalidPassword, Code);
-                case PASSWORD_ALREADY_USED:
-                    return UnAuthorized(RESTAPI::Errors::PasswordRejected, Code);
-                case USERNAME_PENDING_VERIFICATION:
-                    return UnAuthorized(RESTAPI::Errors::UserPendingVerification, Code);
-                case PASSWORD_CHANGE_REQUIRED:
-                    return UnAuthorized(RESTAPI::Errors::PasswordMustBeChanged, Code);
-                default:
-                    return UnAuthorized(RESTAPI::Errors::InvalidCredentials); break;
-            }
-            return;
-        }
-    }
-}
--- a/src/RESTAPI/RESTAPI_suboauth2_handler.h
+++ b/src/RESTAPI/RESTAPI_suboauth2_handler.h
@@ -1,27 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#pragma once
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-    class RESTAPI_suboauth2_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_suboauth2_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_POST,
-                                                  Poco::Net::HTTPRequest::HTTP_DELETE,
-                                                  Poco::Net::HTTPRequest::HTTP_GET,
-                                                  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                                  Server,
-                                                  TransactionId,
-                                                  Internal, false, false , RateLimit{.Interval=1000,.MaxCalls=10},
-                                                  false) {}
-                                                  static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/suboauth2/{token}","/api/v1/suboauth2"}; };
-        void DoGet() final;
-        void DoPost() final;
-        void DoDelete() final;
-        void DoPut() final {};
-    };
-}
--- a/src/RESTAPI/RESTAPI_subpreferences.cpp
+++ b/src/RESTAPI/RESTAPI_subpreferences.cpp
@@ -1,36 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-16.
-//
-
-#include "RESTAPI_subpreferences.h"
-#include "StorageService.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_subpreferences::DoGet() {
-        SecurityObjects::Preferences    P;
-        Poco::JSON::Object  Answer;
-        StorageService()->SubPreferencesDB().GetPreferences(UserInfo_.userinfo.id, P);
-        P.to_json(Answer);
-        ReturnObject(Answer);
-    }
-
-    void RESTAPI_subpreferences::DoPut() {
-
-        SecurityObjects::Preferences    P;
-
-        auto RawObject = ParseStream();
-        if(!P.from_json(RawObject)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
-        P.id = UserInfo_.userinfo.id;
-        P.modified = std::time(nullptr);
-        StorageService()->SubPreferencesDB().SetPreferences(P);
-
-        Poco::JSON::Object  Answer;
-        P.to_json(Answer);
-        ReturnObject(Answer);
-    }
-
-}
--- a/src/RESTAPI/RESTAPI_subpreferences.h
+++ b/src/RESTAPI/RESTAPI_subpreferences.h
@@ -1,27 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-16.
-//
-
-#pragma once
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-    class RESTAPI_subpreferences : public RESTAPIHandler {
-    public:
-        RESTAPI_subpreferences(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>{
-            Poco::Net::HTTPRequest::HTTP_GET,
-            Poco::Net::HTTPRequest::HTTP_PUT,
-            Poco::Net::HTTPRequest::HTTP_OPTIONS},
-            Server,
-            TransactionId,
-            Internal) {}
-            static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/subpreferences"}; };
-        void DoGet() final;
-        void DoPut() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-    };
-}
--- a/src/RESTAPI/RESTAPI_subtotp_handler.cpp
+++ b/src/RESTAPI/RESTAPI_subtotp_handler.cpp
@@ -1,38 +0,0 @@
-//
-// Created by stephane bourque on 2022-01-31.
-//
-
-#include "RESTAPI_subtotp_handler.h"
-
-#include "TotpCache.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_subtotp_handler::DoGet() {
-
-        auto Reset = GetBoolParameter("reset",false);
-        std::string QRCode;
-
-        if(TotpCache()->StartValidation(UserInfo_.userinfo,true,QRCode,Reset)) {
-            return SendFileContent(QRCode, "image/svg+xml","qrcode.svg");
-        }
-        return BadRequest(RESTAPI::Errors::InvalidCommand);
-    }
-
-    void RESTAPI_subtotp_handler::DoPut() {
-        auto Value = GetParameter("value","");
-        auto nextIndex = GetParameter("index",0);
-        bool moreCodes=false;
-
-        uint64_t ErrorCode = 0;
-        std::string ErrorText;
-        if(TotpCache()->ContinueValidation(UserInfo_.userinfo,true,Value,nextIndex,moreCodes, ErrorCode, ErrorText )) {
-            Poco::JSON::Object Answer;
-            Answer.set("nextIndex", nextIndex);
-            Answer.set("moreCodes", moreCodes);
-            return ReturnObject(Answer);
-        }
-        return BadRequest(ErrorCode, ErrorText);
-    }
-
-}
--- a/src/RESTAPI/RESTAPI_subtotp_handler.h
+++ b/src/RESTAPI/RESTAPI_subtotp_handler.h
@@ -1,29 +0,0 @@
-//
-// Created by stephane bourque on 2022-01-31.
-//
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-    class RESTAPI_subtotp_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_subtotp_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
-                : RESTAPIHandler(bindings, L,
-                                 std::vector<std::string>
-                                         {
-                                                 Poco::Net::HTTPRequest::HTTP_GET,
-                                                 Poco::Net::HTTPRequest::HTTP_PUT,
-                                                 Poco::Net::HTTPRequest::HTTP_OPTIONS
-                                         },
-                                 Server,
-                                 TransactionId,
-                                 Internal) {}
-        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/subtotp"}; };
-        void DoGet() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-        void DoPut() final;
-    private:
-
-    };
-}
--- a/src/RESTAPI/RESTAPI_subuser_handler.cpp
+++ b/src/RESTAPI/RESTAPI_subuser_handler.cpp
@@ -1,259 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#include "RESTAPI_subuser_handler.h"
-#include "StorageService.h"
-#include "framework/RESTAPI_errors.h"
-#include "SMSSender.h"
-#include "ACLProcessor.h"
-#include "AuthService.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
-#include "MFAServer.h"
-#include "TotpCache.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_subuser_handler::DoGet() {
-        std::string Id = GetBinding("id", "");
-        if(Id.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUserID);
-        }
-
-        Poco::toLowerInPlace(Id);
-        std::string Arg;
-        SecurityObjects::UserInfo   UInfo;
-        if(HasParameter("byEmail",Arg) && Arg=="true") {
-            if(!StorageService()->SubDB().GetUserByEmail(Id,UInfo)) {
-                return NotFound();
-            }
-        } else if(!StorageService()->SubDB().GetUserById(Id,UInfo)) {
-            return NotFound();
-        }
-
-        Poco::JSON::Object  UserInfoObject;
-        Sanitize(UserInfo_, UInfo);
-        UInfo.to_json(UserInfoObject);
-        ReturnObject(UserInfoObject);
-    }
-
-    void RESTAPI_subuser_handler::DoDelete() {
-        std::string Id = GetBinding("id", "");
-        if(Id.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUserID);
-        }
-
-        SecurityObjects::UserInfo TargetUser;
-        if(!StorageService()->SubDB().GetUserById(Id,TargetUser)) {
-            return NotFound();
-        }
-
-        if(TargetUser.userRole != SecurityObjects::SUBSCRIBER) {
-            return BadRequest(RESTAPI::Errors::InvalidUserRole);
-        }
-
-        if(!ACLProcessor::Can(UserInfo_.userinfo, TargetUser,ACLProcessor::DELETE)) {
-            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
-        }
-
-        if(!StorageService()->SubDB().DeleteUser(UserInfo_.userinfo.email,Id)) {
-            return NotFound();
-        }
-
-        AuthService()->DeleteSubUserFromCache(Id);
-        StorageService()->SubTokenDB().RevokeAllTokens(TargetUser.email);
-        StorageService()->SubPreferencesDB().DeleteRecord("id", Id);
-        StorageService()->SubAvatarDB().DeleteRecord("id", Id);
-        Logger_.information(Poco::format("User '%s' deleted by '%s'.",Id,UserInfo_.userinfo.email));
-        OK();
-    }
-
-    void RESTAPI_subuser_handler::DoPost() {
-        std::string Id = GetBinding("id", "");
-        if(Id!="0") {
-            return BadRequest(RESTAPI::Errors::IdMustBe0);
-        }
-
-        SecurityObjects::UserInfo   NewUser;
-        RESTAPI_utils::from_request(NewUser,*Request);
-        if(NewUser.userRole == SecurityObjects::UNKNOWN || NewUser.userRole != SecurityObjects::SUBSCRIBER) {
-            return BadRequest(RESTAPI::Errors::EntityMustExist);
-        }
-
-        if(!ACLProcessor::Can(UserInfo_.userinfo,NewUser,ACLProcessor::CREATE)) {
-            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
-        }
-
-        Poco::toLowerInPlace(NewUser.email);
-        if(!Utils::ValidEMailAddress(NewUser.email)) {
-            return BadRequest(RESTAPI::Errors::InvalidEmailAddress);
-        }
-
-        if(!NewUser.currentPassword.empty()) {
-            if(!AuthService()->ValidateSubPassword(NewUser.currentPassword)) {
-                return BadRequest(RESTAPI::Errors::InvalidPassword);
-            }
-        }
-
-        if(NewUser.name.empty())
-            NewUser.name = NewUser.email;
-
-        //  You cannot enable MFA during user creation
-        NewUser.userTypeProprietaryInfo.mfa.enabled = false;
-        NewUser.userTypeProprietaryInfo.mfa.method = "";
-        NewUser.userTypeProprietaryInfo.mobiles.clear();
-        NewUser.userTypeProprietaryInfo.authenticatorSecret.clear();
-
-        if(!StorageService()->SubDB().CreateUser(NewUser.email, NewUser)) {
-            Logger_.information(Poco::format("Could not add user '%s'.",NewUser.email));
-            return BadRequest(RESTAPI::Errors::RecordNotCreated);
-        }
-
-        if(GetParameter("email_verification","false")=="true") {
-            if(AuthService::VerifySubEmail(NewUser))
-                Logger_.information(Poco::format("Verification e-mail requested for %s",NewUser.email));
-            StorageService()->SubDB().UpdateUserInfo(UserInfo_.userinfo.email,NewUser.id,NewUser);
-        }
-
-        if(!StorageService()->SubDB().GetUserByEmail(NewUser.email, NewUser)) {
-            Logger_.information(Poco::format("User '%s' but not retrieved.",NewUser.email));
-            return NotFound();
-        }
-
-        Poco::JSON::Object  UserInfoObject;
-        Sanitize(UserInfo_, NewUser);
-        NewUser.to_json(UserInfoObject);
-        ReturnObject(UserInfoObject);
-        Logger_.information(Poco::format("User '%s' has been added by '%s')",NewUser.email, UserInfo_.userinfo.email));
-    }
-
-    void RESTAPI_subuser_handler::DoPut() {
-        std::string Id = GetBinding("id", "");
-        if(Id.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUserID);
-        }
-
-        SecurityObjects::UserInfo   Existing;
-        if(!StorageService()->SubDB().GetUserById(Id,Existing)) {
-            return NotFound();
-        }
-
-        if(!ACLProcessor::Can(UserInfo_.userinfo,Existing,ACLProcessor::MODIFY)) {
-            return UnAuthorized("Insufficient access rights.", ACCESS_DENIED);
-        }
-
-        SecurityObjects::UserInfo   NewUser;
-        auto RawObject = ParseStream();
-        if(!NewUser.from_json(RawObject)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
-        // some basic validations
-        if(RawObject->has("userRole") &&
-            (SecurityObjects::UserTypeFromString(RawObject->get("userRole").toString())==SecurityObjects::UNKNOWN ||
-            SecurityObjects::UserTypeFromString(RawObject->get("userRole").toString())==SecurityObjects::SUBSCRIBER)) {
-            return BadRequest(RESTAPI::Errors::InvalidUserRole);
-        }
-
-        // The only valid things to change are: changePassword, name,
-        AssignIfPresent(RawObject,"name", Existing.name);
-        AssignIfPresent(RawObject,"description", Existing.description);
-        AssignIfPresent(RawObject,"owner", Existing.owner);
-        AssignIfPresent(RawObject,"location", Existing.location);
-        AssignIfPresent(RawObject,"locale", Existing.locale);
-        AssignIfPresent(RawObject,"changePassword", Existing.changePassword);
-        AssignIfPresent(RawObject,"suspended", Existing.suspended);
-        AssignIfPresent(RawObject,"blackListed", Existing.blackListed);
-
-        if(RawObject->has("userRole")) {
-            auto NewRole = SecurityObjects::UserTypeFromString(RawObject->get("userRole").toString());
-            if(NewRole!=Existing.userRole) {
-                if(UserInfo_.userinfo.userRole!=SecurityObjects::ROOT && NewRole==SecurityObjects::ROOT) {
-                    return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
-                }
-                if(Id==UserInfo_.userinfo.id) {
-                    return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
-                }
-                Existing.userRole = NewRole;
-            }
-        }
-
-        if(RawObject->has("notes")) {
-            SecurityObjects::NoteInfoVec NIV;
-            NIV = RESTAPI_utils::to_object_array<SecurityObjects::NoteInfo>(RawObject->get("notes").toString());
-            for(auto const &i:NIV) {
-                SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UserInfo_.userinfo.email, .note=i.note};
-                Existing.notes.push_back(ii);
-            }
-        }
-        if(RawObject->has("currentPassword")) {
-            if(!AuthService()->ValidateSubPassword(RawObject->get("currentPassword").toString())) {
-                return BadRequest(RESTAPI::Errors::InvalidPassword);
-            }
-            if(!AuthService()->SetPassword(RawObject->get("currentPassword").toString(),Existing)) {
-                return BadRequest(RESTAPI::Errors::PasswordRejected);
-            }
-        }
-
-        if(GetParameter("email_verification","false")=="true") {
-            if(AuthService::VerifySubEmail(Existing))
-                Logger_.information(Poco::format("Verification e-mail requested for %s",Existing.email));
-        }
-
-        if(RawObject->has("userTypeProprietaryInfo")) {
-            if(NewUser.userTypeProprietaryInfo.mfa.enabled) {
-                if (!MFAMETHODS::Validate(NewUser.userTypeProprietaryInfo.mfa.method)) {
-                    return BadRequest(RESTAPI::Errors::BadMFAMethod);
-                }
-
-                bool ChangingMFA =
-                        NewUser.userTypeProprietaryInfo.mfa.enabled && !Existing.userTypeProprietaryInfo.mfa.enabled;
-                Existing.userTypeProprietaryInfo.mfa.enabled = NewUser.userTypeProprietaryInfo.mfa.enabled;
-
-                auto PropInfo = RawObject->get("userTypeProprietaryInfo");
-                if (ChangingMFA && NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::SMS) {
-                    auto PInfo = PropInfo.extract<Poco::JSON::Object::Ptr>();
-                    if (PInfo->isArray("mobiles")) {
-                        Existing.userTypeProprietaryInfo.mobiles = NewUser.userTypeProprietaryInfo.mobiles;
-                    }
-                    if (NewUser.userTypeProprietaryInfo.mobiles.empty() ||
-                        !SMSSender()->IsNumberValid(NewUser.userTypeProprietaryInfo.mobiles[0].number,
-                                                    UserInfo_.userinfo.email)) {
-                        return BadRequest(RESTAPI::Errors::NeedMobileNumber);
-                    }
-                    Existing.userTypeProprietaryInfo.authenticatorSecret.clear();
-                } else if (ChangingMFA && NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::AUTHENTICATOR) {
-                    std::string Secret;
-                    Existing.userTypeProprietaryInfo.mobiles.clear();
-                    if(Existing.userTypeProprietaryInfo.authenticatorSecret.empty() && TotpCache()->CompleteValidation(UserInfo_.userinfo,false,Secret)) {
-                        Existing.userTypeProprietaryInfo.authenticatorSecret = Secret;
-                    } else if (!Existing.userTypeProprietaryInfo.authenticatorSecret.empty()) {
-                        // we allow someone to use their old secret
-                    } else {
-                        return BadRequest(RESTAPI::Errors::AuthenticatorVerificationIncomplete);
-                    }
-                } else if (ChangingMFA && NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::EMAIL) {
-                    // nothing to do for email.
-                    Existing.userTypeProprietaryInfo.mobiles.clear();
-                    Existing.userTypeProprietaryInfo.authenticatorSecret.clear();
-                }
-                Existing.userTypeProprietaryInfo.mfa.method = NewUser.userTypeProprietaryInfo.mfa.method;
-                Existing.userTypeProprietaryInfo.mfa.enabled = true;
-            } else {
-                Existing.userTypeProprietaryInfo.authenticatorSecret.clear();
-                Existing.userTypeProprietaryInfo.mobiles.clear();
-                Existing.userTypeProprietaryInfo.mfa.enabled = false;
-            }
-        }
-
-        if(StorageService()->SubDB().UpdateUserInfo(UserInfo_.userinfo.email,Id,Existing)) {
-            SecurityObjects::UserInfo   NewUserInfo;
-            StorageService()->SubDB().GetUserById(Id,NewUserInfo);
-            Poco::JSON::Object  ModifiedObject;
-            Sanitize(UserInfo_, NewUserInfo);
-            NewUserInfo.to_json(ModifiedObject);
-            return ReturnObject(ModifiedObject);
-        }
-        BadRequest(RESTAPI::Errors::RecordNotUpdated);
-    }
-}
--- a/src/RESTAPI/RESTAPI_subuser_handler.h
+++ b/src/RESTAPI/RESTAPI_subuser_handler.h
@@ -1,31 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#pragma once
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-    class RESTAPI_subuser_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_subuser_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>
-                         {Poco::Net::HTTPRequest::HTTP_POST,
-                          Poco::Net::HTTPRequest::HTTP_GET,
-                          Poco::Net::HTTPRequest::HTTP_PUT,
-                          Poco::Net::HTTPRequest::HTTP_DELETE,
-                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                          Server,
-                          TransactionId,
-                          Internal) {}
-                          static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/subuser/{id}"}; };
-        void DoGet() final;
-        void DoPost() final;
-        void DoDelete() final;
-        void DoPut() final;
-    private:
-
-    };
-}
--- a/src/RESTAPI/RESTAPI_subusers_handler.cpp
+++ b/src/RESTAPI/RESTAPI_subusers_handler.cpp
@@ -1,55 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#include "RESTAPI_subusers_handler.h"
-#include "StorageService.h"
-#include "framework/RESTAPI_protocol.h"
-#include "framework/MicroService.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_subusers_handler::DoGet() {
-        std::vector<SecurityObjects::UserInfo> Users;
-        bool IdOnly = (GetParameter("idOnly","false")=="true");
-
-        if(QB_.Select.empty()) {
-            Poco::JSON::Array ArrayObj;
-            Poco::JSON::Object Answer;
-            if (StorageService()->SubDB().GetUsers(QB_.Offset, QB_.Limit, Users)) {
-                for (auto &i : Users) {
-                    Poco::JSON::Object Obj;
-                    if (IdOnly) {
-                        ArrayObj.add(i.id);
-                    } else {
-                        Sanitize(UserInfo_, i);
-                        i.to_json(Obj);
-                        ArrayObj.add(Obj);
-                    }
-                }
-                Answer.set(RESTAPI::Protocol::USERS, ArrayObj);
-            }
-            return ReturnObject(Answer);
-        } else {
-            Poco::JSON::Array ArrayObj;
-            for(auto &i:SelectedRecords()) {
-                SecurityObjects::UserInfo   UInfo;
-                auto tI{i};
-                if(StorageService()->SubDB().GetUserById(tI,UInfo)) {
-                    Poco::JSON::Object Obj;
-                    if (IdOnly) {
-                        ArrayObj.add(UInfo.id);
-                    } else {
-                        Sanitize(UserInfo_, UInfo);
-                        UInfo.to_json(Obj);
-                        ArrayObj.add(Obj);
-                    }
-                }
-            }
-            Poco::JSON::Object RetObj;
-            RetObj.set(RESTAPI::Protocol::USERS, ArrayObj);
-            return ReturnObject(RetObj);
-        }
-    }
-}
--- a/src/RESTAPI/RESTAPI_subusers_handler.h
+++ b/src/RESTAPI/RESTAPI_subusers_handler.h
@@ -1,26 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#pragma once
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-    class RESTAPI_subusers_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_subusers_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>
-                         {Poco::Net::HTTPRequest::HTTP_GET,
-                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                          Server,
-                          TransactionId,
-                          Internal) {}
-        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/subusers"}; };
-        void DoGet() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-        void DoPut() final {};
-    };
-};
--- a/src/RESTAPI/RESTAPI_system_endpoints_handler.cpp
+++ b/src/RESTAPI/RESTAPI_system_endpoints_handler.cpp
@@ -1,24 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-01.
-//
-
-#include "RESTAPI_system_endpoints_handler.h"
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_system_endpoints_handler::DoGet() {
-        auto Services = MicroService::instance().GetServices();
-        SecurityObjects::SystemEndpointList L;
-        for(const auto &i:Services) {
-            SecurityObjects::SystemEndpoint S{
-                .type = i.Type,
-                .id = i.Id,
-                .uri = i.PublicEndPoint};
-            L.endpoints.push_back(S);
-        }
-        Poco::JSON::Object  Obj;
-        L.to_json(Obj);
-        ReturnObject(Obj);
-    }
-}
--- a/src/RESTAPI/RESTAPI_system_endpoints_handler.h
+++ b/src/RESTAPI/RESTAPI_system_endpoints_handler.h
@@ -1,25 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-01.
-//
-
-#pragma once
-
-#include "../framework/MicroService.h"
-
-namespace OpenWifi {
-    class RESTAPI_system_endpoints_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_system_endpoints_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
-                : RESTAPIHandler(bindings, L,
-                                 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
-                                                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                                          Server,
-                                                          TransactionId,
-                                                          Internal) {}
-        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/systemEndpoints"}; };
-        void DoGet() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-        void DoPut() final {};
-    };
-}
--- a/src/RESTAPI/RESTAPI_totp_handler.cpp
+++ b/src/RESTAPI/RESTAPI_totp_handler.cpp
@@ -1,37 +0,0 @@
-//
-// Created by stephane bourque on 2022-01-31.
-//
-
-#include "RESTAPI_totp_handler.h"
-#include "TotpCache.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_totp_handler::DoGet() {
-
-        auto Reset = GetBoolParameter("reset",false);
-        std::string QRCode;
-
-        if(TotpCache()->StartValidation(UserInfo_.userinfo,false,QRCode,Reset)) {
-            return SendFileContent(QRCode, "image/svg+xml","qrcode.svg");
-        }
-        return BadRequest(RESTAPI::Errors::InvalidCommand);
-    }
-
-    void RESTAPI_totp_handler::DoPut() {
-        auto Value = GetParameter("value","");
-        auto nextIndex = GetParameter("index",0);
-        bool moreCodes=false;
-
-        uint64_t ErrorCode = 0;
-        std::string ErrorText;
-        if(TotpCache()->ContinueValidation(UserInfo_.userinfo,false,Value,nextIndex,moreCodes, ErrorCode, ErrorText )) {
-            Poco::JSON::Object Answer;
-            Answer.set("nextIndex", nextIndex);
-            Answer.set("moreCodes", moreCodes);
-            return ReturnObject(Answer);
-        }
-        return BadRequest(ErrorCode, ErrorText);
-    }
-
-}
--- a/src/RESTAPI/RESTAPI_totp_handler.h
+++ b/src/RESTAPI/RESTAPI_totp_handler.h
@@ -1,31 +0,0 @@
-//
-// Created by stephane bourque on 2022-01-31.
-//
-
-#pragma once
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-    class RESTAPI_totp_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_totp_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
-                : RESTAPIHandler(bindings, L,
-                                 std::vector<std::string>
-                                         {
-                                              Poco::Net::HTTPRequest::HTTP_GET,
-                                              Poco::Net::HTTPRequest::HTTP_PUT,
-                                              Poco::Net::HTTPRequest::HTTP_OPTIONS
-                                          },
-                                 Server,
-                                 TransactionId,
-                                 Internal) {}
-        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/totp"}; };
-        void DoGet() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-        void DoPut() final;
-    private:
-
-    };
-}
--- a/src/RESTAPI/RESTAPI_user_handler.cpp
+++ b/src/RESTAPI/RESTAPI_user_handler.cpp
@@ -1,268 +0,0 @@
-//
-// Created by stephane bourque on 2021-06-21.
-//
-
-#include "RESTAPI_user_handler.h"
-#include "StorageService.h"
-#include "framework/RESTAPI_errors.h"
-#include "SMSSender.h"
-#include "ACLProcessor.h"
-#include "AuthService.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
-#include "MFAServer.h"
-#include "TotpCache.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_user_handler::DoGet() {
-        std::string Id = GetBinding("id", "");
-        if(Id.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUserID);
-        }
-
-        Poco::toLowerInPlace(Id);
-        std::string Arg;
-        SecurityObjects::UserInfo   UInfo;
-        if(HasParameter("byEmail",Arg) && Arg=="true") {
-            if(!StorageService()->UserDB().GetUserByEmail(Id,UInfo)) {
-                return NotFound();
-            }
-        } else if(!StorageService()->UserDB().GetUserById(Id,UInfo)) {
-            return NotFound();
-        }
-
-        if(!ACLProcessor::Can(UserInfo_.userinfo, UInfo,ACLProcessor::READ)) {
-            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
-        }
-
-        Poco::JSON::Object  UserInfoObject;
-        Sanitize(UserInfo_, UInfo);
-        UInfo.to_json(UserInfoObject);
-        ReturnObject(UserInfoObject);
-    }
-
-    void RESTAPI_user_handler::DoDelete() {
-        std::string Id = GetBinding("id", "");
-        if(Id.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUserID);
-        }
-
-        SecurityObjects::UserInfo UInfo;
-        if(!StorageService()->UserDB().GetUserById(Id,UInfo)) {
-            return NotFound();
-        }
-
-        if(!ACLProcessor::Can(UserInfo_.userinfo, UInfo,ACLProcessor::DELETE)) {
-            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
-        }
-
-        if(!StorageService()->UserDB().DeleteUser(UserInfo_.userinfo.email,Id)) {
-            return NotFound();
-        }
-
-        AuthService()->DeleteUserFromCache(Id);
-        StorageService()->AvatarDB().DeleteAvatar(UserInfo_.userinfo.email,Id);
-        StorageService()->PreferencesDB().DeletePreferences(UserInfo_.userinfo.email,Id);
-        StorageService()->UserTokenDB().RevokeAllTokens(Id);
-        Logger_.information(Poco::format("User '%s' deleted by '%s'.",Id,UserInfo_.userinfo.email));
-        OK();
-    }
-
-    void RESTAPI_user_handler::DoPost() {
-        std::string Id = GetBinding("id", "");
-        if(Id!="0") {
-            return BadRequest(RESTAPI::Errors::IdMustBe0);
-        }
-
-        SecurityObjects::UserInfo   NewUser;
-        RESTAPI_utils::from_request(NewUser,*Request);
-        if(NewUser.userRole == SecurityObjects::UNKNOWN) {
-            return BadRequest(RESTAPI::Errors::InvalidUserRole);
-        }
-
-        if(UserInfo_.userinfo.userRole==SecurityObjects::ROOT) {
-            NewUser.owner = GetParameter("entity","");
-        } else {
-            NewUser.owner = UserInfo_.userinfo.owner;
-        }
-
-        if(!ACLProcessor::Can(UserInfo_.userinfo,NewUser,ACLProcessor::CREATE)) {
-            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
-        }
-
-        Poco::toLowerInPlace(NewUser.email);
-        if(!Utils::ValidEMailAddress(NewUser.email)) {
-            return BadRequest(RESTAPI::Errors::InvalidEmailAddress);
-        }
-
-        if(!NewUser.currentPassword.empty()) {
-            if(!AuthService()->ValidatePassword(NewUser.currentPassword)) {
-                return BadRequest(RESTAPI::Errors::InvalidPassword);
-            }
-        }
-
-        if(NewUser.name.empty())
-            NewUser.name = NewUser.email;
-
-        //  You cannot enable MFA during user creation
-        NewUser.userTypeProprietaryInfo.mfa.enabled = false;
-        NewUser.userTypeProprietaryInfo.mfa.method = "";
-        NewUser.userTypeProprietaryInfo.mobiles.clear();
-        NewUser.userTypeProprietaryInfo.authenticatorSecret.clear();
-
-        if(!StorageService()->UserDB().CreateUser(NewUser.email,NewUser)) {
-            Logger_.information(Poco::format("Could not add user '%s'.",NewUser.email));
-            return BadRequest(RESTAPI::Errors::RecordNotCreated);
-        }
-
-        if(GetParameter("email_verification","false")=="true") {
-            if(AuthService::VerifyEmail(NewUser))
-                Logger_.information(Poco::format("Verification e-mail requested for %s",NewUser.email));
-            StorageService()->UserDB().UpdateUserInfo(UserInfo_.userinfo.email,NewUser.id,NewUser);
-        }
-
-        if(!StorageService()->UserDB().GetUserByEmail(NewUser.email, NewUser)) {
-            Logger_.information(Poco::format("User '%s' but not retrieved.",NewUser.email));
-            return NotFound();
-        }
-
-        Poco::JSON::Object  UserInfoObject;
-        Sanitize(UserInfo_, NewUser);
-        NewUser.to_json(UserInfoObject);
-        ReturnObject(UserInfoObject);
-        Logger_.information(Poco::format("User '%s' has been added by '%s')",NewUser.email, UserInfo_.userinfo.email));
-    }
-
-    void RESTAPI_user_handler::DoPut() {
-        std::string Id = GetBinding("id", "");
-        if(Id.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingUserID);
-        }
-
-        SecurityObjects::UserInfo   Existing;
-        if(!StorageService()->UserDB().GetUserById(Id,Existing)) {
-            return NotFound();
-        }
-
-        if(!ACLProcessor::Can(UserInfo_.userinfo,Existing,ACLProcessor::MODIFY)) {
-            return UnAuthorized("Insufficient access rights.", ACCESS_DENIED);
-        }
-
-        SecurityObjects::UserInfo   NewUser;
-        auto RawObject = ParseStream();
-        if(!NewUser.from_json(RawObject)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
-        // some basic validations
-        if(RawObject->has("userRole") && SecurityObjects::UserTypeFromString(RawObject->get("userRole").toString())==SecurityObjects::UNKNOWN) {
-            return BadRequest(RESTAPI::Errors::InvalidUserRole);
-        }
-
-        if(RawObject->has("owner")) {
-            if (UserInfo_.userinfo.userRole == SecurityObjects::ROOT && Existing.owner.empty()) {
-                AssignIfPresent(RawObject, "owner", Existing.owner);
-            }
-        }
-
-        // The only valid things to change are: changePassword, name,
-        AssignIfPresent(RawObject,"name", Existing.name);
-        AssignIfPresent(RawObject,"description", Existing.description);
-        AssignIfPresent(RawObject,"location", Existing.location);
-        AssignIfPresent(RawObject,"locale", Existing.locale);
-        AssignIfPresent(RawObject,"changePassword", Existing.changePassword);
-        AssignIfPresent(RawObject,"suspended", Existing.suspended);
-        AssignIfPresent(RawObject,"blackListed", Existing.blackListed);
-
-        if(RawObject->has("userRole")) {
-            auto NewRole = SecurityObjects::UserTypeFromString(RawObject->get("userRole").toString());
-            if(NewRole!=Existing.userRole) {
-                if(UserInfo_.userinfo.userRole!=SecurityObjects::ROOT && NewRole==SecurityObjects::ROOT) {
-                    return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
-                }
-                if(Id==UserInfo_.userinfo.id) {
-                    return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
-                }
-                Existing.userRole = NewRole;
-            }
-        }
-
-        if(RawObject->has("notes")) {
-            SecurityObjects::NoteInfoVec NIV;
-            NIV = RESTAPI_utils::to_object_array<SecurityObjects::NoteInfo>(RawObject->get("notes").toString());
-            for(auto const &i:NIV) {
-                SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UserInfo_.userinfo.email, .note=i.note};
-                Existing.notes.push_back(ii);
-            }
-        }
-        if(RawObject->has("currentPassword")) {
-            if(!AuthService()->ValidatePassword(RawObject->get("currentPassword").toString())) {
-                return BadRequest(RESTAPI::Errors::InvalidPassword);
-            }
-            if(!AuthService()->SetPassword(RawObject->get("currentPassword").toString(),Existing)) {
-                return BadRequest(RESTAPI::Errors::PasswordRejected);
-            }
-        }
-
-        if(GetParameter("email_verification","false")=="true") {
-            if(AuthService::VerifyEmail(Existing))
-                Logger_.information(Poco::format("Verification e-mail requested for %s",Existing.email));
-        }
-
-        if(RawObject->has("userTypeProprietaryInfo")) {
-            if(NewUser.userTypeProprietaryInfo.mfa.enabled) {
-                if (!MFAMETHODS::Validate(NewUser.userTypeProprietaryInfo.mfa.method)) {
-                    return BadRequest(RESTAPI::Errors::BadMFAMethod);
-                }
-
-                bool ChangingMFA =
-                        NewUser.userTypeProprietaryInfo.mfa.enabled && !Existing.userTypeProprietaryInfo.mfa.enabled;
-                Existing.userTypeProprietaryInfo.mfa.enabled = NewUser.userTypeProprietaryInfo.mfa.enabled;
-
-                auto PropInfo = RawObject->get("userTypeProprietaryInfo");
-                if (ChangingMFA && NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::SMS) {
-                    auto PInfo = PropInfo.extract<Poco::JSON::Object::Ptr>();
-                    if (PInfo->isArray("mobiles")) {
-                        Existing.userTypeProprietaryInfo.mobiles = NewUser.userTypeProprietaryInfo.mobiles;
-                    }
-                    if (NewUser.userTypeProprietaryInfo.mobiles.empty() ||
-                        !SMSSender()->IsNumberValid(NewUser.userTypeProprietaryInfo.mobiles[0].number,
-                                                    UserInfo_.userinfo.email)) {
-                        return BadRequest(RESTAPI::Errors::NeedMobileNumber);
-                    }
-                    Existing.userTypeProprietaryInfo.authenticatorSecret.clear();
-                } else if (ChangingMFA && NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::AUTHENTICATOR) {
-                    std::string Secret;
-                    Existing.userTypeProprietaryInfo.mobiles.clear();
-                    if(Existing.userTypeProprietaryInfo.authenticatorSecret.empty() && TotpCache()->CompleteValidation(UserInfo_.userinfo,false,Secret)) {
-                        Existing.userTypeProprietaryInfo.authenticatorSecret = Secret;
-                    } else if (!Existing.userTypeProprietaryInfo.authenticatorSecret.empty()) {
-                        // we allow someone to use their old secret
-                    } else {
-                        return BadRequest(RESTAPI::Errors::AuthenticatorVerificationIncomplete);
-                    }
-                } else if (ChangingMFA && NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::EMAIL) {
-                    // nothing to do for email.
-                    Existing.userTypeProprietaryInfo.mobiles.clear();
-                    Existing.userTypeProprietaryInfo.authenticatorSecret.clear();
-                }
-                Existing.userTypeProprietaryInfo.mfa.method = NewUser.userTypeProprietaryInfo.mfa.method;
-                Existing.userTypeProprietaryInfo.mfa.enabled = true;
-            } else {
-                Existing.userTypeProprietaryInfo.authenticatorSecret.clear();
-                Existing.userTypeProprietaryInfo.mobiles.clear();
-                Existing.userTypeProprietaryInfo.mfa.enabled = false;
-            }
-        }
-
-        if(StorageService()->UserDB().UpdateUserInfo(UserInfo_.userinfo.email,Id,Existing)) {
-            SecurityObjects::UserInfo   NewUserInfo;
-            StorageService()->UserDB().GetUserByEmail(UserInfo_.userinfo.email,NewUserInfo);
-            Poco::JSON::Object  ModifiedObject;
-            Sanitize(UserInfo_, NewUserInfo);
-            NewUserInfo.to_json(ModifiedObject);
-            return ReturnObject(ModifiedObject);
-        }
-        BadRequest(RESTAPI::Errors::RecordNotUpdated);
-    }
-}
--- a/src/RESTAPI/RESTAPI_users_handler.cpp
+++ b/src/RESTAPI/RESTAPI_users_handler.cpp
@@ -1,54 +0,0 @@
-//
-// Created by stephane bourque on 2021-06-21.
-//
-
-#include "RESTAPI_users_handler.h"
-#include "StorageService.h"
-#include "framework/RESTAPI_protocol.h"
-#include "framework/MicroService.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
-
-namespace OpenWifi {
-    void RESTAPI_users_handler::DoGet() {
-        std::vector<SecurityObjects::UserInfo> Users;
-        bool IdOnly = (GetParameter("idOnly","false")=="true");
-
-        if(QB_.Select.empty()) {
-            Poco::JSON::Array ArrayObj;
-            Poco::JSON::Object Answer;
-            if (StorageService()->UserDB().GetUsers(QB_.Offset, QB_.Limit, Users)) {
-                for (auto &i : Users) {
-                    Poco::JSON::Object Obj;
-                    if (IdOnly) {
-                        ArrayObj.add(i.id);
-                    } else {
-                        Sanitize(UserInfo_, i);
-                        i.to_json(Obj);
-                        ArrayObj.add(Obj);
-                    }
-                }
-                Answer.set(RESTAPI::Protocol::USERS, ArrayObj);
-            }
-            return ReturnObject(Answer);
-        } else {
-            Poco::JSON::Array ArrayObj;
-            for(auto &i:SelectedRecords()) {
-                SecurityObjects::UserInfo   UInfo;
-                auto tI{i};
-                if(StorageService()->UserDB().GetUserById(i,UInfo)) {
-                    Poco::JSON::Object Obj;
-                    if (IdOnly) {
-                        ArrayObj.add(UInfo.id);
-                    } else {
-                        Sanitize(UserInfo_, UInfo);
-                        UInfo.to_json(Obj);
-                        ArrayObj.add(Obj);
-                    }
-                }
-            }
-            Poco::JSON::Object RetObj;
-            RetObj.set(RESTAPI::Protocol::USERS, ArrayObj);
-            return ReturnObject(RetObj);
-        }
-    }
-}
--- a/src/RESTAPI/RESTAPI_validate_sub_token_handler.cpp
+++ b/src/RESTAPI/RESTAPI_validate_sub_token_handler.cpp
@@ -1,26 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#include "RESTAPI_validate_sub_token_handler.h"
-#include "AuthService.h"
-
-namespace OpenWifi {
-    void RESTAPI_validate_sub_token_handler::DoGet() {
-        Poco::URI URI(Request->getURI());
-        auto Parameters = URI.getQueryParameters();
-        for(auto const &i:Parameters) {
-            if (i.first == "token") {
-                //  can we find this token?
-                SecurityObjects::UserInfoAndPolicy SecObj;
-                bool Expired = false;
-                if (AuthService()->IsValidSubToken(i.second, SecObj.webtoken, SecObj.userinfo, Expired)) {
-                    Poco::JSON::Object Obj;
-                    SecObj.to_json(Obj);
-                    return ReturnObject(Obj);
-                }
-            }
-        }
-        return NotFound();
-    }
-}
--- a/src/RESTAPI/RESTAPI_validate_sub_token_handler.h
+++ b/src/RESTAPI/RESTAPI_validate_sub_token_handler.h
@@ -1,26 +0,0 @@
-//
-// Created by stephane bourque on 2021-11-30.
-//
-
-#pragma once
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-    class RESTAPI_validate_sub_token_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_validate_sub_token_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
-        : RESTAPIHandler(bindings, L,
-                         std::vector<std::string>
-                         {Poco::Net::HTTPRequest::HTTP_GET,
-                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                          Server,
-                          TransactionId,
-                          Internal) {};
-        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/validateSubToken"}; };
-        void DoGet() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-        void DoPut() final {};
-    };
-}
--- a/src/RESTAPI/RESTAPI_validate_token_handler.cpp
+++ b/src/RESTAPI/RESTAPI_validate_token_handler.cpp
@@ -1,26 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-01.
-//
-
-#include "RESTAPI_validate_token_handler.h"
-#include "AuthService.h"
-
-namespace OpenWifi {
-    void RESTAPI_validate_token_handler::DoGet() {
-        Poco::URI URI(Request->getURI());
-        auto Parameters = URI.getQueryParameters();
-        for(auto const &i:Parameters) {
-            if (i.first == "token") {
-                //  can we find this token?
-                SecurityObjects::UserInfoAndPolicy SecObj;
-                bool Expired = false;
-                if (AuthService()->IsValidToken(i.second, SecObj.webtoken, SecObj.userinfo, Expired)) {
-                    Poco::JSON::Object Obj;
-                    SecObj.to_json(Obj);
-                    return ReturnObject(Obj);
-                }
-            }
-        }
-        return NotFound();
-    }
-}
--- a/src/RESTAPI_AssetServer.cpp
+++ b/src/RESTAPI_AssetServer.cpp
@@ -0,0 +1,35 @@
+//
+// Created by stephane bourque on 2021-07-10.
+//
+
+#include "RESTAPI_AssetServer.h"
+#include "Poco/File.h"
+#include "Daemon.h"
+#include "RESTAPI_server.h"
+#include "Utils.h"
+#include "RESTAPI_protocol.h"
+
+namespace OpenWifi {
+    void RESTAPI_AssetServer::handleRequest(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+        if(Request.getMethod()==Poco::Net::HTTPRequest::HTTP_GET)
+            DoGet(Request, Response);
+        else
+            NotFound(Request, Response);
+    }
+
+    void RESTAPI_AssetServer::DoGet(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+        Poco::File  AssetFile;
+
+        if(Request.getURI().find("/favicon.ico") != std::string::npos) {
+            AssetFile = RESTAPI_Server()->AssetDir() + "/favicon.ico";
+        } else {
+            std::string AssetName = GetBinding(RESTAPI::Protocol::ID, "");
+            AssetFile = RESTAPI_Server()->AssetDir() + "/" + AssetName;
+        }
+        if(!AssetFile.isFile()) {
+            NotFound(Request, Response);
+            return;
+        }
+        SendFile(AssetFile,Request, Response);
+    }
+}
--- a/src/RESTAPI/RESTAPI_asset_server.h
+++ b/src/RESTAPI/RESTAPI_asset_server.h
@@ -2,14 +2,15 @@
 // Created by stephane bourque on 2021-07-10.
 //

-#pragma once
+#ifndef UCENTRALSEC_RESTAPI_ASSETSERVER_H
+#define UCENTRALSEC_RESTAPI_ASSETSERVER_H

-#include "../framework/MicroService.h"
+#include "RESTAPI_handler.h"

 namespace OpenWifi {
-    class RESTAPI_asset_server : public RESTAPIHandler {
+    class RESTAPI_AssetServer : public RESTAPIHandler {
    public:
-        RESTAPI_asset_server(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
+        RESTAPI_AssetServer(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, bool Internal)
                : RESTAPIHandler(bindings, L,
                                 std::vector<std::string>
                                         {Poco::Net::HTTPRequest::HTTP_POST,
@@ -17,18 +18,15 @@ namespace OpenWifi {
                                          Poco::Net::HTTPRequest::HTTP_PUT,
                                          Poco::Net::HTTPRequest::HTTP_DELETE,
                                          Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                          Server,
-                                          TransactionId,
-                                          Internal, false) {}
+                                          Internal) {}
+        void handleRequest(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) override;
        static const std::list<const char *> PathName() { return std::list<const char *>{"/wwwassets/{id}" ,
                                                                                         "/favicon.ico"}; };
-        void DoGet() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-        void DoPut() final {};
-
+        void DoGet(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response);
    private:

    };
 }

+
+#endif //UCENTRALSEC_RESTAPI_ASSETSERVER_H
--- a/src/RESTAPI_InternalServer.cpp
+++ b/src/RESTAPI_InternalServer.cpp
@@ -0,0 +1,76 @@
+//
+// Created by stephane bourque on 2021-06-29.
+//
+
+
+#include "Poco/URI.h"
+
+#include "RESTAPI_system_command.h"
+#include "RESTAPI_user_handler.h"
+#include "RESTAPI_users_handler.h"
+#include "RESTAPI_action_links.h"
+#include "RESTAPI_validateToken_handler.h"
+#include "RESTAPI_InternalServer.h"
+
+#include "Utils.h"
+
+namespace OpenWifi {
+
+    class RESTAPI_InternalServer *RESTAPI_InternalServer::instance_ = nullptr;
+
+    RESTAPI_InternalServer::RESTAPI_InternalServer() noexcept:
+        SubSystemServer("RESTAPIInternalServer", "REST-ISRV", "ucentral.internal.restapi")
+    {
+    }
+
+    int RESTAPI_InternalServer::Start() {
+        Logger_.information("Starting.");
+
+        for(const auto & Svr: ConfigServersList_) {
+            Logger_.information(Poco::format("Starting: %s:%s Keyfile:%s CertFile: %s", Svr.Address(), std::to_string(Svr.Port()),
+                                             Svr.KeyFile(),Svr.CertFile()));
+
+            auto Sock{Svr.CreateSecureSocket(Logger_)};
+
+            Svr.LogCert(Logger_);
+            if(!Svr.RootCA().empty())
+                Svr.LogCas(Logger_);
+
+            auto Params = new Poco::Net::HTTPServerParams;
+            Params->setMaxThreads(50);
+            Params->setMaxQueued(200);
+            Params->setKeepAlive(true);
+
+            auto NewServer = std::make_unique<Poco::Net::HTTPServer>(new InternalRequestHandlerFactory, Pool_, Sock, Params);
+            NewServer->start();
+            RESTServers_.push_back(std::move(NewServer));
+        }
+
+        return 0;
+    }
+
+    void RESTAPI_InternalServer::Stop() {
+        Logger_.information("Stopping ");
+        for( const auto & svr : RESTServers_ )
+            svr->stop();
+    }
+
+    Poco::Net::HTTPRequestHandler *InternalRequestHandlerFactory::createRequestHandler(const Poco::Net::HTTPServerRequest & Request) {
+
+        Logger_.debug(Poco::format("REQUEST(%s): %s %s",
+                                   Utils::FormatIPv6(Request.clientAddress().toString()),
+                                   Request.getMethod(), Request.getURI()));
+
+        Poco::URI uri(Request.getURI());
+        const auto & Path = uri.getPath();
+        RESTAPIHandler::BindingMap Bindings;
+        return RESTAPI_Router_I<
+                RESTAPI_users_handler,
+                RESTAPI_user_handler,
+                RESTAPI_system_command,
+                RESTAPI_action_links,
+                RESTAPI_validateToken_handler
+        >(Path,Bindings,Logger_);
+    }
+
+}
--- a/src/RESTAPI_InternalServer.h
+++ b/src/RESTAPI_InternalServer.h
@@ -0,0 +1,52 @@
+//
+// Created by stephane bourque on 2021-06-29.
+//
+
+#ifndef UCENTRALSEC_RESTAPI_INTERNALSERVER_H
+#define UCENTRALSEC_RESTAPI_INTERNALSERVER_H
+
+#include "SubSystemServer.h"
+#include "Poco/Net/HTTPServer.h"
+#include "Poco/Net/HTTPRequestHandler.h"
+#include "Poco/Net/HTTPRequestHandlerFactory.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/NetException.h"
+
+namespace OpenWifi {
+
+    class RESTAPI_InternalServer : public SubSystemServer {
+        public:
+            RESTAPI_InternalServer() noexcept;
+
+            static RESTAPI_InternalServer *instance() {
+                if (instance_ == nullptr) {
+                    instance_ = new RESTAPI_InternalServer;
+                }
+                return instance_;
+            }
+
+            int Start() override;
+            void Stop() override;
+
+        private:
+            static RESTAPI_InternalServer *instance_;
+            std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   RESTServers_;
+            Poco::ThreadPool	Pool_;
+    };
+
+    inline RESTAPI_InternalServer * RESTAPI_InternalServer() { return RESTAPI_InternalServer::instance(); };
+
+    class InternalRequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory {
+        public:
+            InternalRequestHandlerFactory() :
+                    Logger_(RESTAPI_InternalServer()->Logger()){}
+
+            Poco::Net::HTTPRequestHandler *createRequestHandler(const Poco::Net::HTTPServerRequest &request) override;
+        private:
+            Poco::Logger    & Logger_;
+    };
+
+
+} //   namespace
+
+#endif //UCENTRALSEC_RESTAPI_INTERNALSERVER_H
--- a/src/RESTObjects/RESTAPI_SecurityObjects.cpp
+++ b/src/RESTObjects/RESTAPI_SecurityObjects.cpp
@@ -9,8 +9,8 @@
 #include "Poco/JSON/Parser.h"
 #include "Poco/JSON/Stringifier.h"

-#include "framework/MicroService.h"
 #include "RESTAPI_SecurityObjects.h"
+#include "RESTAPI_utils.h"

 using OpenWifi::RESTAPI_utils::field_to_json;
 using OpenWifi::RESTAPI_utils::field_from_json;
@@ -54,35 +54,25 @@ namespace OpenWifi::SecurityObjects {
            return ADMIN;
        else if (!Poco::icompare(U,"subscriber"))
            return SUBSCRIBER;
-        else if (!Poco::icompare(U,"partner"))
-            return PARTNER;
        else if (!Poco::icompare(U,"csr"))
            return CSR;
        else if (!Poco::icompare(U, "system"))
            return SYSTEM;
-        else if (!Poco::icompare(U, "installer"))
-            return INSTALLER;
-        else if (!Poco::icompare(U, "noc"))
-            return NOC;
-        else if (!Poco::icompare(U, "accounting"))
-            return ACCOUNTING;
+        else if (!Poco::icompare(U, "special"))
+            return SPECIAL;
        return UNKNOWN;
    }

    std::string UserTypeToString(USER_ROLE U) {
        switch(U) {
+            case UNKNOWN: return "unknown";
            case ROOT: return "root";
-            case ADMIN: return "admin";
            case SUBSCRIBER: return "subscriber";
-            case PARTNER: return "partner";
            case CSR: return "csr";
            case SYSTEM: return "system";
-            case INSTALLER: return "installer";
-            case NOC: return "noc";
-            case ACCOUNTING: return "accounting";
-            case UNKNOWN:
-            default:
-                return "unknown";
+            case SPECIAL: return "special";
+            case ADMIN: return "admin";
+            default: return "unknown";
        }
    }

@@ -135,98 +125,8 @@ namespace OpenWifi::SecurityObjects {
 		return false;
 	}

-	void MobilePhoneNumber::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj,"number", number);
-	    field_to_json(Obj,"verified", verified);
-	    field_to_json(Obj,"primary", primary);
-	}
-
-	bool MobilePhoneNumber::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"number",number);
-	        field_from_json(Obj,"verified",verified);
-	        field_from_json(Obj,"primary",primary);
-	        return true;
-	    } catch (...) {
-
-	    }
-	    return false;
-	};
-
-	void MfaAuthInfo::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj,"enabled", enabled);
-	    field_to_json(Obj,"method", method);
-	}
-
-	bool MfaAuthInfo::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"enabled",enabled);
-	        field_from_json(Obj,"method",method);
-	        return true;
-	    } catch (...) {
-
-	    }
-	    return false;
-	}
-
-	void UserLoginLoginExtensions::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj, "mobiles", mobiles);
-	    field_to_json(Obj, "mfa", mfa);
-        field_to_json(Obj, "authenticatorSecret", authenticatorSecret);
-	}
-
-	bool UserLoginLoginExtensions::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj, "mobiles",mobiles);
-	        field_from_json(Obj, "mfa",mfa);
-            field_from_json(Obj, "authenticatorSecret", authenticatorSecret);
-	        return true;
-	    } catch (...) {
-
-	    }
-	    return false;
-	}
-
-    void MFAChallengeRequest::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "uuid", uuid);
-        field_to_json(Obj, "question", question);
-        field_to_json(Obj, "created", created);
-        field_to_json(Obj, "method", method);
-    }
-
-    bool MFAChallengeRequest::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"uuid",uuid);
-	        field_from_json(Obj,"question",question);
-	        field_from_json(Obj,"created",created);
-	        field_from_json(Obj,"method",method);
-	        return true;
-	    } catch (...) {
-
-	    }
-	    return false;
-	};
-
-    void MFAChallengeResponse::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "uuid", uuid);
-        field_to_json(Obj, "answer", answer);
-
-    }
-
-    bool MFAChallengeResponse::from_json(Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"uuid",uuid);
-            field_from_json(Obj,"answer",answer);
-            return true;
-        } catch (...) {
-
-        }
-        return false;
-
-    }
-
    void UserInfo::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"id",id);
+		field_to_json(Obj,"Id",Id);
 		field_to_json(Obj,"name",name);
 		field_to_json(Obj,"description", description);
 		field_to_json(Obj,"avatar", avatar);
@@ -256,12 +156,11 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj,"lastPasswords",lastPasswords);
 		field_to_json(Obj,"oauthType",oauthType);
 		field_to_json(Obj,"oauthUserInfo",oauthUserInfo);
-        field_to_json(Obj,"modified",modified);
    };

    bool UserInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
        try {
-			field_from_json(Obj,"id",id);
+			field_from_json(Obj,"Id",Id);
 			field_from_json(Obj,"name",name);
 			field_from_json(Obj,"description",description);
 			field_from_json(Obj,"avatar",avatar);
@@ -271,8 +170,6 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj,"currentLoginURI",currentLoginURI);
 			field_from_json(Obj,"locale",locale);
 			field_from_json(Obj,"notes",notes);
-            field_from_json(Obj,"location", location);
-            field_from_json(Obj,"owner", owner);
 			field_from_json<USER_ROLE>(Obj,"userRole",userRole, UserTypeFromString);
 			field_from_json(Obj,"securityPolicy",securityPolicy);
 			field_from_json(Obj,"userTypeProprietaryInfo",userTypeProprietaryInfo);
@@ -291,7 +188,6 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj,"lastPasswords",lastPasswords);
 			field_from_json(Obj,"oauthType",oauthType);
 			field_from_json(Obj,"oauthUserInfo",oauthUserInfo);
-            field_from_json(Obj,"modified",modified);
            return true;
        } catch (const Poco::Exception &E) {

@@ -396,53 +292,40 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj,"note", note);
 	}

-	bool NoteInfo::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool NoteInfo::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"created",created);
 			field_from_json(Obj,"createdBy",createdBy);
 			field_from_json(Obj,"note",note);
-			return true;
 		} catch(...) {

 		}
 		return false;
 	}

-    bool MergeNotes(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes) {
+    bool append_from_json(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes) {
 	    try {
-	        if(Obj->has("notes") && Obj->isArray("notes")) {
-	            SecurityObjects::NoteInfoVec NIV;
-	            NIV = RESTAPI_utils::to_object_array<SecurityObjects::NoteInfo>(Obj->get("notes").toString());
-	            for(auto const &i:NIV) {
-	                SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UInfo.email, .note=i.note};
-	                Notes.push_back(ii);
-	            }
+	        SecurityObjects::NoteInfoVec NIV;
+	        NIV = RESTAPI_utils::to_object_array<SecurityObjects::NoteInfo>(Obj->get("notes").toString());
+	        for(auto const &i:NIV) {
+	            SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UInfo.email, .note=i.note};
+	            Notes.push_back(ii);
 	        }
-	        return true;
 	    } catch(...) {

 	    }
 	    return false;
 	}

-	bool MergeNotes(const NoteInfoVec & NewNotes, const UserInfo &UInfo, NoteInfoVec & ExistingNotes) {
-	    for(auto const &i:NewNotes) {
-	        SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UInfo.email, .note=i.note};
-	        ExistingNotes.push_back(ii);
-	    }
-        return true;
-	}
-
 	void ProfileAction::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj,"resource", resource);
 		field_to_json<ResourceAccessType>(Obj,"access", access, ResourceAccessTypeToString);
 	}

-	bool ProfileAction::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool ProfileAction::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"resource",resource);
 			field_from_json<ResourceAccessType>(Obj,"access",access,ResourceAccessTypeFromString );
-			return true;
 		} catch(...) {

 		}
@@ -458,7 +341,7 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj,"notes", notes);
 	}

-	bool SecurityProfile::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool SecurityProfile::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"id",id);
 			field_from_json(Obj,"name",name);
@@ -466,7 +349,6 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj,"policy",policy);
 			field_from_json(Obj,"role",role);
 			field_from_json(Obj,"notes",notes);
-			return true;
 		} catch(...) {

 		}
@@ -477,126 +359,13 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj, "profiles", profiles);
 	}

-	bool SecurityProfileList::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool SecurityProfileList::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"profiles",profiles);
-			return true;
 		} catch(...) {

 		}
 		return false;
 	}
-
-    void ActionLink::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj,"id",id);
-	    field_to_json(Obj,"action",action);
-	    field_to_json(Obj,"userId",userId);
-	    field_to_json(Obj,"actionTemplate",actionTemplate);
-	    field_to_json(Obj,"variables",variables);
-	    field_to_json(Obj,"locale",locale);
-	    field_to_json(Obj,"message",message);
-	    field_to_json(Obj,"sent",sent);
-	    field_to_json(Obj,"created",created);
-	    field_to_json(Obj,"expires",expires);
-	    field_to_json(Obj,"completed",completed);
-	    field_to_json(Obj,"canceled",canceled);
-        field_to_json(Obj,"userAction",userAction);
-	}
-
-    bool ActionLink::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"id",id);
-	        field_from_json(Obj,"action",action);
-	        field_from_json(Obj,"userId",userId);
-	        field_from_json(Obj,"actionTemplate",actionTemplate);
-	        field_from_json(Obj,"variables",variables);
-	        field_from_json(Obj,"locale",locale);
-	        field_from_json(Obj,"message",message);
-	        field_from_json(Obj,"sent",sent);
-	        field_from_json(Obj,"created",created);
-	        field_from_json(Obj,"expires",expires);
-	        field_from_json(Obj,"completed",completed);
-	        field_from_json(Obj,"canceled",canceled);
-            field_from_json(Obj,"userAction",userAction);
-	        return true;
-	    } catch(...) {
-
-	    }
-	    return false;
-	}
-
-    void Preferences::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj,"id",id);
-	    field_to_json(Obj,"modified",modified);
-	    field_to_json(Obj,"data",data);
-	}
-
-    bool Preferences::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"id",id);
-	        field_from_json(Obj,"modified",modified);
-	        field_from_json(Obj,"data",data);
-	        return true;
-	    } catch(...) {
-
-	    }
-	    return false;
-	}
-
-    void SubMfaConfig::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj,"id",id);
-	    field_to_json(Obj,"type",type);
-	    field_to_json(Obj,"sms",sms);
-	    field_to_json(Obj,"email",email);
-	}
-
-    bool SubMfaConfig::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"id",id);
-	        field_from_json(Obj,"type",type);
-	        field_from_json(Obj,"sms",sms);
-	        field_from_json(Obj,"email",email);
-	        return true;
-	    } catch(...) {
-
-	    }
-	    return false;
-	}
-
-    void Token::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"token",token);
-        field_to_json(Obj,"refreshToken",refreshToken);
-        field_to_json(Obj,"tokenType",tokenType);
-        field_to_json(Obj,"userName",userName);
-        field_to_json(Obj,"created",created);
-        field_to_json(Obj,"expires",expires);
-        field_to_json(Obj,"idleTimeout",idleTimeout);
-        field_to_json(Obj,"revocationDate",revocationDate);
-    }
-
-    bool Token::from_json(Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"token",token);
-            field_from_json(Obj,"refreshToken",refreshToken);
-            field_from_json(Obj,"tokenType",tokenType);
-            field_from_json(Obj,"userName",userName);
-            field_from_json(Obj,"created",created);
-            field_from_json(Obj,"expires",expires);
-            field_from_json(Obj,"idleTimeout",idleTimeout);
-            field_from_json(Obj,"revocationDate",revocationDate);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void LoginRecordInfo::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"sessionId",sessionId);
-        field_to_json(Obj,"userId",userId);
-        field_to_json(Obj,"email",email);
-        field_to_json(Obj,"login",login);
-        field_to_json(Obj,"logout",logout);
-    }
 }

--- a/src/RESTAPI_SecurityObjects.h
+++ b/src/RESTAPI_SecurityObjects.h
@@ -0,0 +1,181 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#ifndef UCENTRAL_RESTAPI_SECURITYOBJECTS_H
+#define UCENTRAL_RESTAPI_SECURITYOBJECTS_H
+
+#include "Poco/JSON/Object.h"
+#include "OpenWifiTypes.h"
+
+namespace OpenWifi::SecurityObjects {
+
+	struct AclTemplate {
+		bool Read_ = true;
+		bool ReadWrite_ = true;
+		bool ReadWriteCreate_ = true;
+		bool Delete_ = true;
+		bool PortalLogin_ = true;
+
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);	};
+
+	struct WebToken {
+		std::string access_token_;
+		std::string refresh_token_;
+		std::string id_token_;
+		std::string token_type_;
+		std::string username_;
+		bool userMustChangePassword=false;
+        uint64_t errorCode=0;
+		uint64_t expires_in_=0;
+		uint64_t idle_timeout_=0;
+		AclTemplate acl_template_;
+		uint64_t created_=0;
+
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+
+    enum USER_ROLE {
+        UNKNOWN, ROOT, ADMIN, SUBSCRIBER, CSR, SYSTEM, SPECIAL
+    };
+
+    USER_ROLE UserTypeFromString(const std::string &U);
+    std::string UserTypeToString(USER_ROLE U);
+
+    struct NoteInfo {
+		uint64_t created = std::time(nullptr);
+		std::string createdBy;
+		std::string note;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(Poco::JSON::Object::Ptr Obj);
+	};
+	typedef std::vector<NoteInfo>	NoteInfoVec;
+
+	struct UserInfo {
+        std::string Id;
+		std::string name;
+		std::string description;
+		std::string avatar;
+		std::string email;
+		bool validated = false;
+		std::string validationEmail;
+		uint64_t validationDate = 0;
+		uint64_t creationDate = 0;
+		std::string validationURI;
+		bool changePassword = false;
+		uint64_t lastLogin = 0;
+		std::string currentLoginURI;
+		uint64_t lastPasswordChange = 0;
+		uint64_t lastEmailCheck = 0;
+		bool waitingForEmailCheck = false;
+		std::string locale;
+		NoteInfoVec notes;
+		std::string location;
+		std::string owner;
+		bool suspended = false;
+		bool blackListed = false;
+        USER_ROLE userRole;
+		std::string userTypeProprietaryInfo;
+		std::string securityPolicy;
+		uint64_t securityPolicyChange = 0 ;
+		std::string currentPassword;
+		Types::StringVec lastPasswords;
+		std::string oauthType;
+		std::string oauthUserInfo;
+
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+	typedef std::vector<UserInfo>   UserInfoVec;
+
+	bool append_from_json(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes);
+
+	struct InternalServiceInfo {
+		std::string privateURI;
+		std::string publicURI;
+		std::string token;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+	typedef std::vector<InternalServiceInfo>	InternalServiceInfoVec;
+
+	struct InternalSystemServices {
+		std::string key;
+		std::string version;
+		InternalServiceInfoVec services;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+
+	struct SystemEndpoint {
+		std::string type;
+		uint64_t 	id = 0;
+		std::string vendor{"OpenWiFi"};
+		std::string uri;
+		std::string authenticationType{"internal_v1"};
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+	typedef std::vector<SystemEndpoint> SystemEndpointVec;
+
+	struct SystemEndpointList {
+		SystemEndpointVec	endpoints;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+
+	struct UserInfoAndPolicy {
+		WebToken	webtoken;
+		UserInfo	userinfo;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+	};
+	typedef std::map<std::string,SecurityObjects::UserInfoAndPolicy>	UserInfoCache;
+
+	enum ResourceAccessType {
+		NONE,
+		READ,
+		MODIFY,
+		DELETE,
+		CREATE,
+		TEST,
+		MOVE
+	};
+
+	ResourceAccessType ResourceAccessTypeFromString(const std::string &s);
+	std::string ResourceAccessTypeToString(const ResourceAccessType & T);
+
+	struct ProfileAction {
+		std::string resource;
+		ResourceAccessType access;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(Poco::JSON::Object::Ptr Obj);
+	};
+	typedef std::vector<ProfileAction>	ProfileActionVec;
+
+	struct SecurityProfile {
+		uint64_t id;
+		std::string name;
+		std::string description;
+		ProfileActionVec policy;
+		std::string role;
+		NoteInfoVec notes;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(Poco::JSON::Object::Ptr Obj);
+	};
+	typedef std::vector<SecurityProfile> SecurityProfileVec;
+
+	struct SecurityProfileList {
+		SecurityProfileVec profiles;
+		void to_json(Poco::JSON::Object &Obj) const;
+		bool from_json(Poco::JSON::Object::Ptr Obj);
+	};
+}
+
+#endif //UCENTRAL_RESTAPI_SECURITYOBJECTS_H
--- a/src/RESTAPI_action_links.cpp
+++ b/src/RESTAPI_action_links.cpp
@@ -0,0 +1,133 @@
+//
+// Created by stephane bourque on 2021-06-22.
+//
+
+#include "RESTAPI_action_links.h"
+#include "StorageService.h"
+#include "Utils.h"
+#include "RESTAPI_utils.h"
+
+#include "Poco/JSON/Parser.h"
+#include "Poco/Net/HTMLForm.h"
+#include "RESTAPI_server.h"
+#include "Daemon.h"
+
+namespace OpenWifi {
+    void RESTAPI_action_links::handleRequest(Poco::Net::HTTPServerRequest &Request,
+                       Poco::Net::HTTPServerResponse &Response) {
+        //  there is no authentication here, this is just someone clicking on a link
+        //  and arriving here. There should be a UUID in the link and this is all we need to know
+        //  what we need to do.
+        ParseParameters(Request);
+
+        auto Action = GetParameter("action","");
+        auto Id = GetParameter("id","");
+
+        if(Action=="password_reset")
+            DoResetPassword(Id, Request, Response);
+        else if(Action=="email_verification")
+            DoEmailVerification(Id, Request, Response);
+        else
+            DoReturnA404(Request, Response);
+    }
+
+    void RESTAPI_action_links::DoResetPassword(std::string &Id,Poco::Net::HTTPServerRequest &Request,
+                         Poco::Net::HTTPServerResponse &Response) {
+
+        if(Request.getMethod()==Poco::Net::HTTPServerRequest::HTTP_GET) {
+            Poco::File  FormFile{ RESTAPI_Server()->AssetDir() + "/password_reset.html"};
+            Types::StringPairVec    FormVars{ {"UUID", Id},
+                                              {"PASSWORD_VALIDATION", AuthService()->PasswordValidationExpression()}};
+            SendHTMLFileBack(FormFile,Request, Response, FormVars);
+        } else if(Request.getMethod()==Poco::Net::HTTPServerRequest::HTTP_POST) {
+            //  form has been posted...
+            RESTAPI_PartHandler PartHandler;
+            Poco::Net::HTMLForm Form(Request, Request.stream(), PartHandler);
+            if (!Form.empty()) {
+                auto Password1 = Form.get("password1","bla");
+                auto Password2 = Form.get("password1","blu");
+                Id = Form.get("id","");
+                if(Password1!=Password2 || !AuthService()->ValidatePassword(Password2) || !AuthService()->ValidatePassword(Password1)) {
+                    Poco::File  FormFile{ RESTAPI_Server()->AssetDir() + "/password_reset_error.html"};
+                    Types::StringPairVec    FormVars{ {"UUID", Id},
+                                                      {"ERROR_TEXT", "For some reason, the passwords entered do not match or they do not comply with"
+                                                                     " accepted password creation restrictions. Please consult our on-line help"
+                                                                     " to look at the our password policy. If you would like to contact us, please mention"
+                                                                     " id(" + Id + ")"}};
+                    SendHTMLFileBack(FormFile,Request, Response, FormVars);
+                    return;
+                }
+
+                SecurityObjects::UserInfo   UInfo;
+                if(!Storage()->GetUserById(Id,UInfo)) {
+                    Poco::File  FormFile{ RESTAPI_Server()->AssetDir() + "/password_reset_error.html"};
+                    Types::StringPairVec    FormVars{ {"UUID", Id},
+                                                      {"ERROR_TEXT", "This request does not contain a valid user ID. Please contact your system administrator."}};
+                    SendHTMLFileBack(FormFile,Request, Response, FormVars);
+                    return;
+                }
+
+                if(UInfo.blackListed || UInfo.suspended) {
+                    Poco::File  FormFile{ RESTAPI_Server()->AssetDir() + "/password_reset_error.html"};
+                    Types::StringPairVec    FormVars{ {"UUID", Id},
+                                                      {"ERROR_TEXT", "Please contact our system administrators. We have identified an error in your account that must be resolved first."}};
+                    SendHTMLFileBack(FormFile,Request, Response, FormVars);
+                    return;
+                }
+
+                if(!AuthService()->SetPassword(Password1,UInfo)) {
+                    Poco::File  FormFile{ RESTAPI_Server()->AssetDir() + "/password_reset_error.html"};
+                    Types::StringPairVec    FormVars{ {"UUID", Id},
+                                                      {"ERROR_TEXT", "You cannot reuse one of your recent passwords."}};
+                    SendHTMLFileBack(FormFile,Request, Response, FormVars);
+                    return;
+                }
+                Storage()->UpdateUserInfo(UInfo.email,Id,UInfo);
+                Poco::File  FormFile{ RESTAPI_Server()->AssetDir() + "/password_reset_success.html"};
+                Types::StringPairVec    FormVars{ {"UUID", Id},
+                                                  {"USERNAME", UInfo.email},
+                                                  {"ACTION_LINK",Daemon()->GetUIURI()}};
+                SendHTMLFileBack(FormFile,Request, Response, FormVars);
+            }
+        } else {
+            DoReturnA404(Request, Response);
+        }
+    }
+
+    void RESTAPI_action_links::DoEmailVerification(std::string &Id,Poco::Net::HTTPServerRequest &Request,
+                             Poco::Net::HTTPServerResponse &Response) {
+        if(Request.getMethod()==Poco::Net::HTTPServerRequest::HTTP_GET) {
+            SecurityObjects::UserInfo UInfo;
+
+            if (!Storage()->GetUserById(Id, UInfo)) {
+                Types::StringPairVec FormVars{{"UUID",       Id},
+                                              {"ERROR_TEXT", "This does not appear to be a valid email verification link.."}};
+                Poco::File FormFile{RESTAPI_Server()->AssetDir() + "/email_verification_error.html"};
+                SendHTMLFileBack(FormFile, Request, Response, FormVars);
+                return;
+            }
+
+            UInfo.waitingForEmailCheck = false;
+            UInfo.validated = true;
+            UInfo.lastEmailCheck = std::time(nullptr);
+            UInfo.validationDate = std::time(nullptr);
+            Storage()->UpdateUserInfo(UInfo.email, Id, UInfo);
+            Types::StringPairVec FormVars{{"UUID",     Id},
+                                          {"USERNAME", UInfo.email},
+                                          {"ACTION_LINK",Daemon()->GetUIURI()}};
+            Poco::File FormFile{RESTAPI_Server()->AssetDir() + "/email_verification_success.html"};
+            SendHTMLFileBack(FormFile, Request, Response, FormVars);
+            return;
+        } else {
+            DoReturnA404(Request, Response);
+        }
+    }
+
+    void RESTAPI_action_links::DoReturnA404(Poco::Net::HTTPServerRequest &Request,
+                                            Poco::Net::HTTPServerResponse &Response) {
+        Types::StringPairVec FormVars;
+        Poco::File FormFile{RESTAPI_Server()->AssetDir() + "/404_error.html"};
+        SendHTMLFileBack(FormFile, Request, Response, FormVars);
+    }
+
+}
--- a/src/RESTAPI_action_links.h
+++ b/src/RESTAPI_action_links.h
@@ -0,0 +1,40 @@
+//
+// Created by stephane bourque on 2021-06-22.
+//
+
+#ifndef UCENTRALSEC_RESTAPI_ACTION_LINKS_H
+#define UCENTRALSEC_RESTAPI_ACTION_LINKS_H
+
+
+#include "RESTAPI_handler.h"
+#include "Poco/Net/PartHandler.h"
+#include "Poco/Message.h"
+#include "Poco/Net/MessageHeader.h"
+#include "Poco/Net/NameValueCollection.h"
+#include "Poco/NullStream.h"
+#include "Poco/StreamCopier.h"
+#include "Poco/CountingStream.h"
+
+namespace OpenWifi {
+    class RESTAPI_action_links : public RESTAPIHandler {
+    public:
+        RESTAPI_action_links(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, bool Internal)
+                : RESTAPIHandler(bindings, L,
+                                 std::vector<std::string>{
+                                                            Poco::Net::HTTPRequest::HTTP_GET,
+                                                            Poco::Net::HTTPRequest::HTTP_POST,
+                                                            Poco::Net::HTTPRequest::HTTP_OPTIONS},
+                                                            Internal) {}
+        void handleRequest(Poco::Net::HTTPServerRequest &Request,
+                           Poco::Net::HTTPServerResponse &Response) override;
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/actionLink"}; };
+        void DoResetPassword(std::string &Id,Poco::Net::HTTPServerRequest &Request,
+                            Poco::Net::HTTPServerResponse &Response);
+        void DoEmailVerification(std::string &Id,Poco::Net::HTTPServerRequest &Request,
+                            Poco::Net::HTTPServerResponse &Response);
+        void DoReturnA404(Poco::Net::HTTPServerRequest &Request,
+                          Poco::Net::HTTPServerResponse &Response);
+    };
+}
+
+#endif //UCENTRALSEC_RESTAPI_ACTION_LINKS_H
--- a/src/RESTAPI_avatarHandler.cpp
+++ b/src/RESTAPI_avatarHandler.cpp
@@ -0,0 +1,125 @@
+//
+// Created by stephane bourque on 2021-07-15.
+//
+
+#include <fstream>
+#include <iostream>
+
+#include "RESTAPI_avatarHandler.h"
+#include "StorageService.h"
+#include "Daemon.h"
+#include "Poco/Net/HTMLForm.h"
+#include "Utils.h"
+#include "RESTAPI_protocol.h"
+
+namespace OpenWifi {
+
+    void AvatarPartHandler::handlePart(const Poco::Net::MessageHeader &Header, std::istream &Stream) {
+        FileType_ = Header.get(RESTAPI::Protocol::CONTENTTYPE, RESTAPI::Protocol::UNSPECIFIED);
+        if (Header.has(RESTAPI::Protocol::CONTENTDISPOSITION)) {
+            std::string Disposition;
+            Poco::Net::NameValueCollection Parameters;
+            Poco::Net::MessageHeader::splitParameters(Header[RESTAPI::Protocol::CONTENTDISPOSITION], Disposition, Parameters);
+            Name_ = Parameters.get(RESTAPI::Protocol::NAME, RESTAPI::Protocol::UNNAMED);
+        }
+        Poco::CountingInputStream InputStream(Stream);
+        std::ofstream OutputStream(TempFile_.path(), std::ofstream::out);
+        Poco::StreamCopier::copyStream(InputStream, OutputStream);
+        Length_ = InputStream.chars();
+    };
+
+    void RESTAPI_avatarHandler::handleRequest(Poco::Net::HTTPServerRequest &Request,
+                                              Poco::Net::HTTPServerResponse &Response) {
+        if (!ContinueProcessing(Request, Response))
+            return;
+
+        if (!IsAuthorized(Request, Response))
+            return;
+
+        ParseParameters(Request);
+        if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
+            DoGet(Request, Response);
+        else if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST)
+            DoPost(Request, Response);
+        else if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_DELETE)
+            DoDelete(Request, Response);
+        else
+            BadRequest(Request, Response);
+    }
+
+    void RESTAPI_avatarHandler::DoPost(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+        try {
+            std::string Id = GetBinding(RESTAPI::Protocol::ID, "");
+            SecurityObjects::UserInfo UInfo;
+
+            if (Id.empty() || !Storage()->GetUserById(Id, UInfo)) {
+                NotFound(Request, Response);
+                return;
+            }
+
+            //  if there is an avatar, just remove it...
+            Storage()->DeleteAvatar(UserInfo_.userinfo.email,Id);
+
+            Poco::TemporaryFile TmpFile;
+            AvatarPartHandler partHandler(Id, Logger_, TmpFile);
+
+            Poco::Net::HTMLForm form(Request, Request.stream(), partHandler);
+            Poco::JSON::Object Answer;
+            if (!partHandler.Name().empty() && partHandler.Length()<Daemon()->ConfigGetInt("ucentral.avatar.maxsize",2000000)) {
+                Answer.set(RESTAPI::Protocol::AVATARID, Id);
+                Answer.set(RESTAPI::Protocol::ERRORCODE, 0);
+                Logger_.information(Poco::format("Uploaded avatar: %s Type: %s", partHandler.Name(), partHandler.ContentType()));
+                Storage()->SetAvatar(UserInfo_.userinfo.email,
+                                     Id, TmpFile, partHandler.ContentType(), partHandler.Name());
+            } else {
+                Answer.set(RESTAPI::Protocol::AVATARID, Id);
+                Answer.set(RESTAPI::Protocol::ERRORCODE, 13);
+                Answer.set(RESTAPI::Protocol::ERRORTEXT, "Avatar upload could not complete.");
+            }
+            ReturnObject(Request, Answer, Response);
+        } catch (const Poco::Exception &E) {
+            Logger_.log(E);
+        }
+        BadRequest(Request, Response);
+    }
+
+    void RESTAPI_avatarHandler::DoGet(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+        try {
+            std::string Id = GetBinding(RESTAPI::Protocol::ID, "");
+            if (Id.empty()) {
+                NotFound(Request, Response);
+                return;
+            }
+            Poco::TemporaryFile TempAvatar;
+            std::string Type, Name;
+            if (!Storage()->GetAvatar(UserInfo_.userinfo.email, Id, TempAvatar, Type, Name)) {
+                NotFound(Request, Response);
+                return;
+            }
+            SendFile(TempAvatar, Type, Name, Request, Response);
+            return;
+        } catch (const Poco::Exception&E) {
+            Logger_.log(E);
+        }
+        BadRequest(Request, Response);
+    }
+
+    void RESTAPI_avatarHandler::DoDelete(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+        try {
+            std::string Id = GetBinding(RESTAPI::Protocol::ID, "");
+            if (Id.empty()) {
+                NotFound(Request, Response);
+                return;
+            }
+            if (!Storage()->DeleteAvatar(UserInfo_.userinfo.email, Id)) {
+                NotFound(Request, Response);
+                return;
+            }
+            OK(Request, Response);
+            return;
+        } catch (const Poco::Exception &E) {
+            Logger_.log(E);
+        }
+        BadRequest(Request, Response);
+    }
+}
--- a/src/RESTAPI/RESTAPI_avatar_handler.h
+++ b/src/RESTAPI/RESTAPI_avatar_handler.h
@@ -1,51 +1,58 @@
 //
 // Created by stephane bourque on 2021-07-15.
 //
-#pragma once

-#include "framework/MicroService.h"
+#ifndef UCENTRALSEC_RESTAPI_AVATARHANDLER_H
+#define UCENTRALSEC_RESTAPI_AVATARHANDLER_H
+
+
+#include "RESTAPI_handler.h"

 namespace OpenWifi {

    class AvatarPartHandler : public Poco::Net::PartHandler {
    public:
-        AvatarPartHandler(std::string Id, Poco::Logger &Logger, std::stringstream & ofs) :
+        AvatarPartHandler(std::string Id, Poco::Logger &Logger, Poco::TemporaryFile &TmpFile) :
                Id_(std::move(Id)),
                Logger_(Logger),
-                OutputStream_(ofs){
+                TempFile_(TmpFile){
        }
        void handlePart(const Poco::Net::MessageHeader &Header, std::istream &Stream);
        [[nodiscard]] uint64_t Length() const { return Length_; }
        [[nodiscard]] std::string &Name() { return Name_; }
        [[nodiscard]] std::string &ContentType() { return FileType_; }
-
+        [[nodiscard]] std::string FileName() const { return TempFile_.path(); }
    private:
        uint64_t        Length_ = 0;
        std::string     FileType_;
        std::string     Name_;
        std::string     Id_;
        Poco::Logger    &Logger_;
-        std::stringstream &OutputStream_;
+        Poco::TemporaryFile &TempFile_;
    };

-    class RESTAPI_avatar_handler : public RESTAPIHandler {
+    class RESTAPI_avatarHandler : public RESTAPIHandler {
    public:
-        RESTAPI_avatar_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
+        RESTAPI_avatarHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, bool Internal)
                : RESTAPIHandler(bindings, L,
                                 std::vector<std::string>{
                                         Poco::Net::HTTPRequest::HTTP_GET,
                                         Poco::Net::HTTPRequest::HTTP_POST,
                                         Poco::Net::HTTPRequest::HTTP_DELETE,
                                         Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                         Server,
-                                         TransactionId,
                                         Internal) {}
+
+        void handleRequest(Poco::Net::HTTPServerRequest &Request,
+                           Poco::Net::HTTPServerResponse &Response) override;
+
        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/avatar/{id}"}; };

-        void DoGet() final;
-        void DoPost() final;
-        void DoDelete() final;
-        void DoPut() final {};
-
+        void DoGet(     Poco::Net::HTTPServerRequest &Request,
+                        Poco::Net::HTTPServerResponse &Response);
+        void DoPost(     Poco::Net::HTTPServerRequest &Request,
+                        Poco::Net::HTTPServerResponse &Response);
+        void DoDelete(     Poco::Net::HTTPServerRequest &Request,
+                        Poco::Net::HTTPServerResponse &Response);
    };
 }
+#endif //UCENTRALSEC_RESTAPI_AVATARHANDLER_H
--- a/src/RESTAPI_handler.cpp
+++ b/src/RESTAPI_handler.cpp
@@ -0,0 +1,407 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#include <cctype>
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+#include <future>
+#include <chrono>
+
+#include "Poco/URI.h"
+#include "Poco/Net/OAuth20Credentials.h"
+
+#ifdef	TIP_SECURITY_SERVICE
+#include "AuthService.h"
+#else
+#include "AuthClient.h"
+#endif
+
+#include "RESTAPI_handler.h"
+#include "RESTAPI_protocol.h"
+#include "Utils.h"
+#include "Daemon.h"
+
+namespace OpenWifi {
+
+	bool RESTAPIHandler::ParseBindings(const std::string & Request, const std::list<const char *> & EndPoints, BindingMap &bindings) {
+		std::string Param, Value;
+
+		bindings.clear();
+		std::vector<std::string> PathItems = Utils::Split(Request, '/');
+
+		for(const auto &EndPoint:EndPoints) {
+			std::vector<std::string> ParamItems = Utils::Split(EndPoint, '/');
+			if (PathItems.size() != ParamItems.size())
+				continue;
+
+			bool Matched = true;
+			for (auto i = 0; i != PathItems.size() && Matched; i++) {
+				// std::cout << "PATH:" << PathItems[i] << "  ENDPOINT:" << ParamItems[i] << std::endl;
+				if (PathItems[i] != ParamItems[i]) {
+					if (ParamItems[i][0] == '{') {
+						auto ParamName = ParamItems[i].substr(1, ParamItems[i].size() - 2);
+						bindings[Poco::toLower(ParamName)] = PathItems[i];
+					} else {
+						Matched = false;
+					}
+				}
+			}
+			if(Matched)
+				return true;
+		}
+		return false;
+	}
+
+	void RESTAPIHandler::PrintBindings() {
+		for (auto &[key, value] : Bindings_)
+			std::cout << "Key = " << key << "  Value= " << value << std::endl;
+	}
+
+	void RESTAPIHandler::ParseParameters(Poco::Net::HTTPServerRequest &request) {
+
+		Poco::URI uri(request.getURI());
+		Parameters_ = uri.getQueryParameters();
+	}
+
+	static bool is_number(const std::string &s) {
+		return !s.empty() && std::all_of(s.begin(), s.end(), ::isdigit);
+	}
+
+	static bool is_bool(const std::string &s) {
+		if (s == "true" || s == "false")
+			return true;
+		return false;
+	}
+
+	uint64_t RESTAPIHandler::GetParameter(const std::string &Name, const uint64_t Default) {
+
+		for (const auto &i : Parameters_) {
+			if (i.first == Name) {
+				if (!is_number(i.second))
+					return Default;
+				return std::stoi(i.second);
+			}
+		}
+		return Default;
+	}
+
+	bool RESTAPIHandler::GetBoolParameter(const std::string &Name, bool Default) {
+
+		for (const auto &i : Parameters_) {
+			if (i.first == Name) {
+				if (!is_bool(i.second))
+					return Default;
+				return i.second == "true";
+			}
+		}
+		return Default;
+	}
+
+	std::string RESTAPIHandler::GetParameter(const std::string &Name, const std::string &Default) {
+		for (const auto &i : Parameters_) {
+			if (i.first == Name)
+				return i.second;
+		}
+		return Default;
+	}
+
+	const std::string &RESTAPIHandler::GetBinding(const std::string &Name, const std::string &Default) {
+		auto E = Bindings_.find(Poco::toLower(Name));
+		if (E == Bindings_.end())
+			return Default;
+
+		return E->second;
+	}
+
+	static std::string MakeList(const std::vector<std::string> &L) {
+		std::string Return;
+		for (const auto &i : L)
+			if (Return.empty())
+				Return = i;
+			else
+				Return += ", " + i;
+
+		return Return;
+	}
+
+	void RESTAPIHandler::AddCORS(Poco::Net::HTTPServerRequest &Request,
+								 Poco::Net::HTTPServerResponse &Response) {
+		auto Origin = Request.find("Origin");
+		if (Origin != Request.end()) {
+			Response.set("Access-Control-Allow-Origin", Origin->second);
+			Response.set("Vary", "Origin");
+		} else {
+			Response.set("Access-Control-Allow-Origin", "*");
+		}
+		Response.set("Access-Control-Allow-Headers", "*");
+		Response.set("Access-Control-Allow-Methods", MakeList(Methods_));
+		Response.set("Access-Control-Max-Age", "86400");
+	}
+
+	void RESTAPIHandler::SetCommonHeaders(Poco::Net::HTTPServerResponse &Response, bool CloseConnection) {
+		Response.setVersion(Poco::Net::HTTPMessage::HTTP_1_1);
+		Response.setChunkedTransferEncoding(true);
+		Response.setContentType("application/json");
+		if(CloseConnection) {
+			Response.set("Connection", "close");
+			Response.setKeepAlive(false);
+		} else {
+			Response.setKeepAlive(true);
+			Response.set("Connection", "Keep-Alive");
+			Response.set("Keep-Alive", "timeout=5, max=1000");
+		}
+	}
+
+	void RESTAPIHandler::ProcessOptions(Poco::Net::HTTPServerRequest &Request,
+										Poco::Net::HTTPServerResponse &Response) {
+		AddCORS(Request, Response);
+		SetCommonHeaders(Response);
+		Response.setContentLength(0);
+		Response.set("Access-Control-Allow-Credentials", "true");
+		Response.setStatus(Poco::Net::HTTPResponse::HTTP_OK);
+		Response.set("Vary", "Origin, Access-Control-Request-Headers, Access-Control-Request-Method");
+		/*	std::cout << "RESPONSE:" << std::endl;
+			for(const auto &[f,s]:Response)
+				std::cout << "First: " << f << " second:" << s << std::endl;
+		*/
+		Response.send();
+	}
+
+	void RESTAPIHandler::PrepareResponse(Poco::Net::HTTPServerRequest &Request,
+										 Poco::Net::HTTPServerResponse &Response,
+										 Poco::Net::HTTPResponse::HTTPStatus Status,
+										 bool CloseConnection) {
+		Response.setStatus(Status);
+		AddCORS(Request, Response);
+		SetCommonHeaders(Response, CloseConnection);
+	}
+
+	void RESTAPIHandler::BadRequest(Poco::Net::HTTPServerRequest &Request,
+									Poco::Net::HTTPServerResponse &Response,
+									const std::string & Reason) {
+		PrepareResponse(Request, Response, Poco::Net::HTTPResponse::HTTP_BAD_REQUEST);
+		Poco::JSON::Object	ErrorObject;
+		ErrorObject.set("ErrorCode",500);
+		ErrorObject.set("ErrorDetails",Request.getMethod());
+		ErrorObject.set("ErrorDescription",Reason.empty() ? "Command is missing parameters or wrong values." : Reason) ;
+		std::ostream &Answer = Response.send();
+		Poco::JSON::Stringifier::stringify(ErrorObject, Answer);
+	}
+
+	void RESTAPIHandler::UnAuthorized(Poco::Net::HTTPServerRequest &Request,
+									  Poco::Net::HTTPServerResponse &Response,
+                                      const std::string & Reason) {
+		PrepareResponse(Request, Response, Poco::Net::HTTPResponse::HTTP_FORBIDDEN);
+		Poco::JSON::Object	ErrorObject;
+		ErrorObject.set("ErrorCode",403);
+		ErrorObject.set("ErrorDetails",Request.getMethod());
+		ErrorObject.set("ErrorDescription",Reason.empty() ? "No access allowed." : Reason) ;
+		std::ostream &Answer = Response.send();
+		Poco::JSON::Stringifier::stringify(ErrorObject, Answer);
+	}
+
+	void RESTAPIHandler::NotFound(Poco::Net::HTTPServerRequest &Request,
+								  Poco::Net::HTTPServerResponse &Response) {
+		PrepareResponse(Request, Response, Poco::Net::HTTPResponse::HTTP_NOT_FOUND);
+		Poco::JSON::Object	ErrorObject;
+		ErrorObject.set("ErrorCode",404);
+		ErrorObject.set("ErrorDetails",Request.getMethod());
+		ErrorObject.set("ErrorDescription","This resource does not exist.");
+		std::ostream &Answer = Response.send();
+		Poco::JSON::Stringifier::stringify(ErrorObject, Answer);
+	}
+
+	void RESTAPIHandler::OK(Poco::Net::HTTPServerRequest &Request,
+							Poco::Net::HTTPServerResponse &Response) {
+		PrepareResponse(Request, Response);
+		if(	Request.getMethod()==Poco::Net::HTTPRequest::HTTP_DELETE ||
+			Request.getMethod()==Poco::Net::HTTPRequest::HTTP_OPTIONS) {
+			Response.send();
+		} else {
+			Poco::JSON::Object ErrorObject;
+			ErrorObject.set("Code", 0);
+			ErrorObject.set("Operation", Request.getMethod());
+			ErrorObject.set("Details", "Command completed.");
+			std::ostream &Answer = Response.send();
+			Poco::JSON::Stringifier::stringify(ErrorObject, Answer);
+		}
+	}
+
+	void RESTAPIHandler::SendFile(Poco::File & File, const std::string & UUID, Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+		Response.set("Content-Type","application/octet-stream");
+		Response.set("Content-Disposition", "attachment; filename=" + UUID );
+		Response.set("Content-Transfer-Encoding","binary");
+		Response.set("Accept-Ranges", "bytes");
+		Response.set("Cache-Control", "private");
+		Response.set("Pragma", "private");
+		Response.set("Expires", "Mon, 26 Jul 2027 05:00:00 GMT");
+		Response.set("Content-Length", std::to_string(File.getSize()));
+		AddCORS(Request, Response);
+		Response.sendFile(File.path(),"application/octet-stream");
+	}
+
+    void RESTAPIHandler::SendFile(Poco::File & File, Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+        Poco::Path  P(File.path());
+        auto MT = Utils::FindMediaType(File);
+        if(MT.Encoding==Utils::BINARY) {
+            Response.set("Content-Transfer-Encoding","binary");
+            Response.set("Accept-Ranges", "bytes");
+        }
+        Response.set("Cache-Control", "private");
+        Response.set("Pragma", "private");
+        Response.set("Expires", "Mon, 26 Jul 2027 05:00:00 GMT");
+        AddCORS(Request, Response);
+        Response.sendFile(File.path(),MT.ContentType);
+    }
+
+    void RESTAPIHandler::SendFile(Poco::TemporaryFile &TempAvatar, const std::string &Type, const std::string & Name, Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response) {
+        auto MT = Utils::FindMediaType(Name);
+        if(MT.Encoding==Utils::BINARY) {
+            Response.set("Content-Transfer-Encoding","binary");
+            Response.set("Accept-Ranges", "bytes");
+        }
+        Response.set("Content-Disposition", "attachment; filename=" + Name );
+        Response.set("Accept-Ranges", "bytes");
+        Response.set("Cache-Control", "private");
+        Response.set("Pragma", "private");
+        Response.set("Expires", "Mon, 26 Jul 2027 05:00:00 GMT");
+        AddCORS(Request, Response);
+        Response.sendFile(TempAvatar.path(),MT.ContentType);
+	}
+
+    void RESTAPIHandler::SendHTMLFileBack(Poco::File & File,
+                          Poco::Net::HTTPServerRequest &Request,
+                          Poco::Net::HTTPServerResponse &Response ,
+                          const Types::StringPairVec & FormVars) {
+        Response.set("Pragma", "private");
+        Response.set("Expires", "Mon, 26 Jul 2027 05:00:00 GMT");
+        Response.set("Content-Length", std::to_string(File.getSize()));
+        AddCORS(Request, Response);
+        auto FormContent = Utils::LoadFile(File.path());
+        Utils::ReplaceVariables(FormContent, FormVars);
+        Response.setChunkedTransferEncoding(true);
+        Response.setContentType("text/html");
+        std::ostream& ostr = Response.send();
+        ostr << FormContent;
+	}
+
+    void RESTAPIHandler::ReturnStatus(Poco::Net::HTTPServerRequest &Request,
+									  Poco::Net::HTTPServerResponse &Response,
+									  Poco::Net::HTTPResponse::HTTPStatus Status,
+									  bool CloseConnection) {
+		PrepareResponse(Request, Response, Status, CloseConnection);
+		if(Status == Poco::Net::HTTPResponse::HTTP_NO_CONTENT) {
+			Response.setContentLength(0);
+			Response.erase("Content-Type");
+			Response.setChunkedTransferEncoding(false);
+		}
+		Response.send();
+	}
+
+	bool RESTAPIHandler::ContinueProcessing(Poco::Net::HTTPServerRequest &Request,
+											Poco::Net::HTTPServerResponse &Response) {
+		if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_OPTIONS) {
+			ProcessOptions(Request, Response);
+			return false;
+		} else if (std::find(Methods_.begin(), Methods_.end(), Request.getMethod()) == Methods_.end()) {
+			BadRequest(Request, Response);
+			return false;
+		}
+
+		return true;
+	}
+
+	bool RESTAPIHandler::IsAuthorized(Poco::Net::HTTPServerRequest &Request,
+									  Poco::Net::HTTPServerResponse &Response) {
+	    if(Internal_) {
+	        return Daemon()->IsValidAPIKEY(Request);
+	    } else {
+            if (SessionToken_.empty()) {
+                try {
+                    Poco::Net::OAuth20Credentials Auth(Request);
+
+                    if (Auth.getScheme() == "Bearer") {
+                        SessionToken_ = Auth.getBearerToken();
+                    }
+                } catch (const Poco::Exception &E) {
+                    Logger_.log(E);
+                }
+            }
+#ifdef    TIP_SECURITY_SERVICE
+            if (AuthService()->IsAuthorized(Request, SessionToken_, UserInfo_)) {
+#else
+            if (AuthClient()->IsAuthorized(Request, SessionToken_, UserInfo_)) {
+#endif
+                return true;
+            } else {
+                UnAuthorized(Request, Response);
+            }
+            return false;
+        }
+	}
+
+/*
+	bool RESTAPIHandler::ValidateAPIKey(Poco::Net::HTTPServerRequest &Request,
+										Poco::Net::HTTPServerResponse &Response) {
+		auto Key = Request.get("X-API-KEY", "");
+
+		if (Key.empty())
+			return false;
+
+		return true;
+	}
+*/
+	void RESTAPIHandler::ReturnObject(Poco::Net::HTTPServerRequest &Request, Poco::JSON::Object &Object,
+									  Poco::Net::HTTPServerResponse &Response) {
+		PrepareResponse(Request, Response);
+		std::ostream &Answer = Response.send();
+		Poco::JSON::Stringifier::stringify(Object, Answer);
+	}
+
+	bool RESTAPIHandler::InitQueryBlock() {
+		QB_.SerialNumber = GetParameter(RESTAPI::Protocol::SERIALNUMBER, "");
+		QB_.StartDate = GetParameter(RESTAPI::Protocol::STARTDATE, 0);
+		QB_.EndDate = GetParameter(RESTAPI::Protocol::ENDDATE, 0);
+		QB_.Offset = GetParameter(RESTAPI::Protocol::OFFSET, 1);
+		QB_.Limit = GetParameter(RESTAPI::Protocol::LIMIT, 100);
+		QB_.Filter = GetParameter(RESTAPI::Protocol::FILTER, "");
+		QB_.Select = GetParameter(RESTAPI::Protocol::SELECT, "");
+		QB_.Lifetime = GetBoolParameter(RESTAPI::Protocol::LIFETIME,false);
+		QB_.LogType = GetParameter(RESTAPI::Protocol::LOGTYPE,0);
+		QB_.LastOnly = GetBoolParameter(RESTAPI::Protocol::LASTONLY,false);
+		QB_.Newest = GetBoolParameter(RESTAPI::Protocol::NEWEST,false);
+
+		if(QB_.Offset<1) return false;
+		return true;
+	}
+
+	[[nodiscard]] uint64_t RESTAPIHandler::Get(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, uint64_t Default){
+		if(Obj->has(Parameter))
+			return Obj->get(Parameter);
+		return Default;
+	}
+
+	[[nodiscard]] std::string RESTAPIHandler::GetS(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, const std::string & Default){
+		if(Obj->has(Parameter))
+			return Obj->get(Parameter).toString();
+		return Default;
+	}
+
+	[[nodiscard]] bool RESTAPIHandler::GetB(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, bool Default){
+		if(Obj->has(Parameter))
+			return Obj->get(Parameter).toString()=="true";
+		return Default;
+	}
+
+	[[nodiscard]] uint64_t RESTAPIHandler::GetWhen(const Poco::JSON::Object::Ptr &Obj) {
+		return RESTAPIHandler::Get(RESTAPI::Protocol::WHEN, Obj);
+	}
+
+
+}
--- a/src/RESTAPI_handler.h
+++ b/src/RESTAPI_handler.h
@@ -0,0 +1,215 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#ifndef UCENTRAL_RESTAPI_HANDLER_H
+#define UCENTRAL_RESTAPI_HANDLER_H
+
+#include "Poco/URI.h"
+#include "Poco/Net/HTTPRequestHandler.h"
+#include "Poco/Net/HTTPRequestHandlerFactory.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/Net/NetException.h"
+#include "Poco/Net/PartHandler.h"
+
+#include "Poco/Logger.h"
+#include "Poco/File.h"
+#include "Poco/TemporaryFile.h"
+#include "Poco/JSON/Object.h"
+#include "Poco/CountingStream.h"
+#include "Poco/NullStream.h"
+
+#include "RESTAPI_SecurityObjects.h"
+
+namespace OpenWifi {
+
+    class RESTAPI_PartHandler: public Poco::Net::PartHandler
+    {
+    public:
+        RESTAPI_PartHandler():
+                _length(0)
+        {
+        }
+
+        void handlePart(const Poco::Net::MessageHeader& header, std::istream& stream) override
+        {
+            _type = header.get("Content-Type", "(unspecified)");
+            if (header.has("Content-Disposition"))
+            {
+                std::string disp;
+                Poco::Net::NameValueCollection params;
+                Poco::Net::MessageHeader::splitParameters(header["Content-Disposition"], disp, params);
+                _name = params.get("name", "(unnamed)");
+                _fileName = params.get("filename", "(unnamed)");
+            }
+
+            Poco::CountingInputStream istr(stream);
+            Poco::NullOutputStream ostr;
+            Poco::StreamCopier::copyStream(istr, ostr);
+            _length = (int)istr.chars();
+        }
+
+        [[nodiscard]] int length() const
+        {
+            return _length;
+        }
+
+        [[nodiscard]] const std::string& name() const
+        {
+            return _name;
+        }
+
+        [[nodiscard]] const std::string& fileName() const
+        {
+            return _fileName;
+        }
+
+        [[nodiscard]] const std::string& contentType() const
+        {
+            return _type;
+        }
+
+    private:
+        int _length;
+        std::string _type;
+        std::string _name;
+        std::string _fileName;
+    };
+
+    class RESTAPIHandler : public Poco::Net::HTTPRequestHandler {
+	  public:
+		struct QueryBlock {
+			uint64_t StartDate = 0 , EndDate = 0 , Offset = 0 , Limit = 0, LogType = 0 ;
+			std::string SerialNumber, Filter, Select;
+			bool Lifetime=false, LastOnly=false, Newest=false;
+		};
+
+		typedef std::map<std::string, std::string> BindingMap;
+
+		RESTAPIHandler(BindingMap map, Poco::Logger &l, std::vector<std::string> Methods, bool Internal=false)
+			: Bindings_(std::move(map)), Logger_(l), Methods_(std::move(Methods)), Internal_(Internal) {}
+
+		static bool ParseBindings(const std::string & Request, const std::list<const char *> & EndPoints, BindingMap &Keys);
+		void PrintBindings();
+		void ParseParameters(Poco::Net::HTTPServerRequest &request);
+
+		void AddCORS(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &response);
+	 	void SetCommonHeaders(Poco::Net::HTTPServerResponse &response, bool CloseConnection=false);
+		void ProcessOptions(Poco::Net::HTTPServerRequest &Request,
+							Poco::Net::HTTPServerResponse &response);
+		void
+		PrepareResponse(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &response,
+						Poco::Net::HTTPResponse::HTTPStatus Status = Poco::Net::HTTPResponse::HTTP_OK,
+						bool CloseConnection = false);
+		bool ContinueProcessing(Poco::Net::HTTPServerRequest &Request,
+								Poco::Net::HTTPServerResponse &Response);
+
+		bool IsAuthorized(Poco::Net::HTTPServerRequest &Request,
+						  Poco::Net::HTTPServerResponse &Response);
+/*		bool ValidateAPIKey(Poco::Net::HTTPServerRequest &Request,
+							Poco::Net::HTTPServerResponse &Response); */
+
+		uint64_t GetParameter(const std::string &Name, uint64_t Default);
+		std::string GetParameter(const std::string &Name, const std::string &Default);
+		bool GetBoolParameter(const std::string &Name, bool Default);
+
+		void BadRequest(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response, const std::string &Reason = "");
+		void UnAuthorized(Poco::Net::HTTPServerRequest &Request,
+						  Poco::Net::HTTPServerResponse &Response, const std::string &Reason = "");
+		void ReturnObject(Poco::Net::HTTPServerRequest &Request, Poco::JSON::Object &Object,
+						  Poco::Net::HTTPServerResponse &Response);
+		void NotFound(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response);
+		void OK(Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response);
+		void ReturnStatus(Poco::Net::HTTPServerRequest &Request,
+						  Poco::Net::HTTPServerResponse &Response,
+						  Poco::Net::HTTPResponse::HTTPStatus Status,
+						  bool CloseConnection=false);
+		void SendFile(Poco::File & File, const std::string & UUID,
+					  Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response);
+		void SendHTMLFileBack(Poco::File & File,
+                              Poco::Net::HTTPServerRequest &Request,
+                              Poco::Net::HTTPServerResponse &Response ,
+                              const Types::StringPairVec & FormVars);
+        void SendFile(Poco::TemporaryFile &TempAvatar, const std::string &Type, const std::string & Name, Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response);
+
+        void SendFile(Poco::File & File, Poco::Net::HTTPServerRequest &Request, Poco::Net::HTTPServerResponse &Response);
+
+        const std::string &GetBinding(const std::string &Name, const std::string &Default);
+		bool InitQueryBlock();
+
+		[[nodiscard]] static uint64_t Get(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, uint64_t Default=0);
+		[[nodiscard]] static std::string GetS(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, const std::string & Default="");
+		[[nodiscard]] static bool GetB(const char *Parameter,const Poco::JSON::Object::Ptr &Obj, bool Default=false);
+		[[nodiscard]] static uint64_t GetWhen(const Poco::JSON::Object::Ptr &Obj);
+
+	  protected:
+		BindingMap 					Bindings_;
+		Poco::URI::QueryParameters 	Parameters_;
+		Poco::Logger 				&Logger_;
+		std::string 				SessionToken_;
+		SecurityObjects::UserInfoAndPolicy 	UserInfo_;
+		std::vector<std::string> 	Methods_;
+		QueryBlock					QB_;
+		bool                        Internal_=false;
+	};
+
+	class RESTAPI_UnknownRequestHandler : public RESTAPIHandler {
+	  public:
+		RESTAPI_UnknownRequestHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L)
+			: RESTAPIHandler(bindings, L, std::vector<std::string>{}) {}
+		void handleRequest(Poco::Net::HTTPServerRequest &Request,
+						   Poco::Net::HTTPServerResponse &Response) override {
+			if (!IsAuthorized(Request, Response))
+				return;
+			BadRequest(Request, Response, "Unknown API endpoint");
+		}
+	};
+
+	template<class T>
+	constexpr auto test_has_PathName_method(T*)
+	-> decltype(  T::PathName() , std::true_type{} )
+	{
+		return std::true_type{};
+	}
+	constexpr auto test_has_PathName_method(...) -> std::false_type
+	{
+		return std::false_type{};
+	}
+
+	template<typename T, typename... Args>
+	RESTAPIHandler * RESTAPI_Router(const std::string & RequestedPath, RESTAPIHandler::BindingMap &Bindings, Poco::Logger & Logger ) {
+		static_assert(test_has_PathName_method((T*)nullptr), "Class must have a static PathName() method.");
+		if(RESTAPIHandler::ParseBindings(RequestedPath,T::PathName(),Bindings)) {
+			return new T(Bindings, Logger, false);
+		}
+
+		if constexpr (sizeof...(Args) == 0) {
+			return new RESTAPI_UnknownRequestHandler(Bindings,Logger);
+		} else {
+			return RESTAPI_Router<Args...>(RequestedPath, Bindings, Logger);
+		}
+	}
+
+    template<typename T, typename... Args>
+    RESTAPIHandler * RESTAPI_Router_I(const std::string & RequestedPath, RESTAPIHandler::BindingMap &Bindings, Poco::Logger & Logger) {
+        static_assert(test_has_PathName_method((T*)nullptr), "Class must have a static PathName() method.");
+        if(RESTAPIHandler::ParseBindings(RequestedPath,T::PathName(),Bindings)) {
+            return new T(Bindings, Logger, true);
+        }
+
+        if constexpr (sizeof...(Args) == 0) {
+            return new RESTAPI_UnknownRequestHandler(Bindings,Logger);
+        } else {
+            return RESTAPI_Router_I<Args...>(RequestedPath, Bindings, Logger);
+        }
+    }
+
+
+}
+
+#endif //UCENTRAL_RESTAPI_HANDLER_H
--- a/src/RESTAPI_oauth2Handler.cpp
+++ b/src/RESTAPI_oauth2Handler.cpp
@@ -0,0 +1,112 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#include "Poco/JSON/Parser.h"
+
+#include "AuthService.h"
+#include "RESTAPI_oauth2Handler.h"
+#include "RESTAPI_protocol.h"
+#include "RESTAPI_server.h"
+
+#include "Utils.h"
+
+namespace OpenWifi {
+	void RESTAPI_oauth2Handler::handleRequest(Poco::Net::HTTPServerRequest &Request,
+											  Poco::Net::HTTPServerResponse &Response) {
+
+		if (!ContinueProcessing(Request, Response))
+			return;
+
+		try {
+            ParseParameters(Request);
+			if (Request.getMethod() == Poco::Net::HTTPServerRequest::HTTP_POST) {
+				// Extract the info for login...
+				Poco::JSON::Parser parser;
+				Poco::JSON::Object::Ptr Obj = parser.parse(Request.stream()).extract<Poco::JSON::Object::Ptr>();
+
+				auto userId = GetS(RESTAPI::Protocol::USERID, Obj);
+				auto password = GetS(RESTAPI::Protocol::PASSWORD, Obj);
+				auto newPassword = GetS(RESTAPI::Protocol::NEWPASSWORD, Obj);
+
+                if(GetBoolParameter(RESTAPI::Protocol::REQUIREMENTS, false)) {
+                    Poco::JSON::Object  Answer;
+                    Answer.set(RESTAPI::Protocol::PASSWORDPATTERN, AuthService()->PasswordValidationExpression());
+                    Answer.set(RESTAPI::Protocol::ACCESSPOLICY, RESTAPI_Server()->GetAccessPolicy());
+                    Answer.set(RESTAPI::Protocol::PASSWORDPOLICY, RESTAPI_Server()->GetPasswordPolicy());
+                    ReturnObject(Request, Answer, Response);
+                    return;
+                }
+
+                if(GetBoolParameter(RESTAPI::Protocol::FORGOTPASSWORD,false)) {
+                    //  Send an email to the userId
+                    SecurityObjects::UserInfoAndPolicy UInfo;
+                    if(AuthService::SendEmailToUser(userId,AuthService::FORGOT_PASSWORD))
+                        Logger_.information(Poco::format("Send password reset link to %s",userId));
+                    UInfo.webtoken.userMustChangePassword=true;
+                    Poco::JSON::Object ReturnObj;
+                    UInfo.webtoken.to_json(ReturnObj);
+                    ReturnObject(Request, ReturnObj, Response);
+                    return;
+                }
+
+				Poco::toLowerInPlace(userId);
+                SecurityObjects::UserInfoAndPolicy UInfo;
+
+                auto Code=AuthService()->Authorize(userId, password, newPassword, UInfo);
+				if (Code==AuthService::SUCCESS) {
+					Poco::JSON::Object ReturnObj;
+                    UInfo.webtoken.to_json(ReturnObj);
+					ReturnObject(Request, ReturnObj, Response);
+					return;
+				} else {
+				    switch(Code) {
+				        case AuthService::INVALID_CREDENTIALS: UnAuthorized(Request, Response, "Unrecognized credentials (username/password)."); break;
+                        case AuthService::PASSWORD_INVALID: UnAuthorized(Request, Response, "Invalid password."); break;
+                        case AuthService::PASSWORD_ALREADY_USED: UnAuthorized(Request, Response, "Password already used previously."); break;
+                        case AuthService::USERNAME_PENDING_VERIFICATION: UnAuthorized(Request, Response, "User access pending email verification."); break;
+                        case AuthService::PASSWORD_CHANGE_REQUIRED: UnAuthorized(Request, Response, "Password change expected."); break;
+                        default: UnAuthorized(Request, Response, "Unrecognized credentials (username/password)."); break;
+				    }
+				    return;
+				}
+			} else if (Request.getMethod() == Poco::Net::HTTPServerRequest::HTTP_DELETE) {
+				if (!IsAuthorized(Request, Response)) {
+                    UnAuthorized(Request, Response, "Not authorized.");
+					return;
+				}
+				auto Token = GetBinding(RESTAPI::Protocol::TOKEN, "...");
+				if (Token == SessionToken_) {
+					AuthService()->Logout(Token);
+					ReturnStatus(Request, Response, Poco::Net::HTTPResponse::HTTP_NO_CONTENT, true);
+				} else {
+					NotFound(Request, Response);
+				}
+			} else if (Request.getMethod() == Poco::Net::HTTPServerRequest::HTTP_GET) {
+                if (!IsAuthorized(Request, Response)) {
+                    UnAuthorized(Request, Response, "Not authorized.");
+                    return;
+                }
+                bool GetMe = GetBoolParameter(RESTAPI::Protocol::ME, false);
+                if(GetMe) {
+                    Poco::JSON::Object Me;
+                    UserInfo_.userinfo.to_json(Me);
+                    ReturnObject(Request, Me, Response);
+                    return;
+                }
+                BadRequest(Request, Response);
+			} else {
+                BadRequest(Request, Response, "Unsupported HTTP method.");
+			}
+			return;
+		} catch (const Poco::Exception &E) {
+			Logger_.warning(
+				Poco::format("%s: Failed with: %s", std::string(__func__), E.displayText()));
+		}
+		BadRequest(Request, Response);
+	}
+}
--- a/src/RESTAPI/RESTAPI_oauth2_handler.h
+++ b/src/RESTAPI/RESTAPI_oauth2_handler.h
@@ -6,27 +6,24 @@
 //	Arilia Wireless Inc.
 //

-#pragma once
-#include "framework/MicroService.h"
+#ifndef UCENTRAL_RESTAPI_OAUTH2HANDLER_H
+#define UCENTRAL_RESTAPI_OAUTH2HANDLER_H
+
+#include "RESTAPI_handler.h"

 namespace OpenWifi {
-	class RESTAPI_oauth2_handler : public RESTAPIHandler {
+	class RESTAPI_oauth2Handler : public RESTAPIHandler {
 	  public:
-	    RESTAPI_oauth2_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
+		RESTAPI_oauth2Handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, bool Internal)
 			: RESTAPIHandler(bindings, L,
 							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_POST,
 													  Poco::Net::HTTPRequest::HTTP_DELETE,
                                                      Poco::Net::HTTPRequest::HTTP_GET,
 													  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-													  Server,
-                                                      TransactionId,
-													  Internal, false, true , RateLimit{.Interval=1000,.MaxCalls=10}) {}
+													  Internal) {}
+		void handleRequest(Poco::Net::HTTPServerRequest &request,
+						   Poco::Net::HTTPServerResponse &response) override;
 		static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/oauth2/{token}","/api/v1/oauth2"}; };
-		void DoGet() final;
-		void DoPost() final;
-		void DoDelete() final;
-		void DoPut() final {};
 	};
 }
-
-
+#endif //UCENTRAL_RESTAPI_OAUTH2HANDLER_H
--- a/src/framework/RESTAPI_protocol.h
+++ b/src/framework/RESTAPI_protocol.h
@@ -6,7 +6,8 @@
 //	Arilia Wireless Inc.
 //

-#pragma once
+#ifndef UCENTRALGW_RESTAPI_PROTOCOL_H
+#define UCENTRALGW_RESTAPI_PROTOCOL_H

 namespace OpenWifi::RESTAPI::Protocol {
 	static const char * CAPABILITIES = "capabilities";
@@ -68,13 +69,7 @@ namespace OpenWifi::RESTAPI::Protocol {
 	static const char * COMMANDUUID = "commandUUID";
 	static const char * FIRMWARES = "firmwares";
 	static const char * TOPIC = "topic";
-	static const char * HOST = "host";
-	static const char * OS = "os";
-	static const char * HOSTNAME = "hostname";
-	static const char * PROCESSORS = "processors";
 	static const char * REASON = "reason";
-	static const char * RELOAD = "reload";
-	static const char * SUBSYSTEMS = "subsystems";
 	static const char * FILEUUID = "uuid";
 	static const char * USERID = "userId";
 	static const char * PASSWORD = "password";
@@ -84,13 +79,11 @@ namespace OpenWifi::RESTAPI::Protocol {
 	static const char * GETSUBSYSTEMNAMES = "getsubsystemnames";
 	static const char * GETLOGLEVELNAMES = "getloglevelnames";
 	static const char * STATS = "stats";
-	static const char * PING = "ping";
 	static const char * PARAMETERS = "parameters";
 	static const char * VALUE = "value";
 	static const char * LASTONLY = "lastOnly";
 	static const char * NEWEST = "newest";
 	static const char * ACTIVESCAN = "activeScan";
-	static const char * OVERRIDEDFS = "override_dfs";
 	static const char * LIST = "list";
 	static const char * TAG = "tag";
 	static const char * TAGLIST = "tagList";
@@ -114,7 +107,6 @@ namespace OpenWifi::RESTAPI::Protocol {

    static const char * NEWPASSWORD = "newPassword";
    static const char * USERS = "users";
-    static const char * WITHEXTENDEDINFO = "withExtendedInfo";

    static const char * ERRORTEXT = "errorText";
    static const char * ERRORCODE = "errorCode";
@@ -129,11 +121,8 @@ namespace OpenWifi::RESTAPI::Protocol {
    static const char * ACCESSPOLICY = "accessPolicy";
    static const char * PASSWORDPOLICY = "passwordPolicy";
    static const char * FORGOTPASSWORD = "forgotPassword";
-    static const char * RESENDMFACODE = "resendMFACode";
-    static const char * COMPLETEMFACHALLENGE = "completeMFAChallenge";
    static const char * ME = "me";
-    static const char * TELEMETRY = "telemetry";
-    static const char * INTERVAL = "interval";
-    static const char * UI = "UI";

 }
+
+#endif // UCENTRALGW_RESTAPI_PROTOCOL_H
--- a/src/RESTAPI_server.cpp
+++ b/src/RESTAPI_server.cpp
@@ -0,0 +1,85 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#include <memory>
+
+#include "Poco/URI.h"
+
+#include "RESTAPI_server.h"
+#include "RESTAPI_oauth2Handler.h"
+#include "RESTAPI_system_command.h"
+#include "RESTAPI_user_handler.h"
+#include "RESTAPI_users_handler.h"
+#include "RESTAPI_action_links.h"
+#include "RESTAPI_systemEndpoints_handler.h"
+#include "RESTAPI_AssetServer.h"
+#include "RESTAPI_avatarHandler.h"
+
+#include "Daemon.h"
+#include "Utils.h"
+
+namespace OpenWifi {
+
+    class RESTAPI_Server *RESTAPI_Server::instance_ = nullptr;
+
+    int RESTAPI_Server::Start() {
+        Logger_.information("Starting.");
+
+        AsserDir_ = Daemon()->ConfigPath("ucentral.restapi.wwwassets");
+        AccessPolicy_ = Daemon()->ConfigGetString("ucentral.document.policy.access", "/wwwassets/access_policy.html");
+        PasswordPolicy_ = Daemon()->ConfigGetString("ucentral.document.policy.password", "/wwwassets/possword_policy.html");
+
+        for(const auto & Svr: ConfigServersList_) {
+			Logger_.information(Poco::format("Starting: %s:%s Keyfile:%s CertFile: %s", Svr.Address(), std::to_string(Svr.Port()),
+											 Svr.KeyFile(),Svr.CertFile()));
+
+            auto Sock{Svr.CreateSecureSocket(Logger_)};
+
+			Svr.LogCert(Logger_);
+			if(!Svr.RootCA().empty())
+				Svr.LogCas(Logger_);
+
+            auto Params = new Poco::Net::HTTPServerParams;
+            Params->setMaxThreads(50);
+            Params->setMaxQueued(200);
+			Params->setKeepAlive(true);
+
+            auto NewServer = std::make_unique<Poco::Net::HTTPServer>(new RequestHandlerFactory, Pool_, Sock, Params);
+            NewServer->start();
+            RESTServers_.push_back(std::move(NewServer));
+        }
+
+        return 0;
+    }
+
+    Poco::Net::HTTPRequestHandler *RequestHandlerFactory::createRequestHandler(const Poco::Net::HTTPServerRequest & Request) {
+
+        Logger_.debug(Poco::format("REQUEST(%s): %s %s", Utils::FormatIPv6(Request.clientAddress().toString()), Request.getMethod(), Request.getURI()));
+
+        Poco::URI uri(Request.getURI());
+        const auto & Path = uri.getPath();
+        RESTAPIHandler::BindingMap Bindings;
+        return RESTAPI_Router<
+                RESTAPI_oauth2Handler,
+                RESTAPI_users_handler,
+                RESTAPI_user_handler,
+                RESTAPI_system_command,
+                RESTAPI_AssetServer,
+                RESTAPI_systemEndpoints_handler,
+                RESTAPI_action_links,
+                RESTAPI_avatarHandler
+                >(Path,Bindings,Logger_);
+    }
+
+    void RESTAPI_Server::Stop() {
+        Logger_.information("Stopping ");
+        for( const auto & svr : RESTServers_ )
+            svr->stop();
+    }
+
+}  // namespace
--- a/Show More
+++ b/Show More