[WIFI-10236] Fix: image building

Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>

.github/workflows/ci.yml

@@ -13,7 +13,6 @@ on:
   pull_request:
     branches:
       - main
-      - 'release/*'
 
 defaults:
   run:
@@ -27,7 +26,7 @@ jobs:
       DOCKER_REGISTRY_USERNAME: ucentral
     steps:
     - name: Checkout actions repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         repository: Telecominfraproject/.github
         path: github
@@ -40,16 +39,6 @@ jobs:
         registry_user: ucentral
         registry_password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
 
-    - name: Notify on failure via Slack
-      if: failure() && github.ref == 'refs/heads/main'
-      uses: rtCamp/action-slack-notify@v2
-      env:
-        SLACK_USERNAME: GitHub Actions failure notifier
-        SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-        SLACK_COLOR: "${{ job.status }}"
-        SLACK_ICON: https://raw.githubusercontent.com/quintessence/slack-icons/master/images/github-logo-slack-icon.png
-        SLACK_TITLE: Docker build failed for OWSec service
-
   trigger-testing:
     if: startsWith(github.ref, 'refs/pull/')
     runs-on: ubuntu-latest
@@ -58,11 +47,11 @@ jobs:
     - name: Get base branch name and set as output
       id: get_base_branch
       run: |
-        echo "branch=$(echo ${GITHUB_BASE_REF##*/})" >> $GITHUB_OUTPUT
-        echo "owgw_branch=$(echo ${GITHUB_BASE_REF##*/} | sed 's/main/master/g')" >> $GITHUB_OUTPUT
+        echo ::set-output name=branch::$(echo ${GITHUB_BASE_REF##*/})
+        echo ::set-output name=owgw_branch::$(echo ${GITHUB_BASE_REF##*/} | sed 's/main/master/g')
 
     - name: Checkout actions repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         repository: Telecominfraproject/.github
         path: github
@@ -78,26 +67,4 @@ jobs:
         workflow: ow_docker-compose.yml
         token: ${{ secrets.WLAN_TESTING_PAT }}
         ref: master
-        inputs: '{"deployment_version": "${{ env.BASE_BRANCH }}", "owgw_version": "${{ env.OWGW_BASE_BRANCH }}", "owsec_version": "${{ github.sha }}", "owfms_version": "${{ env.BASE_BRANCH }}", "owprov_version": "${{ env.BASE_BRANCH }}", "owanalytics_version": "${{ env.BASE_BRANCH }}", "owsub_version": "${{ env.BASE_BRANCH }}", "microservice": "owsec"}'
-
-  trigger-deploy-to-dev:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
-    needs:
-      - docker
-    steps:
-    - name: Checkout actions repo
-      uses: actions/checkout@v3
-      with:
-        repository: Telecominfraproject/.github
-        path: github
-
-    - name: Trigger deployment of the latest version to dev instance and wait for result
-      uses: ./github/composite-actions/trigger-workflow-and-wait
-      with:
-        owner: Telecominfraproject
-        repo: wlan-testing
-        workflow: ucentralgw-dev-deployment.yaml
-        token: ${{ secrets.WLAN_TESTING_PAT }}
-        ref: master
-        inputs: '{"force_latest": "true"}'
+        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"}'

.github/workflows/cleanup.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - main
-      - 'release/*'
     types: [ closed ]
 
 defaults:
@@ -17,10 +16,4 @@ jobs:
     steps:
       - run: |
           export PR_BRANCH_TAG=$(echo ${GITHUB_HEAD_REF#refs/heads/} | tr '/' '-')
-
-          if [[ ! $PR_BRANCH_TAG =~ (main|master|release-*) ]]; then
-            echo "PR branch is $PR_BRANCH_TAG, deleting Docker image"
-            curl -s -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/owsec/$PR_BRANCH_TAG"
-          else
-            echo "PR branch is $PR_BRANCH_TAG, not deleting Docker image"
-          fi
+          curl -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/owsec/$PR_BRANCH_TAG"

.github/workflows/enforce-jira-issue-key.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout actions repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           repository: Telecominfraproject/.github
           path: github

.github/workflows/openapi-pages.yml

@@ -1,38 +0,0 @@
-name: Update OpenAPI docs on GitHub Pages
-
-on:
-  push:
-    paths:
-      - 'openapi/**'
-    branches:
-      - main
-  workflow_dispatch:
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  docsgen:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Generate static HTML page with docs from OpenAPI definition
-        run: |
-          docker run --rm -v "${PWD}:/local" openapitools/openapi-generator-cli:v6.2.1 generate -i https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-ucentralsec/main/openpapi/owsec.yaml -g html2 --skip-validate-spec -o /local/
-
-      - name: Update OpenAPI docs
-        run: |
-          mkdir -p ~/.ssh
-          ssh-keyscan -H github.com >> ~/.ssh/known_hosts
-          echo https://tip-automation:${{ secrets.GIT_PUSH_PAT }}@github.com > ~/.git-credentials
-          git config --global credential.helper store
-          git config --global user.email "tip-automation@telecominfraproject.com"
-          git config --global user.name "TIP Automation User"
-          git pull
-          git checkout gh-pages || git checkout -b gh-pages
-          mv index.html docs/index.html
-          git add docs
-          git commit -m'Update OpenAPI docs for GitHub pages'
-          git push --set-upstream origin gh-pages

.github/workflows/release.yml

@@ -1,46 +0,0 @@
-name: Release chart package
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  helm-package:
-    runs-on: ubuntu-20.04
-    env:
-      HELM_REPO_URL: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
-      HELM_REPO_USERNAME: ucentral
-    steps:
-      - name: Checkout uCentral assembly chart repo
-        uses: actions/checkout@v3
-        with:
-          path: wlan-cloud-ucentralsec
-
-      - name: Build package
-        working-directory: wlan-cloud-ucentralsec/helm
-        run: |
-          helm plugin install https://github.com/aslafy-z/helm-git --version 0.10.0
-          helm repo add bitnami https://charts.bitnami.com/bitnami
-          helm repo update
-          helm dependency update
-          mkdir dist
-          helm package . -d dist
-
-      - name: Generate GitHub release body
-        working-directory: wlan-cloud-ucentralsec/helm
-        run: |
-          pip3 install yq -q
-          echo "Docker image - tip-tip-wlan-cloud-ucentral.jfrog.io/owsec:$GITHUB_REF_NAME" > release.txt
-          echo "Helm charted may be attached to this release" >> release.txt
-          echo "Deployment artifacts may be found in https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/$GITHUB_REF_NAME" >> release.txt
-
-      - name: Create GitHub release
-        uses: softprops/action-gh-release@v1
-        with:
-          body_path: wlan-cloud-ucentralsec/helm/release.txt
-          files: wlan-cloud-ucentralsec/helm/dist/*

.idea/.gitignore

@@ -0,0 +1,21 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+/certs/
+/logs/
+*.csr
+*.db
+/docker-compose/certs/
+/docker-compose/*-data/data/
+/docker-compose/*-data/uploads/
+/docker-compose/.env
+/docker-compose/.env_*
+/cmake-build/
+*.pem
+result.json
+token.json

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owsec VERSION 2.8.0)
+project(owsec VERSION 2.5.0)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -32,12 +32,12 @@ endif()
 
 find_package(Git QUIET)
 if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
-    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+    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 rev-parse --short HEAD failed with ${GIT_RESULT}")
+        message(FATAL_ERROR "git describe --always --tags failed with ${GIT_RESULT}")
     endif()
     string(REGEX REPLACE "\n$" "" GIT_HASH "${GIT_HASH}")
 endif()
@@ -47,17 +47,13 @@ add_definitions(-DAWS_CUSTOM_MEMORY_MANAGEMENT)
 set(BUILD_SHARED_LIBS 1)
 
 add_definitions(-DTIP_SECURITY_SERVICE="1")
-add_definitions(-DPOCO_LOG_DEBUG="1")
-
-add_compile_options(-Wall -Wextra)
-if(ASAN)
-    add_compile_options(-fsanitize=address)
-    add_link_options(-fsanitize=address)
-endif()
 
+set(Boost_USE_STATIC_LIBS OFF)
+set(Boost_USE_MULTITHREADED ON)
+set(Boost_USE_STATIC_RUNTIME OFF)
+find_package(Boost REQUIRED system)
 find_package(OpenSSL REQUIRED)
 find_package(ZLIB REQUIRED)
-find_package(fmt  REQUIRED)
 find_package(AWSSDK     REQUIRED COMPONENTS sns)
 find_package(nlohmann_json  REQUIRED)
 find_package(CppKafka REQUIRED)
@@ -75,63 +71,19 @@ add_executable( owsec
         src/framework/CountryCodes.h
         src/framework/KafkaTopics.h
         src/framework/MicroService.h
-        src/framework/OpenWifiTypes.h
         src/framework/orm.h
+        src/framework/RESTAPI_errors.h
+        src/framework/RESTAPI_protocol.h
         src/framework/StorageClass.h
-        src/framework/MicroServiceErrorHandler.h
-        src/framework/UI_WebSocketClientServer.cpp
-        src/framework/UI_WebSocketClientServer.h
-        src/framework/UI_WebSocketClientNotifications.cpp
-        src/framework/UI_WebSocketClientNotifications.h
-        src/framework/utils.h
-        src/framework/utils.cpp
-        src/framework/AppServiceRegistry.h
-        src/framework/SubSystemServer.cpp
-        src/framework/SubSystemServer.h
-        src/framework/RESTAPI_utils.h
-        src/framework/AuthClient.cpp
-        src/framework/AuthClient.h
-        src/framework/MicroServiceNames.h
-        src/framework/MicroServiceFuncs.h
-        src/framework/OpenAPIRequests.cpp
-        src/framework/OpenAPIRequests.h
-        src/framework/MicroServiceFuncs.cpp
-        src/framework/ALBserver.cpp
-        src/framework/ALBserver.h
-        src/framework/KafkaManager.cpp
-        src/framework/KafkaManager.h
-        src/framework/RESTAPI_RateLimiter.h
-        src/framework/WebSocketLogger.h
-        src/framework/RESTAPI_GenericServerAccounting.h
-        src/framework/RESTAPI_SystemConfiguration.h
-        src/framework/CIDR.h
-        src/framework/RESTAPI_Handler.cpp
-        src/framework/RESTAPI_Handler.h
-        src/framework/RESTAPI_ExtServer.h
-        src/framework/RESTAPI_ExtServer.cpp
-        src/framework/RESTAPI_IntServer.cpp
-        src/framework/RESTAPI_IntServer.h
-        src/framework/RESTAPI_SystemCommand.h
-        src/framework/RESTAPI_WebSocketServer.h
-        src/framework/EventBusManager.cpp
-        src/framework/EventBusManager.h
-        src/framework/RESTAPI_PartHandler.h
-        src/framework/MicroService.cpp
-        src/framework/MicroServiceExtra.h
-
-        src/RESTObjects/RESTAPI_SecurityObjects.h src/RESTObjects/RESTAPI_SecurityObjects.cpp
-        src/RESTObjects/RESTAPI_GWobjects.h src/RESTObjects/RESTAPI_GWobjects.cpp
-        src/RESTObjects/RESTAPI_FMSObjects.h src/RESTObjects/RESTAPI_FMSObjects.cpp
-        src/RESTObjects/RESTAPI_CertObjects.cpp src/RESTObjects/RESTAPI_CertObjects.h
-        src/RESTObjects/RESTAPI_OWLSobjects.cpp src/RESTObjects/RESTAPI_OWLSobjects.h
-        src/RESTObjects/RESTAPI_ProvObjects.cpp src/RESTObjects/RESTAPI_ProvObjects.h
-        src/RESTObjects/RESTAPI_AnalyticsObjects.cpp src/RESTObjects/RESTAPI_AnalyticsObjects.h
-        src/RESTObjects/RESTAPI_SubObjects.cpp src/RESTObjects/RESTAPI_SubObjects.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
@@ -163,28 +115,19 @@ add_executable( owsec
         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
-        src/RESTAPI/RESTAPI_signup_handler.cpp src/RESTAPI/RESTAPI_signup_handler.h
-        src/MessagingTemplates.cpp src/MessagingTemplates.h src/RESTAPI/RESTAPI_apiKey_handler.cpp src/RESTAPI/RESTAPI_apiKey_handler.h src/storage/orm_apikeys.cpp src/storage/orm_apikeys.h src/RESTAPI/RESTAPI_validate_apikey.cpp src/RESTAPI/RESTAPI_validate_apikey.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)
 
 if(NOT SMALL_BUILD)
     target_link_libraries(owsec PUBLIC
-            ${Poco_LIBRARIES}
-            ${MySQL_LIBRARIES}
-            ${ZLIB_LIBRARIES}
-            CppKafka::cppkafka
-            ${AWSSDK_LINK_LIBRARIES}
-            fmt::fmt
+            ${Poco_LIBRARIES} ${Boost_LIBRARIES} ${MySQL_LIBRARIES}  ${ZLIB_LIBRARIES}
+            CppKafka::cppkafka ${AWSSDK_LINK_LIBRARIES}
             )
     if(UNIX AND NOT APPLE)
         target_link_libraries(owsec PUBLIC PocoJSON)

Dockerfile

@@ -1,21 +1,16 @@
-ARG DEBIAN_VERSION=11.5-slim
-ARG POCO_VERSION=poco-tip-v2
-ARG CPPKAFKA_VERSION=tip-v1
+FROM alpine:3.15 AS build-base
 
-FROM debian:$DEBIAN_VERSION AS build-base
-
-RUN apt-get update && apt-get install --no-install-recommends -y \
-    make cmake g++ git curl zip unzip pkg-config \
-    libpq-dev libmariadb-dev libmariadbclient-dev-compat \
-    librdkafka-dev libboost-all-dev libssl-dev \
-    zlib1g-dev ca-certificates libcurl4-openssl-dev libfmt-dev
+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
 
 FROM build-base AS poco-build
 
-ARG POCO_VERSION
-
-ADD https://api.github.com/repos/AriliaWireless/poco/git/refs/tags/${POCO_VERSION} version.json
-RUN git clone https://github.com/AriliaWireless/poco --branch ${POCO_VERSION} /poco
+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
@@ -26,10 +21,8 @@ RUN cmake --build . --target install
 
 FROM build-base AS cppkafka-build
 
-ARG CPPKAFKA_VERSION
-
-ADD https://api.github.com/repos/AriliaWireless/cppkafka/git/refs/tags/${CPPKAFKA_VERSION} version.json
-RUN git clone https://github.com/AriliaWireless/cppkafka --branch ${CPPKAFKA_VERSION} /cppkafka
+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
 RUN mkdir cmake-build
@@ -38,47 +31,72 @@ 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
+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 /owsec/
-ADD overlays /owsec/overlays
 ADD cmake /owsec/cmake
 ADD src /owsec/src
 ADD .git /owsec/.git
-ARG VCPKG_VERSION=2022.11.14
-RUN git clone --depth 1 --branch ${VCPKG_VERSION} https://github.com/microsoft/vcpkg && \
-    ./vcpkg/bootstrap-vcpkg.sh && \
-    mkdir /vcpkg/custom-triplets && \
-    cp /vcpkg/triplets/x64-linux.cmake /vcpkg/custom-triplets/x64-linux.cmake && \
-    sed -i 's/set(VCPKG_LIBRARY.*/set(VCPKG_LIBRARY_LINKAGE dynamic)/g' /vcpkg/custom-triplets/x64-linux.cmake && \
-    ./vcpkg/vcpkg install aws-sdk-cpp[sns]:x64-linux json-schema-validator:x64-linux --overlay-triplets=/vcpkg/custom-triplets --overlay-ports=/owsec/overlays
 
 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
 RUN mkdir cmake-build
 WORKDIR /owsec/cmake-build
-RUN cmake -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake ..
+RUN cmake .. \
+          -Dcrypto_LIBRARY=/usr/lib/libcrypto.so \
+          -DBUILD_SHARED_LIBS=ON
 RUN cmake --build . --config Release -j8
 
-FROM debian:$DEBIAN_VERSION
+FROM alpine:3.15
 
 ENV OWSEC_USER=owsec \
     OWSEC_ROOT=/owsec-data \
     OWSEC_CONFIG=/owsec-data
 
-RUN useradd "$OWSEC_USER"
+RUN addgroup -S "$OWSEC_USER" && \
+    adduser -S -G "$OWSEC_USER" "$OWSEC_USER"
 
 RUN mkdir /openwifi
 RUN mkdir -p "$OWSEC_ROOT" "$OWSEC_CONFIG" && \
     chown "$OWSEC_USER": "$OWSEC_ROOT" "$OWSEC_CONFIG"
 
-RUN apt-get update && apt-get install --no-install-recommends -y \
-    librdkafka++1 gosu gettext ca-certificates bash jq curl wget \
-    libmariadb-dev-compat libpq5 postgresql-client libfmt7
+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
@@ -89,14 +107,14 @@ COPY templates /dist/templates
 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.crt
+    -O /usr/local/share/ca-certificates/restapi-ca-selfsigned.pem
 
 COPY --from=owsec-build /owsec/cmake-build/owsec /openwifi/owsec
-COPY --from=owsec-build /vcpkg/installed/x64-linux/lib/ /usr/local/lib/
-COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib/ /usr/local/lib/
-COPY --from=poco-build /poco/cmake-build/lib/ /usr/local/lib/
-
-RUN ldconfig
+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
 

OPERATOR.md

@@ -1,37 +0,0 @@
-# Operator Support
-In order to support multiple tenants and operators, you must prepare the security service to serve
-customized e-mails and messages.
-
-## Structure for `templates`
-Any file in the root of the directory will be used as defaults. The following files must be present:
-- email_invitation.html/txt : This email message will be sent to a newly added user. 
-- email_verification.html/txt : This email is sent when an email verification is required.
-- password_reset.html/txt : This is sent when a pasword reset is requested.
-- verification_code.html/txt : This is used during MFA when email based.
-- signup_verification.html/txt : This email is send to a new subscriber who signed up for service.
-- sub_email_verification.html/txt : This is sent to a subscriber requiring an email verification.
-- sub_verification_code.html/txt : This is used during MFA when email based for a subscriber.
-- logo.jpg : The default logo to use in any of these emails.
-
-## Structure for `wwwassets`
-Any file in the root of the directory will be used as defaults. The following files must be present:
-- email_verification_error.html : Used when email verification has failed.
-- email_verification_success.html : Used when emil verification has succeeded.
-- invitation_error.html :
-- invitation_success.html :
-- password_policy.html :
-- password_reset.html :
-- password_reset_success.html :
-- password_reset_error.html :
-- signup_verification.html :
-- signup_verification_error.html :
-- signup_verification_success.html :
-- favicon.ico : icon for the application
-- 404_error.html : your customized 404 page
-- the_logo : the logo to use.
-
-## For tenants
-When creating a tenant/operator, you must create a subdirectory inside each `wwwassets` and `templates` and replicate 
-all the files that appear at the root level. You need to use the short Operator name (also known as RegistrantId in the API). This means 
-no spaces, all lowercase characters and numbers. No special characters: 0-9 and a-z. 
-

README.md

@@ -16,10 +16,6 @@ into your own systems. If all you need it to access the uCentralGW for example (
 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.
 
-You may get static page with OpenAPI docs generated from the definition on [GitHub Page](https://telecominfraproject.github.io/wlan-cloud-ucentralsec/).
-
-Also you may use [Swagger UI](https://petstore.swagger.io/#/) with OpenAPI definition file raw link (i.e. [latest version file](https://validator.swagger.io/validator?url=https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-ucentralsec/main/openpapi/owsec.yaml)) to get interactive docs page.
-
 ## Firewall Considerations
 The entire uCentral systems uses several MicroServices. In order for the whole system to work, you should provide the following port
 access:
@@ -140,7 +136,7 @@ docker run --rm -ti \
 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
@@ -170,7 +166,7 @@ Here are the parameters for the public interface. The important files are:
 - `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.
 
-```
+```asm
 openwifi.restapi.host.0.backlog = 100
 openwifi.restapi.host.0.security = relaxed
 openwifi.restapi.host.0.rootca = $OWSEC_ROOT/certs/restapi-ca.pem
@@ -185,7 +181,7 @@ openwifi.restapi.host.0.key.password = mypassword
 The private interface is used for service-to-service communication. You can use self-signed certificates here or letsencrypt. The file names are similar 
 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
@@ -200,7 +196,7 @@ openwifi.internal.restapi.host.0.key.password = mypassword
 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
@@ -225,8 +221,7 @@ an SMS provider must be configured. At present time, 2 providers are supported:
 #### AWS SMS
 For SNS you must create an IAM ID that has sns:sendmessage rights.  
 
-```
-smssender.enabled = true
+```asm
 smssender.provider = aws
 smssender.aws.secretkey = ***************************************
 smssender.aws.accesskey = ***************************************
@@ -236,8 +231,7 @@ smssender.aws.region = **************
 #### Twilio
 For Twilio, you must provide the following
 
-```
-smssender.enabled = true
+```asm
 smssender.provider = twilio
 smssender.twilio.sid = ***********************
 smssender.twilio.token = **********************
@@ -249,8 +243,7 @@ smssender.twilio.phonenumber = +18888888888
 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.
 
-```
-mailer.enabled = true
+```asm
 mailer.hostname = smtp.gmail.com
 mailer.username = ************************
 mailer.password = ************************
@@ -261,10 +254,10 @@ mailer.templates = $OWSEC_ROOT/templates
 ```
 
 #### Google Authenticator
-In order to use the Google Time-based One-Time Password (TOTP), the user must download the 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
 ```
 

build

@@ -1 +1 @@
-41
+244

docker-entrypoint.sh

@@ -1,11 +1,11 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 if [ "$SELFSIGNED_CERTS" = 'true' ]; then
     update-ca-certificates
 fi
 
-if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
+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"} \
@@ -23,7 +23,6 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
   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"} \
-  SECURITY_RESTAPI_DISABLE=${SECURITY_RESTAPI_DISABLE:-"false"} \
   SERVICE_KEY=${SERVICE_KEY:-"\$OWSEC_ROOT/certs/restapi-key.pem"} \
   SERVICE_KEY_PASSWORD=${SERVICE_KEY_PASSWORD:-"mypassword"} \
   SMSSENDER_ENABLED=${SMSSENDER_ENABLED:-"false"} \
@@ -43,10 +42,6 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
   MAILER_TEMPLATES=${MAILER_TEMPLATES:-"\$OWSEC_ROOT/persist/templates"} \
   KAFKA_ENABLE=${KAFKA_ENABLE:-"true"} \
   KAFKA_BROKERLIST=${KAFKA_BROKERLIST:-"localhost:9092"} \
-  KAFKA_SSL_CA_LOCATION=${KAFKA_SSL_CA_LOCATION:-""} \
-  KAFKA_SSL_CERTIFICATE_LOCATION=${KAFKA_SSL_CERTIFICATE_LOCATION:-""} \
-  KAFKA_SSL_KEY_LOCATION=${KAFKA_SSL_KEY_LOCATION:-""} \
-  KAFKA_SSL_KEY_PASSWORD=${KAFKA_SSL_KEY_PASSWORD:-""} \
   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"} \
@@ -85,7 +80,7 @@ if [ "$1" = '/openwifi/owsec' -a "$(id -u)" = '0' ]; then
     if [ "$RUN_CHOWN" = 'true' ]; then
       chown -R "$OWSEC_USER": "$OWSEC_ROOT" "$OWSEC_CONFIG"
     fi
-    exec gosu "$OWSEC_USER" "$@"
+    exec su-exec "$OWSEC_USER" "$@"
 fi
 
 exec "$@"

helm/.gitignore

@@ -1,3 +1 @@
 *.swp
-Chart.lock
-charts/

helm/README.md

@@ -70,8 +70,8 @@ The following table lists the configurable parameters of the chart and their def
 | 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"`) | |
-| existingCertsSecret | string | Existing Kubernetes secret containing all required certificates and private keys for microservice operation. If set, certificates from `certs` key are ignored | `""` |
-| certs | hash | Defines files (keys and certificates) that should be passed to the Gateway (PEM format is adviced to be used) (see `volumes.owsec` on where it is mounted). If `existingCertsSecret` is set, certificates passed this way will not be used. |  |
+| 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) |  |
+
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 

helm/templates/deployment.yaml

@@ -1,5 +1,4 @@
 {{- $root := . -}}
-{{- $storageType := index .Values.configProperties "storage.type" -}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -47,39 +46,6 @@ spec:
             - -timeout
             - 600s
 
-{{- if eq $storageType "postgresql" }}
-        - name: wait-postgres
-          image: "{{ .Values.images.owsec.repository }}:{{ .Values.images.owsec.tag }}"
-          imagePullPolicy: {{ .Values.images.owsec.pullPolicy }}
-          command:
-            - /wait-for-postgres.sh
-            - {{ index .Values.configProperties "storage.type.postgresql.host" }}
-            - echo
-            - "PostgreSQL is ready"
-          env:
-            - name: KUBERNETES_DEPLOYED
-              value: "{{ now }}"
-          {{- range $key, $value := .Values.public_env_variables }}
-            - name: {{ $key }}
-              value: {{ $value | quote }}
-          {{- end }}
-          {{- range $key, $value := .Values.secret_env_variables }}
-            - name: {{ $key }}
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "owsec.fullname" $root }}-env
-                  key: {{ $key }}
-          {{- end }}
-          volumeMounts:
-          {{- range .Values.volumes.owsec }}
-          - name: {{ .name }}
-            mountPath: {{ .mountPath }}
-            {{- if .subPath }}
-            subPath: {{ .subPath }}
-            {{- end }}
-          {{- end }}
-{{- end }}
-
       containers:
 
         - name: owsec

helm/values.yaml

@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
   owsec:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owsec
-    tag: v2.8.0
+    tag: v2.5.2
     pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io
@@ -71,7 +71,7 @@ volumes:
       mountPath: /owsec-data/certs
       volumeDefinition: |
         secret:
-          secretName: {{ if .Values.existingCertsSecret }}{{ .Values.existingCertsSecret }}{{ else }}{{ include "owsec.fullname" . }}-certs{{ end }}
+          secretName: {{ include "owsec.fullname" . }}-certs
     # Change this if you want to use another volume type
     - name: persist
       mountPath: /owsec-data/persist
@@ -92,7 +92,7 @@ resources: {}
   #  memory: 128Mi
 
 securityContext:
-  fsGroup: 1000
+  fsGroup: 101
 
 nodeSelector: {}
 
@@ -167,10 +167,6 @@ configProperties:
   openwifi.kafka.brokerlist: localhost:9092
   openwifi.kafka.auto.commit: false
   openwifi.kafka.queue.buffering.max.ms: 50
-  openwifi.kafka.ssl.ca.location: ""
-  openwifi.kafka.ssl.certificate.location: ""
-  openwifi.kafka.ssl.key.location: ""
-  openwifi.kafka.ssl.key.password: ""
   # Storage
   storage.type: sqlite # (sqlite|postgresql|mysql|odbc)
   ## SQLite
@@ -228,9 +224,6 @@ configProperties:
   storage.type.mysql.username: stephb
   storage.type.mysql.password: snoopy99
 
-# NOTE: List of required certificates may be found in "certs" key. Alternative way to pass required certificates is to create external secret with all required certificates and set secret name in "existingCertsSecret" key. Details may be found in https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart#tldr
-existingCertsSecret: ""
-
 certs:
   # restapi-ca.pem: ""
   # restapi-cert.pem: ""

openpapi/owsec.yaml

@@ -17,7 +17,6 @@ servers:
 security:
   - bearerAuth: []
   - ApiKeyAuth: []
-  - ApiToken: []
 
 components:
   securitySchemes:
@@ -29,10 +28,6 @@ components:
       type: http
       scheme: bearer
       bearerFormat: JWT
-    ApiToken:
-      type: apiKey
-      in: header
-      name: X-API-TOKEN
 
   responses:
     NotFound:
@@ -71,7 +66,6 @@ components:
                   - 11    # BAD_MFA_TRANSACTION
                   - 12    # MFA_FAILURE
                   - 13    # SECURITY_SERVICE_UNREACHABLE
-                  - 14    # CANNOT REFRESH TOKEN
               ErrorDetails:
                 type: string
               ErrorDescription:
@@ -126,15 +120,6 @@ components:
         userId: support@example.com
         password: support
 
-    WebTokenRefreshRequest:
-      type: object
-      properties:
-        userId:
-          type: string
-          default: support@example.com
-        refresh_token:
-          type: string
-
     WebTokenResult:
       description: Login and Refresh Tokens to be used in subsequent API calls.
       type: object
@@ -169,61 +154,18 @@ components:
         aclTemplate:
           $ref: '#/components/schemas/AclTemplate'
 
-    ApiKeyAccessRight:
+    ApiKeyCreationRequest:
       type: object
       properties:
-        service:
-          type: string
-        access:
-          type: string
-          enum:
-            - read
-            - modify
-            - create
-            - delete
-            - noaccess
-
-    ApiKeyAccessRightList:
-      type: object
-      properties:
-        acls:
-          type: array
-          items:
-            $ref: '#/components/schemas/ApiKeyAccessRight'
-
-    ApiKeyEntry:
-      type: object
-      properties:
-        id:
-          type: string
-          format: uuid
-        userUuid:
-          type: string
-          format: uuid
         name:
           type: string
         description:
           type: string
-        apiKey:
-          type: string
-        salt:
-          type: string
         expiresOn:
           type: integer
           format: int64
-        lastUse:
-          type: integer
-          format: int64
         rights:
-          $ref: '#/components/schemas/ApiKeyAccessRightList'
-
-    ApiKeyEntryList:
-      type: object
-      properties:
-        apiKeys:
-          type: array
-          items:
-            $ref: '#/components/schemas/ApiKeyEntry'
+          $ref: '#/components/schemas/AclTemplate'
 
     ApiKeyCreationAnswer:
       type: object
@@ -242,7 +184,7 @@ components:
         apiKey:
           type: string
         rights:
-          $ref: '#/components/schemas/ApiKeyAccessRights'
+          $ref: '#/components/schemas/AclTemplate'
 
     AclTemplate:
       type: object
@@ -413,9 +355,6 @@ components:
           format: int64
         userTypeProprietaryInfo:
           $ref: '#/components/schemas/UserLoginLoginExtensions'
-        signupUUID:
-          type: string
-          format: uuid
 
     UserList:
       type: object
@@ -794,12 +733,6 @@ paths:
           schema:
             type: boolean
           required: false
-        - in: query
-          name: grant_type
-          schema:
-            type: string
-            example: refresh_token
-          required: false
       requestBody:
         description: User id and password
         required: true
@@ -809,7 +742,6 @@ paths:
               oneOf:
                 - $ref: '#/components/schemas/WebTokenRequest'
                 - $ref: '#/components/schemas/MFAChallengeResponse'
-                - $ref: '#/components/schemas/WebTokenRefreshRequest'
       responses:
         200:
           description: successful operation
@@ -859,12 +791,6 @@ paths:
           schema:
             type: boolean
           required: false
-        - in: query
-          name: grant_type
-          schema:
-            type: string
-            example: refresh_token
-          required: false
       requestBody:
         description: User id and password
         required: true
@@ -874,7 +800,6 @@ paths:
               oneOf:
                 - $ref: '#/components/schemas/WebTokenRequest'
                 - $ref: '#/components/schemas/MFAChallengeResponse'
-                - $ref: '#/components/schemas/WebTokenRefreshRequest'
       responses:
         200:
           description: successful operation
@@ -942,7 +867,7 @@ paths:
   /systemEndpoints:
     get:
       tags:
-        - System Commands
+        - Authentication
       summary: Retrieve the system layout.
       operationId: getSystemInfo
       responses:
@@ -995,16 +920,6 @@ paths:
             type: string
             example: id1,id2,id3,id4,id5
           required: false
-        - in: query
-          description: Name matching
-          name: nameSearch
-          schema:
-            type: string
-        - in: query
-          description: Name matching
-          name: emailSearch
-          schema:
-            type: string
       responses:
         200:
           $ref: '#/components/schemas/UserList'
@@ -1051,16 +966,6 @@ paths:
             type: string
             example: id1,id2,id3,id4,id5
           required: false
-        - in: query
-          description: Name matching
-          name: nameSearch
-          schema:
-            type: string
-        - in: query
-          description: Name matching
-          name: emailSearch
-          schema:
-            type: string
       responses:
         200:
           $ref: '#/components/schemas/UserList'
@@ -1159,18 +1064,6 @@ paths:
           schema:
             type: boolean
           required: false
-        - in: query
-          name: forgotPassword
-          schema:
-            type: boolean
-            default: false
-          required: false
-        - in: query
-          name: resetMFA
-          schema:
-            type: boolean
-            default: false
-          required: false
       requestBody:
         description: User details (some fields are ignored during update)
         content:
@@ -1275,18 +1168,6 @@ paths:
           schema:
             type: boolean
           required: false
-        - in: query
-          name: forgotPassword
-          schema:
-            type: boolean
-            default: false
-          required: false
-        - in: query
-          name: resetMFA
-          schema:
-            type: boolean
-            default: false
-          required: false
       requestBody:
         description: User details (some fields are ignored during update)
         content:
@@ -1396,7 +1277,7 @@ paths:
   /email:
     post:
       tags:
-        - Messaging
+        - Email
       summary: Send test email with the system.
       operationId: Send a test email
       requestBody:
@@ -1427,7 +1308,7 @@ paths:
   /sms:
     post:
       tags:
-        - Messaging
+        - Email
       summary: Send test email with the system.
       operationId: Send a test SMS
       parameters:
@@ -1584,8 +1465,8 @@ paths:
           schema:
             type: integer
             format: int64
+          required: required
           example: 1,2,3
-          required: true
       responses:
         200:
           description: Succesful posting of response.
@@ -1603,183 +1484,6 @@ paths:
         403:
           $ref: '#/components/responses/Unauthorized'
 
-  /signup:
-    post:
-      tags:
-        - Subscriber Registration
-      summary: This call allows a new subscriber to register themselves and their devices.
-      operationId: postSignup
-      parameters:
-        - in: query
-          name: email
-          schema:
-            type: string
-            format: email
-          required: true
-        - in: query
-          name: signupUUID
-          schema:
-            type: string
-            format: uuid
-          required: true
-      responses:
-        200:
-          $ref: '#/components/schemas/UserInfo'
-        400:
-          $ref: '#/components/responses/BadRequest'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-    put:
-      tags:
-        - Subscriber Registration
-      summary: modify the signup command in play
-      operationId: modifySignup
-      parameters:
-        - in: query
-          name: signupUUID
-          schema:
-            type: string
-            format: uuid
-          required: true
-        - in: query
-          name: operation
-          schema:
-            type: string
-            enum:
-              - cancel
-              - success
-              - inprogress
-              - failed
-              - poll
-              - emailVerified
-          required: true
-      requestBody:
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                reason:
-                  type: string
-                time:
-                  type: integer
-                  format: int64
-                errorCode:
-                  type: integer
-                  format: int32
-        required: false
-
-      responses:
-        200:
-          $ref: '#/components/responses/Success'
-        400:
-          $ref: '#/components/responses/BadRequest'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-  /apiKey/{uuid}:
-    get:
-      tags:
-        - API Tokens
-      summary: Retrieve all the APIKeys for a given user UUID
-      operationId: getApiKeyList
-      parameters:
-        - in: path
-          name: uuid
-          schema:
-            type: string
-            format: uuid
-          required: true
-      responses:
-        200:
-          $ref: '#/components/schemas/ApiKeyEntryList'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-    delete:
-      tags:
-        - API Tokens
-      summary: Retrieve all the APIKeys for a given user UUID
-      operationId: deleteApiKey
-      parameters:
-        - in: path
-          name: uuid
-          schema:
-            type: string
-            format: uuid
-          required: true
-        - in: query
-          name: keyUuid
-          schema:
-            type: string
-          required: true
-      responses:
-        200:
-          $ref: '#/components/responses/Success'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-    post:
-      tags:
-        - API Tokens
-      summary: Retrieve all the APIKeys for a given user UUID
-      operationId: createApiKey
-      parameters:
-        - in: path
-          name: uuid
-          schema:
-            type: string
-            format: uuid
-          required: true
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/ApiKeyEntry'
-      responses:
-        200:
-          $ref: '#/components/schemas/ApiKeyEntry'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-    put:
-      tags:
-        - API Tokens
-      summary: Retrieve all the APIKeys for a given user UUID
-      operationId: modifyApiKey
-      parameters:
-        - in: path
-          name: uuid
-          schema:
-            type: string
-            format: uuid
-          required: true
-        - in: query
-          name: name
-          schema:
-            type: string
-          required: true
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/ApiKeyEntry'
-      responses:
-        200:
-          $ref: '#/components/schemas/ApiKeyEntry'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
   #########################################################################################
   ##
   ## These are endpoints that all services in the uCentral stack must provide
@@ -1876,26 +1580,6 @@ paths:
         404:
           $ref: '#/components/responses/NotFound'
 
-  /validateApiKey:
-    get:
-      tags:
-        - Security
-      summary: Allows an application to validate an API Key.
-      operationId: validateApiKey
-      parameters:
-        - in: query
-          name: token
-          schema:
-            type: string
-          required: true
-      responses:
-        200:
-          $ref: '#/components/schemas/TokenValidationResult'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
   /system:
     post:
       tags:

overlays/curl/portfile.cmake

@@ -1 +0,0 @@
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

overlays/curl/vcpkg.json

@@ -1,4 +0,0 @@
-{
-    "name": "curl",
-    "version-string": "7.74.0-1.3+deb11u3"
-}

overlays/openssl/portfile.cmake

@@ -1 +0,0 @@
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

overlays/openssl/vcpkg.json

@@ -1,4 +0,0 @@
-{
-    "name": "openssl",
-    "version-string": "1.1.1n-0+deb11u3"
-}

overlays/zlib/portfile.cmake

@@ -1 +0,0 @@
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

overlays/zlib/vcpkg.json

@@ -1,4 +0,0 @@
-{
-    "name": "zlib",
-    "version-string": "1:1.2.11.dfsg-2+deb11u2"
-}

owsec.properties

@@ -36,7 +36,6 @@ 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.security.restapi.disable = false
 openwifi.system.commandchannel = /tmp/app.ucentralsec
 openwifi.service.key = $OWSEC_ROOT/certs/restapi-key.pem
 openwifi.service.key.password = mypassword
@@ -83,11 +82,6 @@ openwifi.kafka.enable = true
 openwifi.kafka.brokerlist = a1.arilia.com:9092
 openwifi.kafka.auto.commit = false
 openwifi.kafka.queue.buffering.max.ms = 50
-openwifi.kafka.ssl.ca.location =
-openwifi.kafka.ssl.certificate.location =
-openwifi.kafka.ssl.key.location =
-openwifi.kafka.ssl.key.password =
-
 openwifi.document.policy.access = /wwwassets/access_policy.html
 openwifi.document.policy.password = /wwwassets/password_policy.html
 openwifi.avatar.maxsize = 2000000

owsec.properties.tmpl

@@ -36,7 +36,6 @@ 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.security.restapi.disable = ${SECURITY_RESTAPI_DISABLE}
 openwifi.system.commandchannel = /tmp/app.ucentralsec
 openwifi.service.key = ${SERVICE_KEY}
 openwifi.service.key.password = ${SERVICE_KEY_PASSWORD}
@@ -83,10 +82,6 @@ openwifi.kafka.enable = ${KAFKA_ENABLE}
 openwifi.kafka.brokerlist = ${KAFKA_BROKERLIST}
 openwifi.kafka.auto.commit = false
 openwifi.kafka.queue.buffering.max.ms = 50
-openwifi.kafka.ssl.ca.location = ${KAFKA_SSL_CA_LOCATION}
-openwifi.kafka.ssl.certificate.location = ${KAFKA_SSL_CERTIFICATE_LOCATION}
-openwifi.kafka.ssl.key.location = ${KAFKA_SSL_KEY_LOCATION}
-openwifi.kafka.ssl.key.password = ${KAFKA_SSL_KEY_PASSWORD}
 
 openwifi.document.policy.access = ${DOCUMENT_POLICY_ACCESS}
 openwifi.document.policy.password = ${DOCUMENT_POLICY_PASSWORD}

src/ACLProcessor.h

@@ -18,7 +18,6 @@ namespace OpenWifi {
             CREATE
         };
 /*
- *  0) You can only delete yourself if you are a subscriber
     1) You cannot delete yourself
     2) If you are root, you can do anything.
     3) You can do anything to yourself
@@ -31,103 +30,49 @@ namespace OpenWifi {
 
  */
         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;
 
-            switch(Op) {
-                case DELETE: {
-                    //  can a user delete themselves - yes - only if not root. We do not want a system to end up rootless
-                    if(User.id==Target.id) {
-                        return User.userRole != SecurityObjects::ROOT;
-                    }
-                    //  Root can delete anyone
-                    switch (User.userRole) {
-                        case SecurityObjects::ROOT:
+            //  rule 2
+            if(User.userRole==SecurityObjects::ROOT)
                 return true;
-                        case SecurityObjects::ADMIN:
-                            return Target.userRole!=SecurityObjects::ROOT && Target.userRole!=SecurityObjects::PARTNER;
-                        case SecurityObjects::SUBSCRIBER:
-                            return User.id==Target.id;
-                        case SecurityObjects::CSR:
-                            return false;
-                        case SecurityObjects::SYSTEM:
-                            return Target.userRole!=SecurityObjects::ROOT && Target.userRole!=SecurityObjects::PARTNER;
-                        case SecurityObjects::INSTALLER:
-                            return User.id==Target.id;
-                        case SecurityObjects::NOC:
-                            return Target.userRole==SecurityObjects::NOC;
-                        case SecurityObjects::ACCOUNTING:
-                            return Target.userRole==SecurityObjects::ACCOUNTING;
-                        case SecurityObjects::PARTNER:
-                            return Target.userRole!=SecurityObjects::ROOT;
-                        default:
-                            return false;
-                    }
-                }
-                break;
 
-                case READ: {
-                    return  User.userRole == SecurityObjects::ROOT ||
-                            User.userRole == SecurityObjects::ADMIN ||
-                            User.userRole == SecurityObjects::PARTNER;
-                }
-                break;
-
-                case CREATE: {
-                    switch(User.userRole) {
-                        case SecurityObjects::ROOT:
+            //  rule 3
+            if(User.id == Target.id)
                 return true;
-                        case SecurityObjects::ADMIN:
-                            return  Target.userRole!=SecurityObjects::ROOT &&
-                                    Target.userRole!=SecurityObjects::PARTNER;
-                        case SecurityObjects::SUBSCRIBER:
-                            return false;
-                        case SecurityObjects::CSR:
-                            return Target.userRole==SecurityObjects::CSR;
-                        case SecurityObjects::SYSTEM:
-                            return Target.userRole!=SecurityObjects::ROOT && Target.userRole!=SecurityObjects::PARTNER;
-                        case SecurityObjects::INSTALLER:
-                            return Target.userRole==SecurityObjects::INSTALLER;
-                        case SecurityObjects::NOC:
-                            return Target.userRole==SecurityObjects::NOC;
-                        case SecurityObjects::ACCOUNTING:
-                            return Target.userRole==SecurityObjects::ACCOUNTING;
-                        case SecurityObjects::PARTNER:
-                            return Target.userRole!=SecurityObjects::ROOT;
-                        default:
-                            return false;
-                    }
-                }
-                break;
 
-                case MODIFY: {
-                    switch(User.userRole) {
-                        case SecurityObjects::ROOT:
+            //  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;
-                        case SecurityObjects::ADMIN:
-                            return  Target.userRole!=SecurityObjects::ROOT &&
-                                    Target.userRole!=SecurityObjects::PARTNER;
-                        case SecurityObjects::SUBSCRIBER:
-                            return  User.id==Target.id;
-                        case SecurityObjects::CSR:
-                            return  Target.userRole==SecurityObjects::CSR;
-                        case SecurityObjects::SYSTEM:
-                            return  Target.userRole!=SecurityObjects::ROOT &&
-                                    Target.userRole!=SecurityObjects::PARTNER;
-                        case SecurityObjects::INSTALLER:
-                            return  Target.userRole==SecurityObjects::INSTALLER;
-                        case SecurityObjects::NOC:
-                            return  Target.userRole==SecurityObjects::NOC;
-                        case SecurityObjects::ACCOUNTING:
-                            return  Target.userRole==SecurityObjects::ACCOUNTING;
-                        case SecurityObjects::PARTNER:
-                            return  Target.userRole!=SecurityObjects::ROOT;
-                        default:
-                            return false;
-                    }
-                }
-                    break;
-                default:
                 return false;
             }
+
+            return true;
         }
     private:
 

src/ActionLinkManager.cpp

@@ -5,32 +5,25 @@
 #include "ActionLinkManager.h"
 #include "StorageService.h"
 #include "RESTObjects/RESTAPI_SecurityObjects.h"
-#include "MessagingTemplates.h"
-#include "framework/utils.h"
-#include "fmt/format.h"
 
 namespace OpenWifi {
 
     int ActionLinkManager::Start() {
-        poco_information(Logger(),"Starting...");
         if(!Running_)
             Thr_.start(*this);
         return 0;
     }
 
     void ActionLinkManager::Stop() {
-        poco_information(Logger(),"Stopping...");
         if(Running_) {
             Running_ = false;
             Thr_.wakeUp();
             Thr_.join();
         }
-        poco_information(Logger(),"Stopped...");
     }
 
     void ActionLinkManager::run() {
         Running_ = true ;
-        Utils::SetThreadName("action-mgr");
 
         while(Running_) {
             Poco::Thread::trySleep(2000);
@@ -55,63 +48,39 @@ namespace OpenWifi {
                     StorageService()->ActionLinksDB().CancelAction(i.id);
                     continue;
                 } else if(( i.action==OpenWifi::SecurityObjects::LinkActions::SUB_FORGOT_PASSWORD ||
-                            i.action==OpenWifi::SecurityObjects::LinkActions::SUB_VERIFY_EMAIL ||
-                            i.action==OpenWifi::SecurityObjects::LinkActions::SUB_SIGNUP ) && !StorageService()->SubDB().GetUserById(i.userId,UInfo)) {
-                    StorageService()->ActionLinksDB().CancelAction(i.id);
-                    continue;
-                } else if((i.action==OpenWifi::SecurityObjects::LinkActions::EMAIL_INVITATION) &&
-                        (OpenWifi::Now()-i.created)>(24*60*60)) {
+                            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, MessagingTemplates::FORGOT_PASSWORD)) {
-                                poco_information(Logger(),fmt::format("Send password reset link to {}",UInfo.email));
+                            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, MessagingTemplates::EMAIL_VERIFICATION)) {
-                                poco_information(Logger(),fmt::format("Send email verification link to {}",UInfo.email));
-                            }
-                            StorageService()->ActionLinksDB().SentAction(i.id);
-                        }
-                        break;
-
-                    case OpenWifi::SecurityObjects::LinkActions::EMAIL_INVITATION: {
-                            if(AuthService::SendEmailToUser(i.id, UInfo.email, MessagingTemplates::EMAIL_INVITATION)) {
-                                poco_information(Logger(),fmt::format("Send new subscriber email invitation link to {}",UInfo.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: {
-                            auto Signup = Poco::StringTokenizer(UInfo.signingUp,":");
-                            if(AuthService::SendEmailToSubUser(i.id, UInfo.email,MessagingTemplates::SUB_FORGOT_PASSWORD, Signup.count()==1 ? "" : Signup[0])) {
-                                poco_information(Logger(),fmt::format("Send subscriber password reset link to {}",UInfo.email));
+                            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: {
-                            auto Signup = Poco::StringTokenizer(UInfo.signingUp,":");
-                            if(AuthService::SendEmailToSubUser(i.id, UInfo.email, MessagingTemplates::SUB_EMAIL_VERIFICATION, Signup.count()==1 ? "" : Signup[0])) {
-                                poco_information(Logger(),fmt::format("Send subscriber email verification link to {}",UInfo.email));
-                            }
-                            StorageService()->ActionLinksDB().SentAction(i.id);
-                        }
-                        break;
-
-                    case OpenWifi::SecurityObjects::LinkActions::SUB_SIGNUP: {
-                        auto Signup = Poco::StringTokenizer(UInfo.signingUp,":");
-                        if(AuthService::SendEmailToSubUser(i.id, UInfo.email, MessagingTemplates::SUB_SIGNUP_VERIFICATION, Signup.count()==1 ? "" : Signup[0])) {
-                            poco_information(Logger(),fmt::format("Send new subscriber email verification link to {}",UInfo.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);
                         }

src/ActionLinkManager.h

@@ -2,23 +2,31 @@
 // Created by stephane bourque on 2021-11-08.
 //
 
-#pragma once
+#ifndef OWSEC_ACTIONLINKMANAGER_H
+#define OWSEC_ACTIONLINKMANAGER_H
 
-#include "framework/SubSystemServer.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;
+            static auto * instance_ = new ActionLinkManager;
             return instance_;
         }
 
         int Start() final;
         void Stop() final;
-        void run() final;
+        void run();
 
     private:
         Poco::Thread        Thr_;
@@ -32,3 +40,4 @@ namespace OpenWifi {
     inline ActionLinkManager * ActionLinkManager() { return ActionLinkManager::instance(); }
 }
 
+#endif //OWSEC_ACTIONLINKMANAGER_H

src/AuthService.cpp

@@ -8,21 +8,18 @@
 
 #include <ctime>
 
-#include "framework/KafkaManager.h"
-#include "framework/KafkaTopics.h"
-
 #include "Poco/Net/OAuth20Credentials.h"
 #include "Poco/JWT/Token.h"
 #include "Poco/JWT/Signer.h"
 #include "Poco/StringTokenizer.h"
 
+#include "framework/MicroService.h"
 #include "StorageService.h"
 #include "AuthService.h"
-#include "framework/MicroServiceFuncs.h"
+#include "framework/KafkaTopics.h"
 
 #include "SMTPMailerService.h"
 #include "MFAServer.h"
-#include "MessagingTemplates.h"
 
 namespace OpenWifi {
 
@@ -45,177 +42,75 @@ namespace OpenWifi {
 		return 1;	// some compilers complain...
 	}
 
-#if defined(TIP_CERT_SERVICE)
-    static const std::string DefaultPasswordRule{"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[\\{\\}\\(\\)~_\\+\\|\\\\\\[\\]\\;\\:\\<\\>\\.\\,\\/\\?\\\"\\'\\`\\=#?!@$%^&*-]).{12,}$"};
-#else
-    static const std::string DefaultPasswordRule{"^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[\\{\\}\\(\\)~_\\+\\|\\\\\\[\\]\\;\\:\\<\\>\\.\\,\\/\\?\\\"\\'\\`\\=#?!@$%^&*-]).{8,}$"};
-#endif
-
     int AuthService::Start() {
-        poco_information(Logger(),"Starting...");
-        TokenAging_ = (uint64_t) MicroServiceConfigGetInt("authentication.token.ageing", 30 * 24 * 60 * 60);
-        RefreshTokenLifeSpan_ = (uint64_t) MicroServiceConfigGetInt("authentication.refresh_token.lifespan", 90 * 24 * 60 * 600);
-        HowManyOldPassword_ = MicroServiceConfigGetInt("authentication.oldpasswords", 5);
+		Signer_.setRSAKey(MicroService::instance().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_ = MicroServiceConfigGetString("openwifi.document.policy.access", "/wwwassets/access_policy.html");
-        PasswordPolicy_ = MicroServiceConfigGetString("openwifi.document.policy.password", "/wwwassets/password_policy.html");
-        PasswordValidation_ = PasswordValidationStr_ = MicroServiceConfigGetString("authentication.validation.expression",DefaultPasswordRule);
+        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_ = MicroServiceConfigGetString("subscriber.validation.expression",DefaultPasswordRule);
-        SubAccessPolicy_ = MicroServiceConfigGetString("subscriber.policy.access", "/wwwassets/access_policy.html");
-        SubPasswordPolicy_ = MicroServiceConfigGetString("subscriber.policy.password", "/wwwassets/password_policy.html");
+        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");
 
         return 0;
     }
 
     void AuthService::Stop() {
-        poco_information(Logger(),"Stopping...");
-        poco_information(Logger(),"Stopped...");
+		Logger().notice("Stopping...");
     }
 
-    bool AuthService::RefreshUserToken(Poco::Net::HTTPServerRequest & Request, const std::string & RefreshToken, SecurityObjects::UserInfoAndPolicy & UI) {
-        try {
-            std::string CallToken;
-            Poco::Net::OAuth20Credentials Auth(Request);
-            if (Auth.getScheme() == "Bearer") {
-                CallToken = Auth.getBearerToken();
-            }
-
-            if (CallToken.empty()) {
-                return false;
-            }
-
-            uint64_t                    RevocationDate=0;
-            std::string                 UserId;
-            if(StorageService()->UserTokenDB().GetToken(CallToken, UI.webtoken, UserId, RevocationDate) && UI.webtoken.refresh_token_==RefreshToken) {
-                auto now = Utils::Now();
-
-                //  Create a new token
-                auto NewToken = GenerateTokenHMAC( UI.webtoken.access_token_, CUSTOM);
-                auto NewRefreshToken = RefreshToken;
-                if(now - UI.webtoken.lastRefresh_ < RefreshTokenLifeSpan_) {
-                    NewRefreshToken = GenerateTokenHMAC( UI.webtoken.refresh_token_, CUSTOM);
-                    UI.webtoken.lastRefresh_ = now;
-                }
-
-                StorageService()->UserTokenDB().RefreshToken(CallToken, NewToken, NewRefreshToken, UI.webtoken.lastRefresh_ );
-                UI.webtoken.access_token_ = NewToken;
-                UI.webtoken.refresh_token_ = NewRefreshToken;
-                return true;
-            }
-            return false;
-
-        } catch (...) {
-
-        }
-        return false;
-    }
-
-    bool AuthService::RefreshSubToken(Poco::Net::HTTPServerRequest & Request, const std::string & RefreshToken, SecurityObjects::UserInfoAndPolicy & UI) {
-        try {
-            std::string CallToken;
-            Poco::Net::OAuth20Credentials Auth(Request);
-            if (Auth.getScheme() == "Bearer") {
-                CallToken = Auth.getBearerToken();
-            }
-
-            if (CallToken.empty()) {
-                return false;
-            }
-
-            uint64_t                    RevocationDate=0;
-            std::string                 UserId;
-            if(StorageService()->SubTokenDB().GetToken(CallToken, UI.webtoken, UserId, RevocationDate) && UI.webtoken.refresh_token_==RefreshToken) {
-                auto now = Utils::Now();
-
-                //  Create a new token
-                auto NewToken = GenerateTokenHMAC( UI.webtoken.access_token_, CUSTOM);
-                auto NewRefreshToken = RefreshToken;
-                if(now - UI.webtoken.lastRefresh_ < RefreshTokenLifeSpan_) {
-                    NewRefreshToken = GenerateTokenHMAC( UI.webtoken.refresh_token_, CUSTOM);
-                    UI.webtoken.lastRefresh_ = now;
-                }
-
-                StorageService()->SubTokenDB().RefreshToken(CallToken, NewToken, NewRefreshToken, UI.webtoken.lastRefresh_ );
-                UI.webtoken.access_token_ = NewToken;
-                UI.webtoken.refresh_token_ = NewRefreshToken;
-                return true;
-            }
-            return false;
-
-        } catch (...) {
-
-        }
-        return false;
-    }
-
-    [[nodiscard]] bool AuthService::IsAuthorized(const std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, std::uint64_t TID, bool & Expired) {
-        // std::lock_guard	Guard(Mutex_);
-        std::string CallToken{SessionToken};
-        Expired = false;
-        try {
-            SecurityObjects::WebToken   WT;
-            uint64_t                    RevocationDate=0;
-            std::string                 UserId;
-            if(StorageService()->UserTokenDB().GetToken(CallToken, WT, UserId, RevocationDate)) {
-                if(RevocationDate!=0) {
-                    poco_debug(Logger(), fmt::format("TokenValidation failed for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
-                    return false;
-                }
-                auto now=Utils::Now();
-                Expired = (WT.created_ + WT.expires_in_) < now;
-                if(StorageService()->UserDB().GetUserById(UserId,UInfo.userinfo)) {
-                    UInfo.webtoken = WT;
-                    poco_debug(Logger(), fmt::format("TokenValidation success for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
-                    return true;
-                }
-            }
-        } catch(const Poco::Exception &E) {
-            Logger().log(E);
-        }
-        poco_debug(Logger(), fmt::format("TokenValidation failed for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
-        return false;
-    }
-
-    bool AuthService::IsAuthorized(Poco::Net::HTTPServerRequest & Request, std::string & SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, std::uint64_t TID, bool & Expired )
+	bool AuthService::IsAuthorized(Poco::Net::HTTPServerRequest & Request, std::string & SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, bool & Expired )
     {
-        // std::lock_guard	Guard(Mutex_);
-        std::string CallToken;
-        Expired = false;
-
-		try {
-            Poco::Net::OAuth20Credentials Auth(Request);
-            if (Auth.getScheme() == "Bearer") {
-                CallToken = Auth.getBearerToken();
-            }
-
-            if (CallToken.empty()) {
-                poco_debug(Logger(), fmt::format("TokenValidation failed for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
-                return false;
-            }
-            SessionToken = CallToken;
-            return IsAuthorized(SessionToken, UInfo, TID, Expired);
-        } catch(const Poco::Exception &E) {
-            Logger().log(E);
-        }
-        poco_debug(Logger(), fmt::format("TokenValidation failed for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
-        return false;
-    }
-
-    bool AuthService::IsSubAuthorized(Poco::Net::HTTPServerRequest & Request, std::string & SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, std::uint64_t TID, bool & Expired )
-    {
-        // std::lock_guard	Guard(Mutex_);
-
-        std::string CallToken;
+        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()->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;
+		} catch(const Poco::Exception &E) {
+		    Logger().log(E);
+		}
+		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()) {
-                poco_debug(Logger(), fmt::format("TokenValidation failed for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
                 return false;
             }
 
@@ -223,23 +118,19 @@ namespace OpenWifi {
             uint64_t                    RevocationDate=0;
             std::string                 UserId;
             if(StorageService()->SubTokenDB().GetToken(CallToken, WT, UserId, RevocationDate)) {
-                if(RevocationDate!=0) {
-                    poco_debug(Logger(), fmt::format("TokenValidation failed for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
+                if(RevocationDate!=0)
                     return false;
-                }
-                auto now=Utils::Now();
-                Expired = (WT.created_ + WT.expires_in_) < now;
+                Expired = (WT.created_ + WT.expires_in_) < time(nullptr);
                 if(StorageService()->SubDB().GetUserById(UserId,UInfo.userinfo)) {
                     UInfo.webtoken = WT;
                     SessionToken = CallToken;
-                    poco_debug(Logger(), fmt::format("TokenValidation success for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
                     return true;
                 }
             }
+            return false;
         } catch(const Poco::Exception &E) {
             Logger().log(E);
         }
-        poco_debug(Logger(), fmt::format("TokenValidation failed for TID={} Token={}", TID, Utils::SanitizeToken(CallToken)));
         return false;
     }
 
@@ -276,11 +167,11 @@ namespace OpenWifi {
             if(KafkaManager()->Enabled()) {
                 Poco::JSON::Object Obj;
                 Obj.set("event", "remove-token");
-                Obj.set("id", MicroServiceID());
+                Obj.set("id", MicroService::instance().ID());
                 Obj.set("token", token);
                 std::stringstream ResultText;
                 Poco::JSON::Stringifier::stringify(Obj, ResultText);
-                KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS, MicroServicePrivateEndPoint(),
+                KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS, MicroService::instance().PrivateEndPoint(),
                                             ResultText.str(),
                                             false);
             }
@@ -289,7 +180,7 @@ namespace OpenWifi {
         }
     }
 
-    void AuthService::Logout(const std::string &Token,[[maybe_unused]]  bool EraseFromCache) {
+    void AuthService::Logout(const std::string &Token, bool EraseFromCache) {
 		std::lock_guard		Guard(Mutex_);
 
         try {
@@ -301,7 +192,7 @@ namespace OpenWifi {
         }
     }
 
-    void AuthService::SubLogout(const std::string &Token, [[maybe_unused]] bool EraseFromCache) {
+    void AuthService::SubLogout(const std::string &Token, bool EraseFromCache) {
         std::lock_guard		Guard(Mutex_);
 
         try {
@@ -313,8 +204,8 @@ namespace OpenWifi {
         }
     }
 
-    [[nodiscard]] std::string AuthService::GenerateTokenHMAC(const std::string & UserName, [[maybe_unused]] ACCESS_TYPE Type) {
-        std::string Identity(UserName + ":" + fmt::format("{}",Utils::Now()) + ":" + std::to_string(rand()));
+    [[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());
     }
@@ -334,7 +225,7 @@ namespace OpenWifi {
 		T.payload().set("identity", Identity);
 		T.setIssuedAt(Poco::Timestamp());
 		T.setExpiration(Poco::Timestamp() + (long long)TokenAging_);
-		std::string JWT = MicroServiceSign(T,Poco::JWT::Signer::ALGO_RS256);
+		std::string JWT = Signer_.sign(T,Poco::JWT::Signer::ALGO_RS256);
 
 		return JWT;
     }
@@ -501,7 +392,7 @@ namespace OpenWifi {
         return false;
     }
 
-    UNAUTHORIZED_REASON AuthService::Authorize( std::string & UserName, const std::string & Password, const std::string & NewPassword, SecurityObjects::UserInfoAndPolicy & UInfo , [[maybe_unused]] bool & Expired )
+    UNAUTHORIZED_REASON AuthService::Authorize( std::string & UserName, const std::string & Password, const std::string & NewPassword, SecurityObjects::UserInfoAndPolicy & UInfo , bool & Expired )
     {
         std::lock_guard		Guard(Mutex_);
 
@@ -530,23 +421,24 @@ namespace OpenWifi {
                     UInfo.webtoken.errorCode = 1;
                     return PASSWORD_ALREADY_USED;
                 }
-                UInfo.userinfo.lastPasswordChange = Utils::Now();
+                UInfo.userinfo.lastPasswordChange = std::time(nullptr);
                 UInfo.userinfo.changePassword = false;
-                UInfo.userinfo.modified = Utils::Now();
+                UInfo.userinfo.modified = std::time(nullptr);
                 StorageService()->UserDB().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=Utils::Now();
+            UInfo.userinfo.lastLogin=std::time(nullptr);
             StorageService()->UserDB().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 , [[maybe_unused]] bool & Expired )
+    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_);
 
@@ -575,14 +467,14 @@ namespace OpenWifi {
                     UInfo.webtoken.errorCode = 1;
                     return PASSWORD_ALREADY_USED;
                 }
-                UInfo.userinfo.lastPasswordChange = Utils::Now();
+                UInfo.userinfo.lastPasswordChange = std::time(nullptr);
                 UInfo.userinfo.changePassword = false;
-                UInfo.userinfo.modified = Utils::Now();
+                UInfo.userinfo.modified = std::time(nullptr);
                 StorageService()->SubDB().UpdateUserInfo(AUTHENTICATION_SYSTEM, UInfo.userinfo.id,UInfo.userinfo);
             }
 
-            //  so we have a good password, password update has taken place if need be, now generate the token.
-            UInfo.userinfo.lastLogin=Utils::Now();
+            //  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 );
 
@@ -592,62 +484,29 @@ namespace OpenWifi {
         return INVALID_CREDENTIALS;
     }
 
-    bool AuthService::SendEmailChallengeCode(const SecurityObjects::UserInfoAndPolicy &UInfo, const std::string &Challenge) {
-        auto OperatorParts = Poco::StringTokenizer(UInfo.userinfo.signingUp,":");
-        if(UInfo.userinfo.signingUp.empty() || OperatorParts.count()!=2) {
-            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, MessagingTemplates::TemplateName(MessagingTemplates::VERIFICATION_CODE), Attrs, false);
-        } else {
-            MessageAttributes Attrs;
-            Attrs[RECIPIENT_EMAIL] = UInfo.userinfo.email;
-            Attrs[LOGO] = AuthService::GetSubLogoAssetURI();
-            Attrs[SUBJECT] = "Login validation code";
-            Attrs[CHALLENGE_CODE] = Challenge;
-            return SMTPMailerService()->SendMessage(UInfo.userinfo.email, MessagingTemplates::TemplateName(MessagingTemplates::SUB_VERIFICATION_CODE,OperatorParts[0]), Attrs, true );
-        }
-    }
-
-    bool AuthService::SendEmailToUser(const std::string &LinkId, std::string &Email, MessagingTemplates::EMAIL_REASON Reason) {
+    bool AuthService::SendEmailToUser(const std::string &LinkId, std::string &Email, EMAIL_REASON Reason) {
         SecurityObjects::UserInfo   UInfo;
 
         if(StorageService()->UserDB().GetUserByEmail(Email,UInfo)) {
             switch (Reason) {
 
-                case MessagingTemplates::FORGOT_PASSWORD: {
+                case FORGOT_PASSWORD: {
                         MessageAttributes Attrs;
                         Attrs[RECIPIENT_EMAIL] = UInfo.email;
                         Attrs[LOGO] = GetLogoAssetURI();
                         Attrs[SUBJECT] = "Password reset link";
-                        Attrs[ACTION_LINK] = MicroServiceGetPublicAPIEndPoint() + "/actionLink?action=password_reset&id=" + LinkId ;
-                        Attrs[ACTION_LINK_HTML] = "/api/v1/actionLink?action=password_reset&id=" + LinkId ;
-                        SMTPMailerService()->SendMessage(UInfo.email, MessagingTemplates::TemplateName(MessagingTemplates::FORGOT_PASSWORD), Attrs, false);
+                        Attrs[ACTION_LINK] = MicroService::instance().GetPublicAPIEndPoint() + "/actionLink?action=password_reset&id=" + LinkId ;
+                        SMTPMailerService()->SendMessage(UInfo.email, "password_reset.txt", Attrs);
                     }
                     break;
 
-                case MessagingTemplates::EMAIL_VERIFICATION: {
+                case EMAIL_VERIFICATION: {
                         MessageAttributes Attrs;
                         Attrs[RECIPIENT_EMAIL] = UInfo.email;
                         Attrs[LOGO] = GetLogoAssetURI();
-                        Attrs[SUBJECT] = "e-mail Address Verification";
-                        Attrs[ACTION_LINK] = MicroServiceGetPublicAPIEndPoint() + "/actionLink?action=email_verification&id=" + LinkId ;
-                        Attrs[ACTION_LINK_HTML] = "/api/v1/actionLink?action=email_verification&id=" + LinkId ;
-                        SMTPMailerService()->SendMessage(UInfo.email, MessagingTemplates::TemplateName(MessagingTemplates::EMAIL_VERIFICATION), Attrs, false);
-                        UInfo.waitingForEmailCheck = true;
-                    }
-                    break;
-
-                case MessagingTemplates::EMAIL_INVITATION: {
-                    MessageAttributes Attrs;
-                    Attrs[RECIPIENT_EMAIL] = UInfo.email;
-                    Attrs[LOGO] = GetLogoAssetURI();
-                    Attrs[SUBJECT] = "e-mail Invitation";
-                    Attrs[ACTION_LINK] = MicroServiceGetPublicAPIEndPoint() + "/actionLink?action=email_invitation&id=" + LinkId ;
-                    Attrs[ACTION_LINK_HTML] = "/api/v1/actionLink?action=email_invitation&id=" + LinkId ;
-                    SMTPMailerService()->SendMessage(UInfo.email, MessagingTemplates::TemplateName(MessagingTemplates::EMAIL_INVITATION), Attrs, false);
+                        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;
@@ -660,43 +519,29 @@ namespace OpenWifi {
         return false;
     }
 
-    bool AuthService::SendEmailToSubUser(const std::string &LinkId, std::string &Email, MessagingTemplates::EMAIL_REASON Reason, const std::string &OperatorName ) {
+    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 MessagingTemplates::SUB_FORGOT_PASSWORD: {
+                case FORGOT_PASSWORD: {
                     MessageAttributes Attrs;
                     Attrs[RECIPIENT_EMAIL] = UInfo.email;
-                    Attrs[LOGO] = GetSubLogoAssetURI();
+                    Attrs[LOGO] = GetLogoAssetURI();
                     Attrs[SUBJECT] = "Password reset link";
-                    Attrs[ACTION_LINK] = MicroServiceGetPublicAPIEndPoint() + "/actionLink?action=sub_password_reset&id=" + LinkId ;
-                    Attrs[ACTION_LINK_HTML] = "/api/v1/actionLink?action=sub_password_reset&id=" + LinkId ;
-                    SMTPMailerService()->SendMessage(UInfo.email, MessagingTemplates::TemplateName(MessagingTemplates::SUB_FORGOT_PASSWORD, OperatorName), Attrs, true);
+                    Attrs[ACTION_LINK] = MicroService::instance().GetPublicAPIEndPoint() + "/actionLink?action=password_reset&id=" + LinkId ;
+                    SMTPMailerService()->SendMessage(UInfo.email, "password_reset.txt", Attrs);
                 }
                 break;
 
-                case MessagingTemplates::SUB_EMAIL_VERIFICATION: {
+                case EMAIL_VERIFICATION: {
                     MessageAttributes Attrs;
                     Attrs[RECIPIENT_EMAIL] = UInfo.email;
-                    Attrs[LOGO] = GetSubLogoAssetURI();
-                    Attrs[SUBJECT] = "e-mail Address Verification";
-                    Attrs[ACTION_LINK] = MicroServiceGetPublicAPIEndPoint() + "/actionLink?action=sub_email_verification&id=" + LinkId ;
-                    Attrs[ACTION_LINK_HTML] = "/api/v1/actionLink?action=sub_email_verification&id=" + LinkId ;
-                    SMTPMailerService()->SendMessage(UInfo.email, MessagingTemplates::TemplateName(MessagingTemplates::SUB_EMAIL_VERIFICATION, OperatorName), Attrs, true);
-                    UInfo.waitingForEmailCheck = true;
-                }
-                break;
-
-                case MessagingTemplates::SUB_SIGNUP_VERIFICATION: {
-                    MessageAttributes Attrs;
-                    Attrs[RECIPIENT_EMAIL] = UInfo.email;
-                    Attrs[LOGO] = GetSubLogoAssetURI();
-                    Attrs[SUBJECT] = "Signup e-mail Address Verification";
-                    Attrs[ACTION_LINK] = MicroServiceGetPublicAPIEndPoint() + "/actionLink?action=signup_verification&id=" + LinkId ;
-                    Attrs[ACTION_LINK_HTML] = "/api/v1/actionLink?action=signup_verification&id=" + LinkId ;
-                    SMTPMailerService()->SendMessage(UInfo.email, MessagingTemplates::TemplateName(MessagingTemplates::SUB_SIGNUP_VERIFICATION, OperatorName), Attrs, true);
+                    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;
@@ -713,14 +558,13 @@ namespace OpenWifi {
         SecurityObjects::ActionLink A;
 
         A.action = OpenWifi::SecurityObjects::LinkActions::VERIFY_EMAIL;
-        A.userId = UInfo.id;
-        A.id = MicroServiceCreateUUID();
-        A.created = Utils::Now();
+        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);
         UInfo.waitingForEmailCheck = true;
-        UInfo.validated = false;
         return true;
     }
 
@@ -728,14 +572,13 @@ namespace OpenWifi {
         SecurityObjects::ActionLink A;
 
         A.action = OpenWifi::SecurityObjects::LinkActions::SUB_VERIFY_EMAIL;
-        A.userId = UInfo.id;
-        A.id = MicroServiceCreateUUID();
-        A.created = Utils::Now();
+        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;
-        UInfo.validated = false;
         return true;
     }
 
@@ -750,14 +593,15 @@ namespace OpenWifi {
         if(StorageService()->UserTokenDB().GetToken(TToken, WT, UserId, RevocationDate)) {
             if(RevocationDate!=0)
                 return false;
-            Expired = (WT.created_ + WT.expires_in_) < Utils::Now();
+            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_);
@@ -769,35 +613,13 @@ namespace OpenWifi {
         if(StorageService()->SubTokenDB().GetToken(TToken, WT, UserId, RevocationDate)) {
             if(RevocationDate!=0)
                 return false;
-            Expired = (WT.created_ + WT.expires_in_) < Utils::Now();
+            Expired = (WT.created_ + WT.expires_in_) < std::time(nullptr);
             if(StorageService()->SubDB().GetUserById(UserId,UserInfo)) {
                 WebToken = WT;
                 return true;
             }
-        }
             return false;
         }
-
-    bool AuthService::IsValidApiKey(const std::string &ApiKey, SecurityObjects::WebToken &WebToken,
-                                    SecurityObjects::UserInfo &UserInfo, bool &Expired, std::uint64_t &expiresOn) {
-
-        std::lock_guard G(Mutex_);
-
-        std::string UserId;
-        SecurityObjects::WebToken   WT;
-        SecurityObjects::ApiKeyEntry    ApiKeyEntry;
-        if(StorageService()->ApiKeyDB().GetRecord("apiKey", ApiKey, ApiKeyEntry)) {
-            expiresOn = ApiKeyEntry.expiresOn;
-            Expired = ApiKeyEntry.expiresOn < Utils::Now();
-            if(Expired)
-                return false;
-            if(StorageService()->UserDB().GetUserById(ApiKeyEntry.userUuid,UserInfo)) {
-                WebToken = WT;
-                ApiKeyEntry.lastUse = Utils::Now();
-                StorageService()->ApiKeyDB().UpdateRecord("id", ApiKeyEntry.id, ApiKeyEntry);
-                return true;
-            }
-        }
         return false;
     }
 

src/AuthService.h

@@ -6,11 +6,11 @@
 //	Arilia Wireless Inc.
 //
 
-#pragma once
+#ifndef UCENTRAL_UAUTHSERVICE_H
+#define UCENTRAL_UAUTHSERVICE_H
 
 #include <regex>
 
-#include "framework/SubSystemServer.h"
 #include "Poco/JSON/Object.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
@@ -20,11 +20,8 @@
 #include "Poco/HMACEngine.h"
 #include "Poco/ExpireLRUCache.h"
 
-#include "framework/MicroServiceFuncs.h"
-#include "framework/ow_constants.h"
-
+#include "framework/MicroService.h"
 #include "RESTObjects/RESTAPI_SecurityObjects.h"
-#include "MessagingTemplates.h"
 
 namespace OpenWifi{
 
@@ -39,6 +36,11 @@ namespace OpenWifi{
             CUSTOM
         };
 
+        enum EMAIL_REASON {
+            FORGOT_PASSWORD,
+            EMAIL_VERIFICATION
+        };
+
         static ACCESS_TYPE IntToAccessType(int C);
         static int AccessTypeToInt(ACCESS_TYPE T);
 
@@ -50,18 +52,15 @@ namespace OpenWifi{
         int Start() override;
         void Stop() override;
 
-        [[nodiscard]] bool IsAuthorized(Poco::Net::HTTPServerRequest & Request,std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, std::uint64_t TID, bool & Expired);
-        [[nodiscard]] bool IsAuthorized(const std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo, std::uint64_t TID, bool & Expired);
-
+        [[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 );
         void CreateToken(const std::string & UserName, SecurityObjects::UserInfoAndPolicy &UInfo);
         [[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, std::uint64_t TID, bool & Expired);
+        [[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_;};
@@ -77,7 +76,6 @@ namespace OpenWifi{
         [[nodiscard]] std::string GenerateTokenJWT(const std::string & UserName, ACCESS_TYPE Type);
         [[nodiscard]] std::string GenerateTokenHMAC(const std::string & UserName, ACCESS_TYPE Type);
 
-        [[nodiscard]] bool IsValidApiKey(const std::string &ApiKey, SecurityObjects::WebToken &WebToken, SecurityObjects::UserInfo &UserInfo, bool & Expired, std::uint64_t & expiresOn);
         [[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);
@@ -91,31 +89,21 @@ namespace OpenWifi{
         [[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, MessagingTemplates::EMAIL_REASON Reason);
-        [[nodiscard]] static bool SendEmailToSubUser(const std::string &LinkId, std::string &Email, MessagingTemplates::EMAIL_REASON Reason, const std::string &OperatorName);
+        [[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);
 
-        [[nodiscard]] bool SendEmailChallengeCode(const SecurityObjects::UserInfoAndPolicy &UInfo, const std::string &code);
-
         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 MicroServicePublicEndPoint() + "/wwwassets/logo.png";
+            return MicroService::instance().PublicEndPoint() + "/wwwassets/the_logo.png";
         }
 
         [[nodiscard]] static inline const std::string GetLogoAssetFileName() {
-            return MicroServiceWWWAssetsDir() + "/logo.png";
-        }
-
-        [[nodiscard]] static inline const std::string GetSubLogoAssetURI() {
-            return MicroServicePublicEndPoint() + "/wwwassets/sub_logo.png";
-        }
-
-        [[nodiscard]] static inline const std::string GetSubLogoAssetFileName() {
-            return MicroServiceWWWAssetsDir() + "/sub_logo.png";
+            return MicroService::instance().WWWAssetsDir() + "/the_logo.png";
         }
 
         inline const std::string & GetPasswordPolicy() const { return PasswordPolicy_; }
@@ -124,10 +112,8 @@ namespace OpenWifi{
         inline const std::string & GetSubPasswordPolicy() const { return SubPasswordPolicy_; }
         inline const std::string & GetSubAccessPolicy() const { return SubAccessPolicy_; }
 
-        bool RefreshUserToken(Poco::Net::HTTPServerRequest & Request, const std::string & RefreshToken, SecurityObjects::UserInfoAndPolicy & UI);
-        bool RefreshSubToken(Poco::Net::HTTPServerRequest & Request, const std::string & RefreshToken, SecurityObjects::UserInfoAndPolicy & UI);
-
     private:
+		Poco::JWT::Signer	Signer_;
 		Poco::SHA2Engine	SHA2_;
 
 		std::string         AccessPolicy_;
@@ -139,9 +125,8 @@ namespace OpenWifi{
         std::regex          PasswordValidation_;
         std::regex          SubPasswordValidation_;
 
-        uint64_t            TokenAging_ = 15 * 24 * 60 * 60;
+        uint64_t            TokenAging_ = 30 * 24 * 60 * 60;
         uint64_t            HowManyOldPassword_=5;
-        uint64_t            RefreshTokenLifeSpan_ = 90 * 24 * 60 * 60 ;
 
         class SHA256Engine : public Poco::Crypto::DigestEngine
                 {
@@ -169,12 +154,13 @@ namespace OpenWifi{
 
     inline auto AuthService() { return AuthService::instance(); }
 
-    [[nodiscard]] inline bool AuthServiceIsAuthorized(Poco::Net::HTTPServerRequest & Request,std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo , std::uint64_t TID, bool & Expired, bool Sub ) {
+    [[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, TID, Expired );
+            return AuthService()->IsSubAuthorized(Request, SessionToken, UInfo, Expired );
         else
-            return AuthService()->IsAuthorized(Request, SessionToken, UInfo, TID, Expired );
+            return AuthService()->IsAuthorized(Request, SessionToken, UInfo, Expired );
     }
 
 } // end of namespace
 
+#endif //UCENTRAL_UAUTHSERVICE_H

src/Daemon.cpp

@@ -10,6 +10,8 @@
 //	Arilia Wireless Inc.
 //
 
+#include <cstdlib>
+#include <boost/algorithm/string.hpp>
 
 #include "Poco/Util/Application.h"
 #include "Poco/Util/Option.h"
@@ -18,7 +20,11 @@
 #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 "StorageService.h"
 #include "SMTPMailerService.h"
@@ -26,8 +32,6 @@
 #include "SMSSender.h"
 #include "ActionLinkManager.h"
 #include "TotpCache.h"
-#include "framework/RESTAPI_RateLimiter.h"
-#include "framework/UI_WebSocketClientServer.h"
 
 namespace OpenWifi {
     class Daemon *Daemon::instance_ = nullptr;
@@ -46,19 +50,18 @@ namespace OpenWifi {
                                            SMTPMailerService(),
                                            RESTAPI_RateLimiter(),
                                            TotpCache(),
-                                           AuthService(),
-                                           UI_WebSocketClientServer()
+                                           AuthService()
                                    });
         }
         return instance_;
     }
 
-    void Daemon::PostInitialization([[maybe_unused]] Poco::Util::Application &self) {
+    void Daemon::initialize() {
         AssetDir_ = MicroService::instance().ConfigPath("openwifi.restapi.wwwassets");
     }
 
-    void DaemonPostInitialization(Poco::Util::Application &self) {
-        Daemon()->PostInitialization(self);
+    void MicroServicePostInitialization() {
+        Daemon()->initialize();
     }
 }
 

src/Daemon.h

@@ -2,16 +2,14 @@
 // Created by stephane bourque on 2021-06-10.
 //
 
-#pragma once
+#ifndef UCENTRALSEC_DAEMON_H
+#define UCENTRALSEC_DAEMON_H
 
 #include <iostream>
 #include <cstdlib>
 #include <vector>
 #include <set>
 
-#include "framework/MicroServiceNames.h"
-#include "framework/MicroService.h"
-
 #include "Poco/Util/Application.h"
 #include "Poco/Util/ServerApplication.h"
 #include "Poco/Util/Option.h"
@@ -22,14 +20,15 @@
 #include "Poco/Crypto/CipherFactory.h"
 #include "Poco/Crypto/Cipher.h"
 
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
-    [[maybe_unused]] static const char * vDAEMON_PROPERTIES_FILENAME = "owsec.properties";
-    [[maybe_unused]] static const char * vDAEMON_ROOT_ENV_VAR = "OWSEC_ROOT";
-    [[maybe_unused]] static const char * vDAEMON_CONFIG_ENV_VAR = "OWSEC_CONFIG";
-    [[maybe_unused]] static const char * vDAEMON_APP_NAME = uSERVICE_SECURITY.c_str();
-    [[maybe_unused]] static const uint64_t vDAEMON_BUS_TIMER = 5000;
+    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_APP_NAME = uSERVICE_SECURITY.c_str();
+    static const uint64_t vDAEMON_BUS_TIMER = 5000;
 
     class Daemon : public MicroService {
     public:
@@ -41,7 +40,7 @@ namespace OpenWifi {
                         const SubSystemVec & SubSystems) :
                 MicroService( PropFile, RootEnv, ConfigEnv, AppName, BusTimer, SubSystems) {};
 
-        void PostInitialization(Poco::Util::Application &self);
+        void initialize();
         static Daemon *instance();
         inline const std::string & AssetDir() { return AssetDir_; }
     private:
@@ -50,6 +49,6 @@ namespace OpenWifi {
     };
 
     inline Daemon * Daemon() { return Daemon::instance(); }
-    void DaemonPostInitialization(Poco::Util::Application &self);
 }
 
+#endif //UCENTRALSEC_DAEMON_H

src/MFAServer.cpp

@@ -5,12 +5,10 @@
 #include "MFAServer.h"
 #include "SMSSender.h"
 #include "SMTPMailerService.h"
+#include "framework/MicroService.h"
 #include "AuthService.h"
 #include "TotpCache.h"
 
-#include "framework/MicroServiceFuncs.h"
-#include "framework/utils.h"
-
 namespace OpenWifi {
 
     int MFAServer::Start() {
@@ -29,8 +27,8 @@ namespace OpenWifi {
             return false;
 
         std::string Challenge = MakeChallenge();
-        std::string uuid = MicroServiceCreateUUID();
-        uint64_t Created = Utils::Now();
+        std::string uuid = MicroService::CreateUUID();
+        uint64_t Created = std::time(nullptr);
 
         ChallengeStart.set("uuid",uuid);
         ChallengeStart.set("created", Created);
@@ -46,7 +44,12 @@ namespace OpenWifi {
             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()) {
-            return AuthService()->SendEmailChallengeCode(UInfo,Challenge);
+            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;
         }
@@ -62,7 +65,7 @@ namespace OpenWifi {
         return SendChallenge(Hint->second.UInfo, Hint->second.Method, Hint->second.Answer);
     }
 
-    bool MFAServer::CompleteMFAChallenge(const Poco::JSON::Object::Ptr &ChallengeResponse, SecurityObjects::UserInfoAndPolicy &UInfo) {
+    bool MFAServer::CompleteMFAChallenge(Poco::JSON::Object::Ptr &ChallengeResponse, SecurityObjects::UserInfoAndPolicy &UInfo) {
         std::lock_guard G(Mutex_);
 
         if(!ChallengeResponse->has("uuid") || !ChallengeResponse->has("answer"))
@@ -104,7 +107,7 @@ namespace OpenWifi {
 
     void MFAServer::CleanCache() {
         // it is assumed that you have locked Cache_ at this point.
-        uint64_t Now = Utils::Now();
+        uint64_t Now = std::time(nullptr);
         for(auto i=begin(Cache_);i!=end(Cache_);) {
             if((Now-i->second.Created)>300) {
                 i = Cache_.erase(i);

src/MFAServer.h

@@ -2,14 +2,12 @@
 // Created by stephane bourque on 2021-10-11.
 //
 
-#pragma once
+#ifndef OWSEC_MFASERVER_H
+#define OWSEC_MFASERVER_H
 
+#include "framework/MicroService.h"
 #include "Poco/JSON/Object.h"
 #include "RESTObjects/RESTAPI_SecurityObjects.h"
-#include "framework/SubSystemServer.h"
-#include "framework/MicroServiceFuncs.h"
-
-#include "fmt/format.h"
 
 namespace OpenWifi {
 
@@ -43,13 +41,15 @@ namespace OpenWifi {
         }
 
         bool StartMFAChallenge(const SecurityObjects::UserInfoAndPolicy &UInfo, Poco::JSON::Object &Challenge);
-        bool CompleteMFAChallenge(const Poco::JSON::Object::Ptr &ChallengeResponse, SecurityObjects::UserInfoAndPolicy &UInfo);
+        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() {
-            return fmt::format("{0:06}" , MicroServiceRandom(1,999999) );
+            char buf[16];
+            std::sprintf(buf,"%06llu",MicroService::instance().Random(1,999999));
+            return buf;
         }
 
     private:
@@ -65,3 +65,4 @@ namespace OpenWifi {
     inline auto MFAServer() { return MFAServer::instance(); }
 }
 
+#endif //OWSEC_MFASERVER_H

src/MessagingTemplates.cpp

@@ -1,8 +0,0 @@
-//
-// Created by stephane bourque on 2022-07-25.
-//
-
-#include "MessagingTemplates.h"
-
-namespace OpenWifi {
-} // OpenWifi

src/MessagingTemplates.h

@@ -1,75 +0,0 @@
-//
-// Created by stephane bourque on 2022-07-25.
-//
-
-#pragma once
-
-#include <string>
-#include <vector>
-
-namespace OpenWifi {
-
-    class MessagingTemplates {
-    public:
-        static MessagingTemplates & instance() {
-            static auto instance = new MessagingTemplates;
-            return *instance;
-        }
-
-        enum EMAIL_REASON {
-            FORGOT_PASSWORD = 0,
-            EMAIL_VERIFICATION,
-            SUB_SIGNUP_VERIFICATION,
-            EMAIL_INVITATION,
-            VERIFICATION_CODE,
-            SUB_FORGOT_PASSWORD,
-            SUB_EMAIL_VERIFICATION,
-            SUB_VERIFICATION_CODE
-        };
-
-        static std::string AddOperator(const std::string & filename, const std::string &OperatorName) {
-            if(OperatorName.empty())
-                return "/" + filename;
-            return "/" + OperatorName + "/" + filename;
-        }
-
-        static std::string TemplateName( EMAIL_REASON r , const std::string &OperatorName="") {
-            switch (r) {
-                case FORGOT_PASSWORD: return AddOperator(EmailTemplateNames[FORGOT_PASSWORD],OperatorName);
-                case EMAIL_VERIFICATION: return AddOperator(EmailTemplateNames[EMAIL_VERIFICATION],OperatorName);
-                case SUB_SIGNUP_VERIFICATION: return AddOperator(EmailTemplateNames[SUB_SIGNUP_VERIFICATION],OperatorName);
-                case EMAIL_INVITATION: return AddOperator(EmailTemplateNames[EMAIL_INVITATION],OperatorName);
-                case VERIFICATION_CODE: return AddOperator(EmailTemplateNames[VERIFICATION_CODE],OperatorName);
-                case SUB_FORGOT_PASSWORD: return AddOperator(EmailTemplateNames[SUB_FORGOT_PASSWORD],OperatorName);
-                case SUB_EMAIL_VERIFICATION: return AddOperator(EmailTemplateNames[SUB_EMAIL_VERIFICATION],OperatorName);
-                case SUB_VERIFICATION_CODE: return AddOperator(EmailTemplateNames[SUB_VERIFICATION_CODE],OperatorName);
-                default:
-                    return "";
-            }
-        }
-
-        static std::string Logo(const std::string &OperatorName = "" ) {
-            return AddOperator("logo.png", OperatorName);
-        }
-
-        static std::string SubLogo(const std::string &OperatorName = "" ) {
-            return AddOperator("sub_logo.png", OperatorName);
-        }
-
-    private:
-        inline const static std::vector<std::string>  EmailTemplateNames = {
-                "password_reset",
-                "email_verification",
-                "sub_signup_verification",
-                "email_invitation",
-                "verification_code",
-                "sub_password_reset",
-                "sub_email_verification",
-                "sub_verification_code"
-        };
-    };
-
-    inline MessagingTemplates & MessagingTemplates() { return MessagingTemplates::instance(); }
-
-} // OpenWifi
-

src/RESTAPI/RESTAPI_action_links.cpp

@@ -7,9 +7,7 @@
 
 #include "RESTAPI_action_links.h"
 #include "StorageService.h"
-#include "framework/RESTAPI_PartHandler.h"
-#include "framework/OpenAPIRequests.h"
-
+#include "framework/MicroService.h"
 #include "Daemon.h"
 
 namespace OpenWifi {
@@ -25,14 +23,8 @@ namespace OpenWifi {
 
         if(Action=="password_reset")
             return RequestResetPassword(Link);
-        else if(Action=="sub_password_reset")
-            return RequestSubResetPassword(Link);
         else if(Action=="email_verification")
             return DoEmailVerification(Link);
-        else if(Action=="sub_email_verification")
-            return DoSubEmailVerification(Link);
-        else if(Action=="signup_verification")
-            return DoNewSubVerification(Link);
         else
             return DoReturnA404();
     }
@@ -42,32 +34,18 @@ namespace OpenWifi {
 
         if(Action=="password_reset")
             return CompleteResetPassword();
-        else if(Action=="sub_password_reset")
-            return CompleteResetPassword();
-        else if(Action=="signup_completion")
-            return CompleteSubVerification();
-        else if(Action=="email_invitation")
-            return CompleteEmailInvitation();
         else
             return DoReturnA404();
     }
 
     void RESTAPI_action_links::RequestResetPassword(SecurityObjects::ActionLink &Link) {
-        Logger_.information(fmt::format("REQUEST-PASSWORD-RESET({}): For ID={}", Request->clientAddress().toString(), Link.userId));
+        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::DoNewSubVerification(SecurityObjects::ActionLink &Link) {
-        Logger_.information(fmt::format("REQUEST-SUB-SIGNUP({}): For ID={}", Request->clientAddress().toString(), Link.userId));
-        Poco::File  FormFile{ Daemon()->AssetDir() + "/sub_signup_verification.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;
@@ -75,15 +53,15 @@ namespace OpenWifi {
         if (!Form.empty()) {
 
             auto Password1 = Form.get("password1","bla");
-            auto Password2 = Form.get("password2","blu");
+            auto Password2 = Form.get("password1","blu");
             auto Id = Form.get("id","");
-            auto now = OpenWifi::Now();
+            auto Now = std::time(nullptr);
 
             SecurityObjects::ActionLink Link;
             if(!StorageService()->ActionLinksDB().GetActionLink(Id,Link))
                 return DoReturnA404();
 
-            if(now > Link.expires) {
+            if(Now > Link.expires) {
                 StorageService()->ActionLinksDB().CancelAction(Id);
                 return DoReturnA404();
             }
@@ -123,7 +101,7 @@ namespace OpenWifi {
                 return SendHTMLFileBack(FormFile,FormVars);
             }
 
-            UInfo.modified = OpenWifi::Now();
+            UInfo.modified = std::time(nullptr);
             if(Link.userAction)
                 StorageService()->UserDB().UpdateUserInfo(UInfo.email,Link.userId,UInfo);
             else
@@ -140,102 +118,10 @@ namespace OpenWifi {
         }
     }
 
-    void RESTAPI_action_links::CompleteSubVerification() {
-        RESTAPI_PartHandler PartHandler;
-        Poco::Net::HTMLForm Form(*Request, Request->stream(), PartHandler);
-
-        if (!Form.empty()) {
-            auto Password1 = Form.get("password1","bla");
-            auto Password2 = Form.get("password2","blu");
-            auto Id = Form.get("id","");
-            auto now = OpenWifi::Now();
-
-            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()->ValidateSubPassword(Password1)) {
-                Poco::File  FormFile{ Daemon()->AssetDir() + "/sub_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 = StorageService()->SubDB().GetUserById(Link.userId,UInfo);
-            if(!Found) {
-                Poco::File  FormFile{ Daemon()->AssetDir() + "/sub_signup_verification_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() + "/sub_signup_verification_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 = AuthService()->SetSubPassword(Password1,UInfo);
-            if(!GoodPassword) {
-                Poco::File  FormFile{ Daemon()->AssetDir() + "/sub_signup_verification_error.html"};
-                Types::StringPairVec    FormVars{ {"UUID", Id},
-                                                  {"ERROR_TEXT", "You cannot reuse one of your recent passwords."}};
-                return SendHTMLFileBack(FormFile,FormVars);
-            }
-
-            UInfo.modified = OpenWifi::Now();
-            UInfo.changePassword = false;
-            UInfo.lastEmailCheck = OpenWifi::Now();
-            UInfo.waitingForEmailCheck = false;
-            UInfo.validated = OpenWifi::Now();
-
-            StorageService()->SubDB().UpdateUserInfo(UInfo.email,Link.userId,UInfo);
-
-            Poco::File  FormFile{ Daemon()->AssetDir() + "/sub_signup_verification_success.html"};
-            Types::StringPairVec    FormVars{ {"UUID", Id},
-                                              {"USERNAME", UInfo.email} };
-            StorageService()->ActionLinksDB().CompleteAction(Id);
-
-            //  Send the update to the provisioning service
-            Poco::JSON::Object  Body;
-            auto RawSignup = Poco::StringTokenizer(UInfo.signingUp,":");
-            Body.set("signupUUID", RawSignup.count()==1 ? UInfo.signingUp : RawSignup[1]);
-            OpenAPIRequestPut   ProvRequest(uSERVICE_PROVISIONING,"/api/v1/signup",
-                                            {
-                                                {"signupUUID", RawSignup.count()==1 ? UInfo.signingUp : RawSignup[1]} ,
-                                                {"operation", "emailVerified"}
-                                            },
-                                            Body,30000);
-            Logger().information(fmt::format("({}): Completed subscriber e-mail verification and password.",UInfo.email));
-            Poco::JSON::Object::Ptr Response;
-            auto Status = ProvRequest.Do(Response);
-            std::stringstream ooo;
-            if(Response!= nullptr)
-                Response->stringify(ooo);
-            Logger().information(fmt::format("({}): Completed subscriber e-mail verification. Provisioning notified, Error={}.",
-                                             UInfo.email, Status));
-            SendHTMLFileBack(FormFile,FormVars);
-            Logger().information(fmt::format("({}): Completed subscriber e-mail verification. FORM notified.",UInfo.email));
-        } else {
-            DoReturnA404();
-        }
-    }
-
     void RESTAPI_action_links::DoEmailVerification(SecurityObjects::ActionLink &Link) {
-        auto now = OpenWifi::Now();
+        auto Now = std::time(nullptr);
 
-        if(now > Link.expires) {
+        if(Now > Link.expires) {
             StorageService()->ActionLinksDB().CancelAction(Link.id);
             return DoReturnA404();
         }
@@ -249,13 +135,12 @@ namespace OpenWifi {
             return SendHTMLFileBack(FormFile, FormVars);
         }
 
-        Logger_.information(fmt::format("EMAIL-VERIFICATION(%s): For ID={}", Request->clientAddress().toString(),
-                                        UInfo.email));
+        Logger_.information(Poco::format("EMAIL-VERIFICATION(%s): For ID=%s", Request->clientAddress().toString(), UInfo.email));
         UInfo.waitingForEmailCheck = false;
         UInfo.validated = true;
-        UInfo.lastEmailCheck = OpenWifi::Now();
-        UInfo.validationDate = OpenWifi::Now();
-        UInfo.modified  = OpenWifi::Now();
+        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
@@ -274,16 +159,4 @@ namespace OpenWifi {
         SendHTMLFileBack(FormFile, FormVars);
     }
 
-    void RESTAPI_action_links::CompleteEmailInvitation() {
-        /// TODO:
-    }
-
-    void RESTAPI_action_links::RequestSubResetPassword([[maybe_unused]] SecurityObjects::ActionLink &Link) {
-
-    }
-
-    void RESTAPI_action_links::DoSubEmailVerification([[maybe_unused]] SecurityObjects::ActionLink &Link) {
-
-    }
-
 }

src/RESTAPI/RESTAPI_action_links.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_action_links : public RESTAPIHandler {
     public:
-        RESTAPI_action_links(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        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,
@@ -20,16 +20,11 @@ namespace OpenWifi {
                                         Internal,
                                         false,
                                         true, RateLimit{.Interval=1000,.MaxCalls=10}) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/actionLink"}; };
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/actionLink"}; };
         void RequestResetPassword(SecurityObjects::ActionLink &Link);
-        void RequestSubResetPassword(SecurityObjects::ActionLink &Link);
         void CompleteResetPassword();
-        void CompleteSubVerification();
         void DoEmailVerification(SecurityObjects::ActionLink &Link);
-        void DoSubEmailVerification(SecurityObjects::ActionLink &Link);
         void DoReturnA404();
-        void DoNewSubVerification(SecurityObjects::ActionLink &Link);
-        void CompleteEmailInvitation();
 
         void DoGet() final;
         void DoPost() final;

src/RESTAPI/RESTAPI_apiKey_handler.cpp

@@ -1,158 +0,0 @@
-//
-// Created by stephane bourque on 2022-11-04.
-//
-
-#include "RESTAPI_apiKey_handler.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_apiKey_handler::DoGet() {
-        std::string     user_uuid = GetBinding("uuid","");
-        if(user_uuid.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-        if(user_uuid!=UserInfo_.userinfo.id && UserInfo_.userinfo.userRole!=SecurityObjects::ROOT) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        SecurityObjects::ApiKeyEntryList    List;
-        if(DB_.GetRecords(0,500, List.apiKeys, fmt::format(" userUuid='{}' ", user_uuid))) {
-            for(auto &key:List.apiKeys) {
-                Sanitize(UserInfo_, key);
-            }
-            Poco::JSON::Object  Answer;
-            List.to_json(Answer);
-            return ReturnObject(Answer);
-        }
-        return NotFound();
-    }
-
-    void RESTAPI_apiKey_handler::DoDelete() {
-        std::string     user_uuid = GetBinding("uuid","");
-        if(user_uuid.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-
-        if(user_uuid!=UserInfo_.userinfo.id && UserInfo_.userinfo.userRole!=SecurityObjects::ROOT) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        if(user_uuid!=UserInfo_.userinfo.id) {
-            if(!StorageService()->UserDB().Exists("id",user_uuid)) {
-                return NotFound();
-            }
-        }
-
-        std::string ApiKeyId= GetParameter("keyUuid","");
-        if(ApiKeyId.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-
-        SecurityObjects::ApiKeyEntry    ApiKey;
-        if(StorageService()->ApiKeyDB().GetRecord("id",ApiKeyId,ApiKey)) {
-            if(ApiKey.userUuid==user_uuid) {
-                AuthService()->RemoveTokenSystemWide(ApiKey.apiKey);
-                DB_.DeleteRecord("id", ApiKeyId);
-                return OK();
-            }
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-        return NotFound();
-    }
-
-    void RESTAPI_apiKey_handler::DoPost() {
-        std::string     user_uuid = GetBinding("uuid","");
-
-        if(user_uuid.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-
-        if(user_uuid!=UserInfo_.userinfo.id && UserInfo_.userinfo.userRole!=SecurityObjects::ROOT) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        if(user_uuid!=UserInfo_.userinfo.id) {
-            //  Must verify if the user exists
-            if(!StorageService()->UserDB().Exists("id",user_uuid)) {
-                return BadRequest(RESTAPI::Errors::UserMustExist);
-            }
-        }
-
-        SecurityObjects::ApiKeyEntry    NewKey;
-        if(!NewKey.from_json(ParsedBody_)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-        NewKey.lastUse = 0 ;
-
-        if(!Utils::IsAlphaNumeric(NewKey.name) || NewKey.name.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-
-        Poco::toLowerInPlace(NewKey.name);
-        NewKey.userUuid = user_uuid;
-        if(NewKey.expiresOn < Utils::Now()) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-
-        //  does a key of that name already exit for this user?
-        SecurityObjects::ApiKeyEntryList    ExistingList;
-        if(DB_.GetRecords(0,500, ExistingList.apiKeys, fmt::format(" userUuid='{}' ", user_uuid))) {
-            if(std::find_if(ExistingList.apiKeys.begin(),ExistingList.apiKeys.end(), [NewKey](const SecurityObjects::ApiKeyEntry &E) -> bool {
-                return E.name==NewKey.name;
-            })!=ExistingList.apiKeys.end()) {
-                return BadRequest(RESTAPI::Errors::ApiKeyNameAlreadyExists);
-            }
-        }
-
-        if(ExistingList.apiKeys.size()>=10) {
-            return BadRequest(RESTAPI::Errors::TooManyApiKeys);
-        }
-
-        NewKey.id = MicroServiceCreateUUID();
-        NewKey.userUuid = user_uuid;
-        NewKey.salt = std::to_string(Utils::Now());
-        NewKey.apiKey = Utils::ComputeHash(NewKey.salt, UserInfo_.userinfo.id, UserInfo_.webtoken.access_token_ );
-        NewKey.created = Utils::Now();
-
-        if(DB_.CreateRecord(NewKey)) {
-            Poco::JSON::Object  Answer;
-            NewKey.to_json(Answer);
-            return ReturnObject(Answer);
-        }
-        return BadRequest(RESTAPI::Errors::RecordNotCreated);
-    }
-
-    void RESTAPI_apiKey_handler::DoPut() {
-        std::string     user_uuid = GetBinding("uuid","");
-        if(user_uuid.empty()) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-        if(user_uuid!=UserInfo_.userinfo.id && UserInfo_.userinfo.userRole!=SecurityObjects::ROOT) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-        SecurityObjects::ApiKeyEntry    NewKey;
-        if(!NewKey.from_json(ParsedBody_)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
-        SecurityObjects::ApiKeyEntry    ExistingKey;
-        if(!DB_.GetRecord("id",NewKey.id,ExistingKey)) {
-            return BadRequest(RESTAPI::Errors::ApiKeyDoesNotExist);
-        }
-
-        if(ExistingKey.userUuid!=user_uuid) {
-            return BadRequest(RESTAPI::Errors::MissingUserID);
-        }
-
-        AssignIfPresent(ParsedBody_,"description",ExistingKey.description);
-
-        if(DB_.UpdateRecord("id",ExistingKey.id,ExistingKey)) {
-            Poco::JSON::Object  Answer;
-            ExistingKey.to_json(Answer);
-            return ReturnObject(Answer);
-        }
-        BadRequest(RESTAPI::Errors::RecordNotUpdated);
-    }
-
-}

src/RESTAPI/RESTAPI_apiKey_handler.h

@@ -1,34 +0,0 @@
-//
-// Created by stephane bourque on 2022-11-04.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-#include "StorageService.h"
-namespace OpenWifi {
-    class RESTAPI_apiKey_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_apiKey_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &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_POST,
-                                         Poco::Net::HTTPRequest::HTTP_DELETE,
-                                         Poco::Net::HTTPRequest::HTTP_OPTIONS},
-                                 Server,
-                                 TransactionId,
-                                 Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/apiKey/{uuid}"}; };
-    private:
-        ApiKeyDB     &DB_=StorageService()->ApiKeyDB();
-
-        void DoGet() final;
-        void DoPut() final;
-        void DoPost() final;
-        void DoDelete() final;
-
-    };
-}
-

src/RESTAPI/RESTAPI_asset_server.cpp

@@ -4,7 +4,7 @@
 
 #include "RESTAPI_asset_server.h"
 #include "Poco/File.h"
-#include "framework/ow_constants.h"
+#include "framework/RESTAPI_protocol.h"
 #include "Daemon.h"
 
 namespace OpenWifi {

src/RESTAPI/RESTAPI_asset_server.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "../framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_asset_server : public RESTAPIHandler {
     public:
-        RESTAPI_asset_server(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        RESTAPI_asset_server(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,
@@ -20,7 +20,7 @@ namespace OpenWifi {
                                           Server,
                                           TransactionId,
                                           Internal, false) {}
-        static auto PathName() { return std::list<std::string>{"/wwwassets/{id}" ,
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/wwwassets/{id}" ,
                                                                                          "/favicon.ico"}; };
         void DoGet() final;
         void DoPost() final {};

src/RESTAPI/RESTAPI_avatar_handler.cpp

@@ -8,8 +8,8 @@
 #include "RESTAPI_avatar_handler.h"
 #include "StorageService.h"
 #include "Poco/Net/HTMLForm.h"
-#include "Poco/CountingStream.h"
-#include "framework/MicroServiceFuncs.h"
+#include "framework/RESTAPI_protocol.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
@@ -35,14 +35,13 @@ namespace OpenWifi {
         Poco::Net::HTMLForm form(*Request, Request->stream(), partHandler);
         Poco::JSON::Object Answer;
 
-        if (!partHandler.Name().empty() && partHandler.Length()< MicroServiceConfigGetInt("openwifi.avatar.maxsize",2000000)) {
+        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(fmt::format("Uploaded avatar: {} Type: {}", partHandler.Name(), partHandler.ContentType()));
+            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");
-            Logger().information(fmt::format("Adding avatar for {}",UserInfo_.userinfo.email));
         } else {
             Answer.set(RESTAPI::Protocol::AVATARID, Id);
             Answer.set(RESTAPI::Protocol::ERRORCODE, 13);
@@ -61,7 +60,6 @@ namespace OpenWifi {
         if (!StorageService()->AvatarDB().GetAvatar(UserInfo_.userinfo.email, Id, AvatarContent, Type, Name)) {
             return NotFound();
         }
-        Logger().information(fmt::format("Retrieving avatar for {}, size:{}",UserInfo_.userinfo.email,AvatarContent.size()));
         return SendFileContent(AvatarContent, Type, Name);
     }
 
@@ -69,14 +67,13 @@ namespace OpenWifi {
         std::string Id = GetBinding(RESTAPI::Protocol::ID, "");
 
         if(UserInfo_.userinfo.userRole!=SecurityObjects::ROOT && Id!=UserInfo_.userinfo.id) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
+            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
         }
 
         if (!StorageService()->AvatarDB().DeleteAvatar(UserInfo_.userinfo.email, Id)) {
             return NotFound();
         }
 
-        Logger().information(fmt::format("Deleted avatar for {}",UserInfo_.userinfo.email));
         StorageService()->UserDB().SetAvatar(Id,"");
         OK();
     }

src/RESTAPI/RESTAPI_avatar_handler.h

@@ -3,8 +3,7 @@
 //
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
-#include "Poco/Net/PartHandler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
@@ -27,13 +26,11 @@ namespace OpenWifi {
         std::string     Id_;
         Poco::Logger    &Logger_;
         std::stringstream &OutputStream_;
-
-        inline Poco::Logger & Logger() { return Logger_; };
     };
 
     class RESTAPI_avatar_handler : public RESTAPIHandler {
     public:
-        RESTAPI_avatar_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        RESTAPI_avatar_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,
@@ -43,11 +40,12 @@ namespace OpenWifi {
                                          Server,
                                          TransactionId,
                                          Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/avatar/{id}"}; };
+        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 {};
+
     };
 }

src/RESTAPI/RESTAPI_db_helpers.h

@@ -8,13 +8,10 @@
 
 namespace OpenWifi {
 
-    inline void Sanitize([[maybe_unused]] const SecurityObjects::UserInfoAndPolicy &User, SecurityObjects::UserInfo & U) {
+    inline void Sanitize(const SecurityObjects::UserInfoAndPolicy &User, SecurityObjects::UserInfo & U) {
         U.currentPassword.clear();
         U.lastPasswords.clear();
         U.oauthType.clear();
     }
 
-    inline void Sanitize([[maybe_unused]] const SecurityObjects::UserInfoAndPolicy &User, SecurityObjects::ApiKeyEntry & U) {
-        U.salt.clear();
-    }
 }

src/RESTAPI/RESTAPI_email_handler.cpp

@@ -3,14 +3,18 @@
 //
 
 #include "RESTAPI_email_handler.h"
+
+
+#include "Poco/Exception.h"
 #include "Poco/JSON/Parser.h"
 
 #include "SMTPMailerService.h"
-#include "framework/ow_constants.h"
+#include "framework/RESTAPI_errors.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     void RESTAPI_email_handler::DoPost() {
-        const auto & Obj = ParsedBody_;
+        auto Obj = ParseStream();
         if (Obj->has("subject") &&
             Obj->has("from") &&
             Obj->has("text") &&
@@ -24,7 +28,7 @@ namespace OpenWifi {
             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, false)) {
+            if(SMTPMailerService()->SendMessage(Recipient, "password_reset.txt", Attrs)) {
                 return OK();
             }
             return ReturnStatus(Poco::Net::HTTPResponse::HTTP_SERVICE_UNAVAILABLE);

src/RESTAPI/RESTAPI_email_handler.h

@@ -4,19 +4,19 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_email_handler : public RESTAPIHandler {
     public:
-        RESTAPI_email_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        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 auto PathName() { return std::list<std::string>{"/api/v1/email"};}
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/email"};}
         void DoGet() final {};
         void DoPost() final;
         void DoDelete() final {};

src/RESTAPI/RESTAPI_oauth2_handler.cpp

@@ -11,24 +11,23 @@
 #include "AuthService.h"
 #include "RESTAPI_oauth2_handler.h"
 #include "MFAServer.h"
-#include "framework/ow_constants.h"
+#include "framework/RESTAPI_protocol.h"
+#include "framework/MicroService.h"
 #include "StorageService.h"
 #include "RESTAPI_db_helpers.h"
 
-#include "framework/MicroServiceFuncs.h"
-
 namespace OpenWifi {
 
 	void RESTAPI_oauth2_handler::DoGet() {
 	    bool Expired = false, Contacted = false;
         if (!IsAuthorized(Expired, Contacted)) {
-            if (Expired)
-                return UnAuthorized(RESTAPI::Errors::EXPIRED_TOKEN);
-            return UnAuthorized(RESTAPI::Errors::INVALID_TOKEN);
+            if(Expired)
+                return UnAuthorized(RESTAPI::Errors::ExpiredToken,EXPIRED_TOKEN);
+            return UnAuthorized(RESTAPI::Errors::MissingAuthenticationInformation, INVALID_TOKEN);
         }
-        if (GetBoolParameter(RESTAPI::Protocol::ME)) {
-            Logger_.information(fmt::format("REQUEST-ME({}): Request for {}", Request->clientAddress().toString(),
-                                            UserInfo_.userinfo.email));
+        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);
@@ -39,52 +38,33 @@ namespace OpenWifi {
 	}
 
     void RESTAPI_oauth2_handler::DoDelete() {
-        auto Token = GetBinding(RESTAPI::Protocol::TOKEN, "");
-        std::string SessionToken;
-        try {
-            Poco::Net::OAuth20Credentials Auth(*Request);
-            if (Auth.getScheme() == "Bearer") {
-                SessionToken = Auth.getBearerToken();
-            }
-        } catch (const Poco::Exception &E) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-        if (Token.empty() || (Token != SessionToken)) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
+	    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);
         }
 
-	void RESTAPI_oauth2_handler::DoPost() {
-
-        const auto & Obj = ParsedBody_;
-        if(Obj == nullptr) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
+        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);
-        auto refreshToken = GetS("refreshToken", Obj);
-        auto grant_type = GetParameter("grant_type");
 
         Poco::toLowerInPlace(userId);
 
-        if(!refreshToken.empty() && grant_type == "refresh_token") {
-            SecurityObjects::UserInfoAndPolicy UInfo;
-            if(AuthService()->RefreshUserToken(*Request, refreshToken, UInfo)) {
-                Poco::JSON::Object  Answer;
-                UInfo.webtoken.to_json(Answer);
-                return ReturnObject(Answer);
-            } else {
-                return UnAuthorized(RESTAPI::Errors::CANNOT_REFRESH_TOKEN);
-            }
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::REQUIREMENTS)) {
-            Logger_.information(fmt::format("POLICY-REQUEST({}): Request.", Request->clientAddress().toString()));
+        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());
@@ -92,17 +72,17 @@ namespace OpenWifi {
             return ReturnObject(Answer);
         }
 
-        if(GetBoolParameter(RESTAPI::Protocol::FORGOTPASSWORD)) {
+        if(GetBoolParameter(RESTAPI::Protocol::FORGOTPASSWORD,false)) {
             SecurityObjects::UserInfo UInfo1;
             auto UserExists = StorageService()->UserDB().GetUserByEmail(userId,UInfo1);
             if(UserExists) {
-                Logger_.information(fmt::format("FORGOTTEN-PASSWORD({}): Request for {}", Request->clientAddress().toString(), userId));
+                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 = MicroServiceCreateUUID();
+                NewLink.id = MicroService::CreateUUID();
                 NewLink.userId = UInfo1.id;
-                NewLink.created = OpenWifi::Now();
+                NewLink.created = std::time(nullptr);
                 NewLink.expires = NewLink.created + (24*60*60);
                 NewLink.userAction = true;
                 StorageService()->ActionLinksDB().CreateAction(NewLink);
@@ -121,18 +101,18 @@ namespace OpenWifi {
             }
         }
 
-        if(GetBoolParameter(RESTAPI::Protocol::RESENDMFACODE)) {
-            Logger_.information(fmt::format("RESEND-MFA-CODE({}): Request for {}", Request->clientAddress().toString(), userId));
+        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::BAD_MFA_TRANSACTION);
+            return UnAuthorized(RESTAPI::Errors::InvalidCredentials, BAD_MFA_TRANSACTION);
         }
 
         if(GetBoolParameter(RESTAPI::Protocol::COMPLETEMFACHALLENGE,false)) {
-            Logger_.information(fmt::format("COMPLETE-MFA-CHALLENGE({}): Request for {}", Request->clientAddress().toString(), userId));
+            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)) {
@@ -141,7 +121,7 @@ namespace OpenWifi {
                     return ReturnObject(ReturnObj);
                 }
             }
-            return UnAuthorized(RESTAPI::Errors::MFA_FAILURE);
+            return UnAuthorized(RESTAPI::Errors::InvalidCredentials, MFA_FAILURE);
         }
 
         SecurityObjects::UserInfoAndPolicy UInfo;
@@ -161,17 +141,17 @@ namespace OpenWifi {
 
             switch(Code) {
                 case INVALID_CREDENTIALS:
-                    return UnAuthorized(RESTAPI::Errors::INVALID_CREDENTIALS);
+                    return UnAuthorized(RESTAPI::Errors::InvalidCredentials, Code);
                 case PASSWORD_INVALID:
-                    return UnAuthorized(RESTAPI::Errors::PASSWORD_INVALID);
+                    return UnAuthorized(RESTAPI::Errors::InvalidPassword, Code);
                 case PASSWORD_ALREADY_USED:
-                    return UnAuthorized(RESTAPI::Errors::PASSWORD_ALREADY_USED);
+                    return UnAuthorized(RESTAPI::Errors::PasswordRejected, Code);
                 case USERNAME_PENDING_VERIFICATION:
-                    return UnAuthorized(RESTAPI::Errors::USERNAME_PENDING_VERIFICATION);
+                    return UnAuthorized(RESTAPI::Errors::UserPendingVerification, Code);
                 case PASSWORD_CHANGE_REQUIRED:
-                    return UnAuthorized(RESTAPI::Errors::PASSWORD_CHANGE_REQUIRED);
+                    return UnAuthorized(RESTAPI::Errors::PasswordMustBeChanged, Code);
                 default:
-                    return UnAuthorized(RESTAPI::Errors::INVALID_CREDENTIALS);
+                    return UnAuthorized(RESTAPI::Errors::InvalidCredentials); break;
             }
             return;
         }

src/RESTAPI/RESTAPI_oauth2_handler.h

@@ -7,12 +7,12 @@
 //
 
 #pragma once
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 	class RESTAPI_oauth2_handler : public RESTAPIHandler {
 	  public:
-	    RESTAPI_oauth2_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+	    RESTAPI_oauth2_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,
@@ -21,7 +21,7 @@ namespace OpenWifi {
 													  Server,
                                                       TransactionId,
 													  Internal, false, true , RateLimit{.Interval=1000,.MaxCalls=10}) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/oauth2/{token}","/api/v1/oauth2"}; };
+		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;

src/RESTAPI/RESTAPI_preferences.cpp

@@ -19,13 +19,13 @@ namespace OpenWifi {
 
         SecurityObjects::Preferences    P;
 
-        const auto & RawObject = ParsedBody_;
+        auto RawObject = ParseStream();
         if(!P.from_json(RawObject)) {
             return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
         }
 
         P.id = UserInfo_.userinfo.id;
-        P.modified = OpenWifi::Now();
+        P.modified = std::time(nullptr);
         StorageService()->PreferencesDB().SetPreferences(P);
 
         Poco::JSON::Object  Answer;

src/RESTAPI/RESTAPI_preferences.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_preferences : public RESTAPIHandler {
     public:
-        RESTAPI_preferences(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        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,
@@ -18,7 +18,7 @@ namespace OpenWifi {
             Server,
             TransactionId,
             Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/preferences"}; };
+            static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/preferences"}; };
         void DoGet() final;
         void DoPut() final;
         void DoPost() final {};

src/RESTAPI/RESTAPI_routers.cpp

@@ -2,6 +2,8 @@
 // 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"
@@ -22,22 +24,15 @@
 #include "RESTAPI/RESTAPI_submfa_handler.h"
 #include "RESTAPI/RESTAPI_totp_handler.h"
 #include "RESTAPI/RESTAPI_subtotp_handler.h"
-#include "RESTAPI/RESTAPI_signup_handler.h"
-#include "RESTAPI/RESTAPI_apiKey_handler.h"
-#include "RESTAPI/RESTAPI_validate_apikey.h"
-
-#include "framework/RESTAPI_SystemCommand.h"
-#include "framework/RESTAPI_WebSocketServer.h"
 
 namespace OpenWifi {
 
-    Poco::Net::HTTPRequestHandler * RESTAPI_ExtRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
-                                                            Poco::Logger & L, RESTAPI_GenericServerAccounting & S,
-                                                            uint64_t TransactionId) {
+    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_user_handler,
             RESTAPI_users_handler,
+            RESTAPI_user_handler,
             RESTAPI_system_command,
             RESTAPI_asset_server,
             RESTAPI_system_endpoints_handler,
@@ -53,43 +48,26 @@ namespace OpenWifi {
             RESTAPI_subusers_handler,
             RESTAPI_submfa_handler,
             RESTAPI_totp_handler,
-            RESTAPI_subtotp_handler,
-            RESTAPI_signup_handler,
-            RESTAPI_validate_sub_token_handler,
-            RESTAPI_validate_token_handler,
-            RESTAPI_validate_apikey,
-            RESTAPI_webSocketServer,
-            RESTAPI_apiKey_handler
+            RESTAPI_subtotp_handler
         >(Path, Bindings, L, S,TransactionId);
     }
 
-    Poco::Net::HTTPRequestHandler * RESTAPI_IntRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
-                                                            Poco::Logger & L, RESTAPI_GenericServerAccounting & S, uint64_t 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_oauth2_handler,
-            RESTAPI_user_handler,
             RESTAPI_users_handler,
+            RESTAPI_user_handler,
+            RESTAPI_subuser_handler,
+            RESTAPI_subusers_handler,
             RESTAPI_system_command,
-            RESTAPI_asset_server,
-            RESTAPI_system_endpoints_handler,
             RESTAPI_action_links,
-            RESTAPI_avatar_handler,
-            RESTAPI_subavatar_handler,
-            RESTAPI_email_handler,
+            RESTAPI_validate_token_handler,
+            RESTAPI_validate_sub_token_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,
-            RESTAPI_validate_sub_token_handler,
-            RESTAPI_validate_token_handler,
-            RESTAPI_validate_apikey,
-            RESTAPI_signup_handler
+            RESTAPI_submfa_handler
         >(Path, Bindings, L, S, TransactionId);
     }
 }

src/RESTAPI/RESTAPI_signup_handler.cpp

@@ -1,75 +0,0 @@
-//
-// Created by stephane bourque on 2022-02-20.
-//
-
-#include "RESTAPI_signup_handler.h"
-#include "StorageService.h"
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
-#include "framework/MicroServiceFuncs.h"
-
-#define __DBG__ std::cout << __LINE__ << std::endl;
-namespace OpenWifi {
-
-    void RESTAPI_signup_handler::DoPost() {
-        auto UserName = GetParameter("email");
-        auto signupUUID = GetParameter("signupUUID");
-        auto owner = GetParameter("owner");
-        auto operatorName = GetParameter("operatorName");
-        if(UserName.empty() || signupUUID.empty() || owner.empty() || operatorName.empty()) {
-            Logger().error("Signup requires: email, signupUUID, operatorName, and owner.");
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-
-        if(!Utils::ValidEMailAddress(UserName)) {
-            return BadRequest(RESTAPI::Errors::InvalidEmailAddress);
-        }
-
-        // Do we already exist? Can only signup once...
-        SecurityObjects::UserInfo   Existing;
-        if(StorageService()->SubDB().GetUserByEmail(UserName,Existing)) {
-            if(Existing.signingUp.empty()) {
-                return BadRequest(RESTAPI::Errors::SignupAlreadySigned);
-            }
-
-            if(Existing.waitingForEmailCheck) {
-                return BadRequest(RESTAPI::Errors::SignupEmailCheck);
-            }
-
-            return BadRequest(RESTAPI::Errors::SignupWaitingForDevice);
-        }
-
-        SecurityObjects::UserInfo   NewSub;
-        NewSub.signingUp = operatorName + ":" + signupUUID;
-        NewSub.waitingForEmailCheck = true;
-        NewSub.name = UserName;
-        NewSub.modified = OpenWifi::Now();
-        NewSub.creationDate = OpenWifi::Now();
-        NewSub.id = MicroServiceCreateUUID();
-        NewSub.email = UserName;
-        NewSub.userRole = SecurityObjects::SUBSCRIBER;
-        NewSub.changePassword = true;
-        NewSub.owner = owner;
-
-        StorageService()->SubDB().CreateRecord(NewSub);
-
-        Logger_.information(fmt::format("SIGNUP-PASSWORD({}): Request for {}", Request->clientAddress().toString(), UserName));
-        SecurityObjects::ActionLink NewLink;
-
-        NewLink.action = OpenWifi::SecurityObjects::LinkActions::SUB_SIGNUP;
-        NewLink.id = MicroServiceCreateUUID();
-        NewLink.userId = NewSub.id;
-        NewLink.created = OpenWifi::Now();
-        NewLink.expires = NewLink.created + (1*60*60);  // 1 hour
-        NewLink.userAction = false;
-        StorageService()->ActionLinksDB().CreateAction(NewLink);
-
-        Poco::JSON::Object  Answer;
-        NewSub.to_json(Answer);
-        return ReturnObject(Answer);
-    }
-
-    void RESTAPI_signup_handler::DoPut() {
-        // TODO
-    }
-
-}

src/RESTAPI/RESTAPI_signup_handler.h

@@ -1,39 +0,0 @@
-//
-// Created by stephane bourque on 2022-02-20.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-    class RESTAPI_signup_handler : public RESTAPIHandler {
-    public:
-        RESTAPI_signup_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting & Server, uint64_t TransactionId, bool Internal)
-                : RESTAPIHandler(bindings, L,
-                                 std::vector<std::string>{
-                                         Poco::Net::HTTPRequest::HTTP_POST,
-                                         Poco::Net::HTTPRequest::HTTP_OPTIONS,
-                                         Poco::Net::HTTPRequest::HTTP_PUT},
-                                 Server,
-                                 TransactionId,
-                                 Internal, false, true ){}
-
-        static auto PathName() { return std::list<std::string>{"/api/v1/signup"}; };
-
-/*        inline bool RoleIsAuthorized(std::string & Reason) {
-            if(UserInfo_.userinfo.userRole != SecurityObjects::USER_ROLE::SUBSCRIBER) {
-                Reason = "User must be a subscriber";
-                return false;
-            }
-            return true;
-        }
-*/
-        void DoGet() final {};
-        void DoPost() final;
-        void DoPut() final ;
-        void DoDelete() final {};
-    private:
-
-    };
-}

src/RESTAPI/RESTAPI_sms_handler.cpp

@@ -4,16 +4,13 @@
 
 #include "RESTAPI_sms_handler.h"
 #include "SMSSender.h"
-#include "framework/ow_constants.h"
+#include "framework/RESTAPI_errors.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
     void OpenWifi::RESTAPI_sms_handler::DoPost() {
-        const auto &Obj = ParsedBody_;
-
-        if(!SMSSender()->Enabled()) {
-            return BadRequest(RESTAPI::Errors::SMSMFANotEnabled);
-        }
+        auto Obj = ParseStream();
 
         std::string Arg;
         if(HasParameter("validateNumber",Arg) && Arg=="true" && Obj->has("to")) {
@@ -39,7 +36,7 @@ namespace OpenWifi {
         if( UserInfo_.userinfo.userRole!=SecurityObjects::ROOT &&
             UserInfo_.userinfo.userRole!=SecurityObjects::PARTNER &&
             UserInfo_.userinfo.userRole!=SecurityObjects::ADMIN) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
+            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights,ACCESS_DENIED);
         }
 
         if (Obj->has("to") &&

src/RESTAPI/RESTAPI_sms_handler.h

@@ -4,19 +4,19 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_sms_handler : public RESTAPIHandler {
     public:
-        RESTAPI_sms_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        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 auto PathName() { return std::list<std::string>{"/api/v1/sms"};}
+                                                  static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/sms"};}
         void DoGet() final {};
         void DoPost() final;
         void DoDelete() final {};

src/RESTAPI/RESTAPI_subavatar_handler.cpp

@@ -8,8 +8,8 @@
 #include "RESTAPI_subavatar_handler.h"
 #include "StorageService.h"
 #include "Poco/Net/HTMLForm.h"
-#include "Poco/CountingStream.h"
-#include "framework/MicroServiceFuncs.h"
+#include "framework/RESTAPI_protocol.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
@@ -35,14 +35,13 @@ namespace OpenWifi {
         Poco::Net::HTMLForm form(*Request, Request->stream(), partHandler);
         Poco::JSON::Object Answer;
 
-        if (!partHandler.Name().empty() && partHandler.Length()< MicroServiceConfigGetInt("openwifi.avatar.maxsize",2000000)) {
+        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(fmt::format("Uploaded avatar: {} Type: {}", partHandler.Name(), partHandler.ContentType()));
+            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");
-            Logger().information(fmt::format("Adding avatar for {}",UserInfo_.userinfo.email));
         } else {
             Answer.set(RESTAPI::Protocol::AVATARID, Id);
             Answer.set(RESTAPI::Protocol::ERRORCODE, 13);
@@ -61,7 +60,6 @@ namespace OpenWifi {
         if (!StorageService()->SubAvatarDB().GetAvatar(UserInfo_.userinfo.email, Id, AvatarContent, Type, Name)) {
             return NotFound();
         }
-        Logger().information(fmt::format("Retrieving avatar for {}",UserInfo_.userinfo.email));
         return SendFileContent(AvatarContent, Type, Name);
     }
 
@@ -69,13 +67,12 @@ namespace OpenWifi {
         std::string Id = GetBinding(RESTAPI::Protocol::ID, "");
 
         if(UserInfo_.userinfo.userRole!=SecurityObjects::ROOT && Id!=UserInfo_.userinfo.id) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
+            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
         }
 
         if (!StorageService()->SubAvatarDB().DeleteAvatar(UserInfo_.userinfo.email, Id)) {
             return NotFound();
         }
-        Logger().information(fmt::format("Deleted avatar for {}",UserInfo_.userinfo.email));
         StorageService()->SubDB().SetAvatar(Id,"");
         OK();
     }

src/RESTAPI/RESTAPI_subavatar_handler.h

@@ -3,8 +3,7 @@
 //
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
-#include "Poco/Net/PartHandler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
@@ -27,13 +26,11 @@ namespace OpenWifi {
         std::string     Id_;
         Poco::Logger    &Logger_;
         std::stringstream &OutputStream_;
-
-        inline Poco::Logger & Logger() { return Logger_; }
     };
 
     class RESTAPI_subavatar_handler : public RESTAPIHandler {
     public:
-        RESTAPI_subavatar_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        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,
@@ -43,7 +40,7 @@ namespace OpenWifi {
                                          Server,
                                          TransactionId,
                                          Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/subavatar/{id}"}; };
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/subavatar/{id}"}; };
 
         void DoGet() final;
         void DoPost() final;

src/RESTAPI/RESTAPI_submfa_handler.cpp

@@ -5,13 +5,13 @@
 #include "RESTAPI_submfa_handler.h"
 #include "StorageService.h"
 #include "SMSSender.h"
-#include "framework/MicroServiceFuncs.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;
@@ -37,7 +37,7 @@ namespace OpenWifi {
     void RESTAPI_submfa_handler::DoPut() {
 
         try {
-            const auto & Body = ParsedBody_;
+            auto Body = ParseStream();
 
             SecurityObjects::SubMfaConfig MFC;
 
@@ -65,7 +65,7 @@ namespace OpenWifi {
                 MFC.sms = MFC.sms;
                 MFC.type = "email";
                 MFC.email = UserInfo_.userinfo.email;
-                MFC.id = MicroServiceCreateUUID();
+                MFC.id = MicroService::instance().CreateUUID();
 
                 Poco::JSON::Object Answer;
                 MFC.to_json(Answer);
@@ -74,30 +74,21 @@ namespace OpenWifi {
             } else if (MFC.type == "sms") {
                 if (GetBoolParameter("startValidation", false)) {
                     if (MFC.sms.empty()) {
-                        return BadRequest(RESTAPI::Errors::SMSMissingPhoneNumber);
-                    }
-
-                    if(!SMSSender()->Enabled()) {
-                        return BadRequest(RESTAPI::Errors::SMSMFANotEnabled);
+                        return BadRequest("Missing phone number");
                     }
 
                     if (SMSSender()->StartValidation(MFC.sms, UserInfo_.userinfo.email)) {
                         return OK();
                     } else {
-                        return InternalError(RESTAPI::Errors::SMSTryLater);
+                        return InternalError("SMS could not be sent. Verify the number or try again later.");
                     }
                 } else if (GetBoolParameter("completeValidation", false)) {
-
-                    if(!SMSSender()->Enabled()) {
-                        return BadRequest(RESTAPI::Errors::SMSMFANotEnabled);
-                    }
-
                     auto ChallengeCode = GetParameter("challengeCode", "");
                     if (ChallengeCode.empty()) {
-                        return BadRequest(RESTAPI::Errors::SMSMissingChallenge);
+                        return BadRequest("Missing 'challengeCode'");
                     }
                     if (MFC.sms.empty()) {
-                        return BadRequest(RESTAPI::Errors::SMSMissingPhoneNumber);
+                        return BadRequest("Missing phone number");
                     }
                     if (SMSSender()->CompleteValidation(MFC.sms, ChallengeCode, UserInfo_.userinfo.email)) {
                         SecurityObjects::UserInfo User;
@@ -117,7 +108,7 @@ namespace OpenWifi {
                         MFC.sms = MFC.sms;
                         MFC.type = "sms";
                         MFC.email = UserInfo_.userinfo.email;
-                        MFC.id = MicroServiceCreateUUID();
+                        MFC.id = MicroService::instance().CreateUUID();
 
                         Poco::JSON::Object Answer;
                         MFC.to_json(Answer);
@@ -125,7 +116,7 @@ namespace OpenWifi {
                         return ReturnObject(Answer);
 
                     } else {
-                        return InternalError(RESTAPI::Errors::SMSTryLater);
+                        return InternalError("SMS could not be sent. Verify the number or try again later.");
                     }
                 }
             }

src/RESTAPI/RESTAPI_submfa_handler.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_submfa_handler : public RESTAPIHandler {
     public:
-        RESTAPI_submfa_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        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,
@@ -18,7 +18,7 @@ namespace OpenWifi {
                                                   TransactionId,
                                                   Internal, true, false , RateLimit{.Interval=1000,.MaxCalls=10},
                                                   true) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/submfa"}; };
+                                                  static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/submfa"}; };
         void DoGet() final;
         void DoPost() final {};
         void DoDelete() final {};

src/RESTAPI/RESTAPI_suboauth2_handler.cpp

@@ -5,6 +5,8 @@
 #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"
 
@@ -14,12 +16,12 @@ namespace OpenWifi {
         bool Expired = false, Contacted = false;
         if (!IsAuthorized(Expired, Contacted, true)) {
             if(Expired)
-                return UnAuthorized(RESTAPI::Errors::EXPIRED_TOKEN);
-            return UnAuthorized(RESTAPI::Errors::INVALID_TOKEN);
+                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(fmt::format("REQUEST-ME({}): Request for {}", Request->clientAddress().toString(),
+            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;
@@ -31,46 +33,33 @@ namespace OpenWifi {
     }
 
     void RESTAPI_suboauth2_handler::DoDelete() {
-        auto Token = GetBinding(RESTAPI::Protocol::TOKEN, "");
-        std::string SessionToken;
-        try {
-            Poco::Net::OAuth20Credentials Auth(*Request);
-            if (Auth.getScheme() == "Bearer") {
-                SessionToken = Auth.getBearerToken();
-            }
-        } catch (const Poco::Exception &E) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-        }
-        if (Token.empty() || (Token != SessionToken)) {
-            return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
+        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() {
-        const auto & Obj = ParsedBody_;
+        auto Obj = ParseStream();
         auto userId = GetS(RESTAPI::Protocol::USERID, Obj);
         auto password = GetS(RESTAPI::Protocol::PASSWORD, Obj);
         auto newPassword = GetS(RESTAPI::Protocol::NEWPASSWORD, Obj);
-        auto refreshToken = GetS("refreshToken", Obj);
-        auto grant_type = GetParameter("grant_type");
 
         Poco::toLowerInPlace(userId);
 
-        if(!refreshToken.empty() && grant_type == "refresh_token") {
-            SecurityObjects::UserInfoAndPolicy UInfo;
-            if(AuthService()->RefreshSubToken(*Request, refreshToken, UInfo)) {
-                Poco::JSON::Object  Answer;
-                UInfo.webtoken.to_json(Answer);
-                return ReturnObject(Answer);
-            } else {
-                return UnAuthorized(RESTAPI::Errors::CANNOT_REFRESH_TOKEN);
-            }
-        }
-
-        if(GetBoolParameter(RESTAPI::Protocol::REQUIREMENTS)) {
-            Logger_.information(fmt::format("POLICY-REQUEST({}): Request.", Request->clientAddress().toString()));
+        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());
@@ -78,17 +67,17 @@ namespace OpenWifi {
             return ReturnObject(Answer);
         }
 
-        if(GetBoolParameter(RESTAPI::Protocol::FORGOTPASSWORD)) {
+        if(GetBoolParameter(RESTAPI::Protocol::FORGOTPASSWORD,false)) {
             SecurityObjects::UserInfo UInfo1;
             auto UserExists = StorageService()->SubDB().GetUserByEmail(userId,UInfo1);
             if(UserExists) {
-                Logger_.information(fmt::format("FORGOTTEN-PASSWORD({}): Request for {}", Request->clientAddress().toString(), userId));
+                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 = MicroServiceCreateUUID();
+                NewLink.id = MicroService::CreateUUID();
                 NewLink.userId = UInfo1.id;
-                NewLink.created = OpenWifi::Now();
+                NewLink.created = std::time(nullptr);
                 NewLink.expires = NewLink.created + (24*60*60);
                 NewLink.userAction = false;
                 StorageService()->ActionLinksDB().CreateAction(NewLink);
@@ -107,18 +96,18 @@ namespace OpenWifi {
             }
         }
 
-        if(GetBoolParameter(RESTAPI::Protocol::RESENDMFACODE)) {
-            Logger_.information(fmt::format("RESEND-MFA-CODE({}): Request for {}", Request->clientAddress().toString(), userId));
+        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::BAD_MFA_TRANSACTION);
+            return UnAuthorized(RESTAPI::Errors::InvalidCredentials, BAD_MFA_TRANSACTION);
         }
 
-        if(GetBoolParameter(RESTAPI::Protocol::COMPLETEMFACHALLENGE)) {
-            Logger_.information(fmt::format("COMPLETE-MFA-CHALLENGE({}): Request for {}", Request->clientAddress().toString(), userId));
+        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)) {
@@ -127,7 +116,7 @@ namespace OpenWifi {
                     return ReturnObject(ReturnObj);
                 }
             }
-            return UnAuthorized(RESTAPI::Errors::MFA_FAILURE);
+            return UnAuthorized(RESTAPI::Errors::InvalidCredentials, MFA_FAILURE);
         }
 
         SecurityObjects::UserInfoAndPolicy UInfo;
@@ -146,17 +135,17 @@ namespace OpenWifi {
         } else {
             switch(Code) {
                 case INVALID_CREDENTIALS:
-                    return UnAuthorized(RESTAPI::Errors::INVALID_CREDENTIALS);
+                    return UnAuthorized(RESTAPI::Errors::InvalidCredentials, Code);
                 case PASSWORD_INVALID:
-                    return UnAuthorized(RESTAPI::Errors::PASSWORD_INVALID);
+                    return UnAuthorized(RESTAPI::Errors::InvalidPassword, Code);
                 case PASSWORD_ALREADY_USED:
-                    return UnAuthorized(RESTAPI::Errors::PASSWORD_ALREADY_USED);
+                    return UnAuthorized(RESTAPI::Errors::PasswordRejected, Code);
                 case USERNAME_PENDING_VERIFICATION:
-                    return UnAuthorized(RESTAPI::Errors::USERNAME_PENDING_VERIFICATION);
+                    return UnAuthorized(RESTAPI::Errors::UserPendingVerification, Code);
                 case PASSWORD_CHANGE_REQUIRED:
-                    return UnAuthorized(RESTAPI::Errors::PASSWORD_CHANGE_REQUIRED);
+                    return UnAuthorized(RESTAPI::Errors::PasswordMustBeChanged, Code);
                 default:
-                    return UnAuthorized(RESTAPI::Errors::INVALID_CREDENTIALS); break;
+                    return UnAuthorized(RESTAPI::Errors::InvalidCredentials); break;
             }
             return;
         }

src/RESTAPI/RESTAPI_suboauth2_handler.h

@@ -3,12 +3,12 @@
 //
 
 #pragma once
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_suboauth2_handler : public RESTAPIHandler {
     public:
-        RESTAPI_suboauth2_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        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,
@@ -18,7 +18,7 @@ namespace OpenWifi {
                                                   TransactionId,
                                                   Internal, false, false , RateLimit{.Interval=1000,.MaxCalls=10},
                                                   false) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/suboauth2/{token}","/api/v1/suboauth2"}; };
+                                                  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;

src/RESTAPI/RESTAPI_subpreferences.cpp

@@ -19,13 +19,13 @@ namespace OpenWifi {
 
         SecurityObjects::Preferences    P;
 
-        const auto & RawObject = ParsedBody_;
+        auto RawObject = ParseStream();
         if(!P.from_json(RawObject)) {
             return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
         }
 
         P.id = UserInfo_.userinfo.id;
-        P.modified = OpenWifi::Now();
+        P.modified = std::time(nullptr);
         StorageService()->SubPreferencesDB().SetPreferences(P);
 
         Poco::JSON::Object  Answer;

src/RESTAPI/RESTAPI_subpreferences.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_subpreferences : public RESTAPIHandler {
     public:
-        RESTAPI_subpreferences(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        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,
@@ -18,7 +18,7 @@ namespace OpenWifi {
             Server,
             TransactionId,
             Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/subpreferences"}; };
+            static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/subpreferences"}; };
         void DoGet() final;
         void DoPut() final;
         void DoPost() final {};

src/RESTAPI/RESTAPI_subtotp_handler.cpp

@@ -5,7 +5,6 @@
 #include "RESTAPI_subtotp_handler.h"
 
 #include "TotpCache.h"
-#include "framework/MicroServiceFuncs.h"
 
 namespace OpenWifi {
 
@@ -25,14 +24,15 @@ namespace OpenWifi {
         auto nextIndex = GetParameter("index",0);
         bool moreCodes=false;
 
-        RESTAPI::Errors::msg    Error;
-        if(TotpCache()->ContinueValidation(UserInfo_.userinfo,true,Value,nextIndex,moreCodes, Error )) {
+        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(Error);
+        return BadRequest(ErrorCode, ErrorText);
     }
 
 }

src/RESTAPI/RESTAPI_subtotp_handler.h

@@ -2,12 +2,12 @@
 // Created by stephane bourque on 2022-01-31.
 //
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_subtotp_handler : public RESTAPIHandler {
     public:
-        RESTAPI_subtotp_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        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>
                                          {
@@ -18,7 +18,7 @@ namespace OpenWifi {
                                  Server,
                                  TransactionId,
                                  Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/subtotp"}; };
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/subtotp"}; };
         void DoGet() final;
         void DoPost() final {};
         void DoDelete() final {};

src/RESTAPI/RESTAPI_subuser_handler.cpp

@@ -4,17 +4,14 @@
 
 #include "RESTAPI_subuser_handler.h"
 #include "StorageService.h"
-#include "framework/ow_constants.h"
+#include "framework/RESTAPI_errors.h"
 #include "SMSSender.h"
-#include "SMTPMailerService.h"
 #include "ACLProcessor.h"
 #include "AuthService.h"
 #include "RESTAPI/RESTAPI_db_helpers.h"
 #include "MFAServer.h"
 #include "TotpCache.h"
 
-#include "framework/MicroServiceFuncs.h"
-
 namespace OpenWifi {
 
     void RESTAPI_subuser_handler::DoGet() {
@@ -55,8 +52,8 @@ namespace OpenWifi {
             return BadRequest(RESTAPI::Errors::InvalidUserRole);
         }
 
-        if(!Internal_ && !ACLProcessor::Can(UserInfo_.userinfo, TargetUser,ACLProcessor::DELETE)) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
+        if(!ACLProcessor::Can(UserInfo_.userinfo, TargetUser,ACLProcessor::DELETE)) {
+            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
         }
 
         if(!StorageService()->SubDB().DeleteUser(UserInfo_.userinfo.email,Id)) {
@@ -67,7 +64,7 @@ namespace OpenWifi {
         StorageService()->SubTokenDB().RevokeAllTokens(TargetUser.email);
         StorageService()->SubPreferencesDB().DeleteRecord("id", Id);
         StorageService()->SubAvatarDB().DeleteRecord("id", Id);
-        Logger_.information(fmt::format("User '{}' deleted by '{}'.",Id,UserInfo_.userinfo.email));
+        Logger_.information(Poco::format("User '%s' deleted by '%s'.",Id,UserInfo_.userinfo.email));
         OK();
     }
 
@@ -78,23 +75,13 @@ namespace OpenWifi {
         }
 
         SecurityObjects::UserInfo   NewUser;
-        const auto & RawObject = ParsedBody_;
-        if(!NewUser.from_json(RawObject)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
+        RESTAPI_utils::from_request(NewUser,*Request);
         if(NewUser.userRole == SecurityObjects::UNKNOWN || NewUser.userRole != SecurityObjects::SUBSCRIBER) {
-            return BadRequest(RESTAPI::Errors::InvalidUserRole);
+            return BadRequest(RESTAPI::Errors::EntityMustExist);
         }
 
-        Poco::toLowerInPlace(NewUser.email);
-        SecurityObjects::UserInfo   Existing;
-        if(StorageService()->SubDB().GetUserByEmail(NewUser.email,Existing)) {
-            return BadRequest(RESTAPI::Errors::UserAlreadyExists);
-        }
-
-        if(!Internal_ && !ACLProcessor::Can(UserInfo_.userinfo,NewUser,ACLProcessor::CREATE)) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
+        if(!ACLProcessor::Can(UserInfo_.userinfo,NewUser,ACLProcessor::CREATE)) {
+            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
         }
 
         Poco::toLowerInPlace(NewUser.email);
@@ -117,19 +104,19 @@ namespace OpenWifi {
         NewUser.userTypeProprietaryInfo.mobiles.clear();
         NewUser.userTypeProprietaryInfo.authenticatorSecret.clear();
 
-        if(!StorageService()->SubDB().CreateUser(UserInfo_.userinfo.email, NewUser)) {
-            Logger_.information(fmt::format("Could not add user '{}'.",NewUser.email));
+        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(fmt::format("Verification e-mail requested for {}",NewUser.email));
+                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(fmt::format("User '{}' but not retrieved.",NewUser.email));
+            Logger_.information(Poco::format("User '%s' but not retrieved.",NewUser.email));
             return NotFound();
         }
 
@@ -137,7 +124,7 @@ namespace OpenWifi {
         Sanitize(UserInfo_, NewUser);
         NewUser.to_json(UserInfoObject);
         ReturnObject(UserInfoObject);
-        Logger_.information(fmt::format("User '{}' has been added by '{}')",NewUser.email, UserInfo_.userinfo.email));
+        Logger_.information(Poco::format("User '%s' has been added by '%s')",NewUser.email, UserInfo_.userinfo.email));
     }
 
     void RESTAPI_subuser_handler::DoPut() {
@@ -151,52 +138,12 @@ namespace OpenWifi {
             return NotFound();
         }
 
-        if(!Internal_ && !ACLProcessor::Can(UserInfo_.userinfo,Existing,ACLProcessor::MODIFY)) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        if(GetBoolParameter("resetMFA")) {
-            if( (UserInfo_.userinfo.userRole == SecurityObjects::ROOT) ||
-                (UserInfo_.userinfo.userRole == SecurityObjects::ADMIN && Existing.userRole!=SecurityObjects::ROOT) ||
-                (UserInfo_.userinfo.id == Id)) {
-                Existing.userTypeProprietaryInfo.mfa.enabled = false;
-                Existing.userTypeProprietaryInfo.mfa.method.clear();
-                Existing.userTypeProprietaryInfo.mobiles.clear();
-                Existing.modified = OpenWifi::Now();
-                Existing.notes.push_back( SecurityObjects::NoteInfo{
-                        .created=OpenWifi::Now(),
-                        .createdBy=UserInfo_.userinfo.email,
-                        .note="MFA Reset by " + UserInfo_.userinfo.email});
-                StorageService()->SubDB().UpdateUserInfo(UserInfo_.userinfo.email,Id,Existing);
-                SecurityObjects::UserInfo   NewUserInfo;
-                StorageService()->SubDB().GetUserByEmail(UserInfo_.userinfo.email,NewUserInfo);
-                Poco::JSON::Object  ModifiedObject;
-                Sanitize(UserInfo_, NewUserInfo);
-                NewUserInfo.to_json(ModifiedObject);
-                return ReturnObject(ModifiedObject);
-            } else {
-                return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-            }
-        }
-
-        if(GetBoolParameter("forgotPassword")) {
-            Existing.changePassword = true;
-            Logger_.information(fmt::format("FORGOTTEN-PASSWORD({}): Request for {}", Request->clientAddress().toString(), Existing.email));
-
-            SecurityObjects::ActionLink NewLink;
-            NewLink.action = OpenWifi::SecurityObjects::LinkActions::SUB_FORGOT_PASSWORD;
-            NewLink.id = MicroServiceCreateUUID();
-            NewLink.userId = Existing.id;
-            NewLink.created = OpenWifi::Now();
-            NewLink.expires = NewLink.created + (24*60*60);
-            NewLink.userAction = false;
-            StorageService()->ActionLinksDB().CreateAction(NewLink);
-
-            return OK();
+        if(!ACLProcessor::Can(UserInfo_.userinfo,Existing,ACLProcessor::MODIFY)) {
+            return UnAuthorized("Insufficient access rights.", ACCESS_DENIED);
         }
 
         SecurityObjects::UserInfo   NewUser;
-        const auto & RawObject = ParsedBody_;
+        auto RawObject = ParseStream();
         if(!NewUser.from_json(RawObject)) {
             return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
         }
@@ -222,10 +169,10 @@ namespace OpenWifi {
             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::ACCESS_DENIED);
+                    return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
                 }
                 if(Id==UserInfo_.userinfo.id) {
-                    return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
+                    return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
                 }
                 Existing.userRole = NewRole;
             }
@@ -235,7 +182,7 @@ namespace OpenWifi {
             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)OpenWifi::Now(), .createdBy=UserInfo_.userinfo.email, .note=i.note};
+                SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UserInfo_.userinfo.email, .note=i.note};
                 Existing.notes.push_back(ii);
             }
         }
@@ -250,7 +197,7 @@ namespace OpenWifi {
 
         if(GetParameter("email_verification","false")=="true") {
             if(AuthService::VerifySubEmail(Existing))
-                Logger_.information(fmt::format("Verification e-mail requested for {}",Existing.email));
+                Logger_.information(Poco::format("Verification e-mail requested for %s",Existing.email));
         }
 
         if(RawObject->has("userTypeProprietaryInfo")) {
@@ -259,32 +206,23 @@ namespace OpenWifi {
                     return BadRequest(RESTAPI::Errors::BadMFAMethod);
                 }
 
-                if( NewUser.userTypeProprietaryInfo.mfa.enabled &&
-                    NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::SMS &&
-                    !SMSSender()->Enabled()) {
-                    return BadRequest(RESTAPI::Errors::SMSMFANotEnabled);
-                }
+                bool ChangingMFA =
+                        NewUser.userTypeProprietaryInfo.mfa.enabled && !Existing.userTypeProprietaryInfo.mfa.enabled;
+                Existing.userTypeProprietaryInfo.mfa.enabled = NewUser.userTypeProprietaryInfo.mfa.enabled;
 
-                if( NewUser.userTypeProprietaryInfo.mfa.enabled &&
-                    NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::EMAIL &&
-                    !SMTPMailerService()->Enabled()) {
-                    return BadRequest(RESTAPI::Errors::EMailMFANotEnabled);
-                }
-
-                Existing.userTypeProprietaryInfo.mfa.method = NewUser.userTypeProprietaryInfo.mfa.method;
-                Existing.userTypeProprietaryInfo.mfa.enabled = true;
-
-                if (NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::SMS) {
-                    if(NewUser.userTypeProprietaryInfo.mobiles.empty()) {
-                        return BadRequest(RESTAPI::Errors::NeedMobileNumber);
-                    }
-                    if (!SMSSender()->IsNumberValid(NewUser.userTypeProprietaryInfo.mobiles[0].number,UserInfo_.userinfo.email)) {
-                        return BadRequest(RESTAPI::Errors::NeedMobileNumber);
-                    }
+                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;
-                    Existing.userTypeProprietaryInfo.mobiles[0].verified = true;
+                    }
+                    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 (NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::AUTHENTICATOR) {
+                } 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)) {
@@ -294,10 +232,13 @@ namespace OpenWifi {
                     } else {
                         return BadRequest(RESTAPI::Errors::AuthenticatorVerificationIncomplete);
                     }
-                } else if (NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::EMAIL) {
+                } 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();

src/RESTAPI/RESTAPI_subuser_handler.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_subuser_handler : public RESTAPIHandler {
     public:
-        RESTAPI_subuser_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        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,
@@ -20,7 +20,7 @@ namespace OpenWifi {
                           Server,
                           TransactionId,
                           Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/subuser/{id}"}; };
+                          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;

src/RESTAPI/RESTAPI_subusers_handler.cpp

@@ -4,76 +4,52 @@
 
 #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() {
-        bool IdOnly = GetBoolParameter("idOnly");
-        auto operatorId = GetParameter("operatorId");
-        auto nameSearch = GetParameter("nameSearch");
-        auto emailSearch = GetParameter("emailSearch");
+        std::vector<SecurityObjects::UserInfo> Users;
+        bool IdOnly = (GetParameter("idOnly","false")=="true");
 
-        std::string baseQuery;
-        if(!nameSearch.empty() || !emailSearch.empty()) {
-            if(!nameSearch.empty())
-                baseQuery = fmt::format(" Lower(name) like('%{}%') ", Poco::toLower(nameSearch) );
-            if(!emailSearch.empty())
-                baseQuery += baseQuery.empty() ? fmt::format(" Lower(email) like('%{}%') ", Poco::toLower(emailSearch))
-                : fmt::format(" and Lower(email) like('%{}%') ", Poco::toLower(emailSearch));
-        }
-
-        if(QB_.CountOnly) {
-            std::string whereClause;
-            if(!operatorId.empty()) {
-                whereClause = baseQuery.empty() ? fmt::format(" owner='{}' ", operatorId) :
-                              fmt::format(" owner='{}' and {} ", operatorId, baseQuery);
-                auto count = StorageService()->SubDB().Count(whereClause);
-                return ReturnCountOnly(count);
-            }
-            auto count = StorageService()->UserDB().Count();
-            return ReturnCountOnly(count);
-        } else if(QB_.Select.empty()) {
-            std::string whereClause;
-            if(!operatorId.empty()) {
-                whereClause = baseQuery.empty() ? fmt::format(" owner='{}' ", operatorId) :
-                              fmt::format(" owner='{}' and {} ", operatorId, baseQuery);
-            }
-
-            SecurityObjects::UserInfoList   Users;
-            if (StorageService()->SubDB().GetUsers(QB_.Offset, QB_.Limit, Users.users, whereClause)) {
-                for (auto &i : Users.users) {
+        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);
                     }
                 }
-
-            if(IdOnly) {
-                Poco::JSON::Array   Arr;
-                Poco::JSON::Object  Answer;
-
-                for(const auto &i:Users.users) {
-                    Arr.add(i.id);
+                Answer.set(RESTAPI::Protocol::USERS, ArrayObj);
             }
-                Answer.set("users",Arr);
-                return ReturnObject(Answer);
-            }
-
-            Poco::JSON::Object  Answer;
-            Users.to_json(Answer);
             return ReturnObject(Answer);
         } else {
-            SecurityObjects::UserInfoList   Users;
+            Poco::JSON::Array ArrayObj;
             for(auto &i:SelectedRecords()) {
                 SecurityObjects::UserInfo   UInfo;
-                if(StorageService()->SubDB().GetUserById(i,UInfo)) {
+                auto tI{i};
+                if(StorageService()->SubDB().GetUserById(tI,UInfo)) {
                     Poco::JSON::Object Obj;
+                    if (IdOnly) {
+                        ArrayObj.add(UInfo.id);
+                    } else {
                         Sanitize(UserInfo_, UInfo);
-                    Users.users.emplace_back(UInfo);
+                        UInfo.to_json(Obj);
+                        ArrayObj.add(Obj);
                     }
                 }
-            Poco::JSON::Object Answer;
-            Users.to_json(Answer);
-            return ReturnObject(Answer);
+            }
+            Poco::JSON::Object RetObj;
+            RetObj.set(RESTAPI::Protocol::USERS, ArrayObj);
+            return ReturnObject(RetObj);
         }
     }
 }

src/RESTAPI/RESTAPI_subusers_handler.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_subusers_handler : public RESTAPIHandler {
     public:
-        RESTAPI_subusers_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        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,
@@ -17,7 +17,7 @@ namespace OpenWifi {
                           Server,
                           TransactionId,
                           Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/subusers"}; };
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/subusers"}; };
         void DoGet() final;
         void DoPost() final {};
         void DoDelete() final {};

src/RESTAPI/RESTAPI_system_endpoints_handler.cpp

@@ -4,12 +4,11 @@
 
 #include "RESTAPI_system_endpoints_handler.h"
 #include "RESTObjects/RESTAPI_SecurityObjects.h"
-#include "framework/MicroServiceFuncs.h"
 
 namespace OpenWifi {
 
     void RESTAPI_system_endpoints_handler::DoGet() {
-        auto Services = MicroServiceGetServices();
+        auto Services = MicroService::instance().GetServices();
         SecurityObjects::SystemEndpointList L;
         for(const auto &i:Services) {
             SecurityObjects::SystemEndpoint S{

src/RESTAPI/RESTAPI_system_endpoints_handler.h

@@ -4,19 +4,19 @@
 
 #pragma once
 
-#include "../framework/RESTAPI_Handler.h"
+#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_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        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 auto PathName() { return std::list<std::string>{"/api/v1/systemEndpoints"}; };
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/systemEndpoints"}; };
         void DoGet() final;
         void DoPost() final {};
         void DoDelete() final {};

src/RESTAPI/RESTAPI_totp_handler.cpp

@@ -11,6 +11,7 @@ namespace OpenWifi {
 
         auto Reset = GetBoolParameter("reset",false);
         std::string QRCode;
+
         if(TotpCache()->StartValidation(UserInfo_.userinfo,false,QRCode,Reset)) {
             return SendFileContent(QRCode, "image/svg+xml","qrcode.svg");
         }
@@ -22,14 +23,15 @@ namespace OpenWifi {
         auto nextIndex = GetParameter("index",0);
         bool moreCodes=false;
 
-        RESTAPI::Errors::msg Err;
-        if(TotpCache()->ContinueValidation(UserInfo_.userinfo,false,Value,nextIndex,moreCodes, Err)) {
+        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(Err);
+        return BadRequest(ErrorCode, ErrorText);
     }
 
 }

src/RESTAPI/RESTAPI_totp_handler.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_totp_handler : public RESTAPIHandler {
     public:
-        RESTAPI_totp_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        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>
                                          {
@@ -20,7 +20,7 @@ namespace OpenWifi {
                                  Server,
                                  TransactionId,
                                  Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/totp"}; };
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/totp"}; };
         void DoGet() final;
         void DoPost() final {};
         void DoDelete() final {};

src/RESTAPI/RESTAPI_user_handler.cpp

@@ -4,15 +4,13 @@
 
 #include "RESTAPI_user_handler.h"
 #include "StorageService.h"
-#include "framework/ow_constants.h"
+#include "framework/RESTAPI_errors.h"
 #include "SMSSender.h"
-#include "SMTPMailerService.h"
 #include "ACLProcessor.h"
 #include "AuthService.h"
 #include "RESTAPI/RESTAPI_db_helpers.h"
 #include "MFAServer.h"
 #include "TotpCache.h"
-#include "framework/MicroServiceFuncs.h"
 
 namespace OpenWifi {
 
@@ -34,7 +32,7 @@ namespace OpenWifi {
         }
 
         if(!ACLProcessor::Can(UserInfo_.userinfo, UInfo,ACLProcessor::READ)) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
+            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
         }
 
         Poco::JSON::Object  UserInfoObject;
@@ -55,7 +53,7 @@ namespace OpenWifi {
         }
 
         if(!ACLProcessor::Can(UserInfo_.userinfo, UInfo,ACLProcessor::DELETE)) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
+            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
         }
 
         if(!StorageService()->UserDB().DeleteUser(UserInfo_.userinfo.email,Id)) {
@@ -66,24 +64,18 @@ namespace OpenWifi {
         StorageService()->AvatarDB().DeleteAvatar(UserInfo_.userinfo.email,Id);
         StorageService()->PreferencesDB().DeletePreferences(UserInfo_.userinfo.email,Id);
         StorageService()->UserTokenDB().RevokeAllTokens(Id);
-        StorageService()->ApiKeyDB().RemoveAllApiKeys(Id);
-        Logger_.information(fmt::format("User '{}' deleted by '{}'.",Id,UserInfo_.userinfo.email));
+        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;
-        const auto & RawObject = ParsedBody_;
-        if(!NewUser.from_json(RawObject)) {
-            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-        }
-
+        RESTAPI_utils::from_request(NewUser,*Request);
         if(NewUser.userRole == SecurityObjects::UNKNOWN) {
             return BadRequest(RESTAPI::Errors::InvalidUserRole);
         }
@@ -95,7 +87,7 @@ namespace OpenWifi {
         }
 
         if(!ACLProcessor::Can(UserInfo_.userinfo,NewUser,ACLProcessor::CREATE)) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
+            return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
         }
 
         Poco::toLowerInPlace(NewUser.email);
@@ -103,11 +95,6 @@ namespace OpenWifi {
             return BadRequest(RESTAPI::Errors::InvalidEmailAddress);
         }
 
-        SecurityObjects::UserInfo   Existing;
-        if(StorageService()->SubDB().GetUserByEmail(NewUser.email,Existing)) {
-            return BadRequest(RESTAPI::Errors::UserAlreadyExists);
-        }
-
         if(!NewUser.currentPassword.empty()) {
             if(!AuthService()->ValidatePassword(NewUser.currentPassword)) {
                 return BadRequest(RESTAPI::Errors::InvalidPassword);
@@ -122,21 +109,20 @@ namespace OpenWifi {
         NewUser.userTypeProprietaryInfo.mfa.method = "";
         NewUser.userTypeProprietaryInfo.mobiles.clear();
         NewUser.userTypeProprietaryInfo.authenticatorSecret.clear();
-        NewUser.validated = true;
 
         if(!StorageService()->UserDB().CreateUser(NewUser.email,NewUser)) {
-            Logger_.information(fmt::format("Could not add user '{}'.",NewUser.email));
+            Logger_.information(Poco::format("Could not add user '%s'.",NewUser.email));
             return BadRequest(RESTAPI::Errors::RecordNotCreated);
         }
 
-        if(GetBoolParameter("email_verification")) {
+        if(GetParameter("email_verification","false")=="true") {
             if(AuthService::VerifyEmail(NewUser))
-                Logger_.information(fmt::format("Verification e-mail requested for {}",NewUser.email));
+                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(fmt::format("User '{}' but not retrieved.",NewUser.email));
+            Logger_.information(Poco::format("User '%s' but not retrieved.",NewUser.email));
             return NotFound();
         }
 
@@ -144,11 +130,10 @@ namespace OpenWifi {
         Sanitize(UserInfo_, NewUser);
         NewUser.to_json(UserInfoObject);
         ReturnObject(UserInfoObject);
-        Logger_.information(fmt::format("User '{}' has been added by '{}')",NewUser.email, UserInfo_.userinfo.email));
+        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);
@@ -160,50 +145,11 @@ namespace OpenWifi {
         }
 
         if(!ACLProcessor::Can(UserInfo_.userinfo,Existing,ACLProcessor::MODIFY)) {
-            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-        }
-
-        if(GetBoolParameter("resetMFA")) {
-            if( (UserInfo_.userinfo.userRole == SecurityObjects::ROOT) ||
-                (UserInfo_.userinfo.userRole == SecurityObjects::ADMIN && Existing.userRole!=SecurityObjects::ROOT) ||
-                (UserInfo_.userinfo.id == Id)) {
-                Existing.userTypeProprietaryInfo.mfa.enabled = false;
-                Existing.userTypeProprietaryInfo.mfa.method.clear();
-                Existing.userTypeProprietaryInfo.mobiles.clear();
-                Existing.modified = OpenWifi::Now();
-                Existing.notes.push_back( SecurityObjects::NoteInfo{
-                            .created=OpenWifi::Now(),
-                            .createdBy=UserInfo_.userinfo.email,
-                            .note="MFA Reset by " + UserInfo_.userinfo.email});
-                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);
-            } else {
-                return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-            }
-        }
-
-        if(GetBoolParameter("forgotPassword")) {
-            Existing.changePassword = true;
-            Logger_.information(fmt::format("FORGOTTEN-PASSWORD({}): Request for {}", Request->clientAddress().toString(), Existing.email));
-            SecurityObjects::ActionLink NewLink;
-
-            NewLink.action = OpenWifi::SecurityObjects::LinkActions::FORGOT_PASSWORD;
-            NewLink.id = MicroServiceCreateUUID();
-            NewLink.userId = Existing.id;
-            NewLink.created = OpenWifi::Now();
-            NewLink.expires = NewLink.created + (24*60*60);
-            NewLink.userAction = true;
-            StorageService()->ActionLinksDB().CreateAction(NewLink);
-            return OK();
+            return UnAuthorized("Insufficient access rights.", ACCESS_DENIED);
         }
 
         SecurityObjects::UserInfo   NewUser;
-        const auto & RawObject = ParsedBody_;
+        auto RawObject = ParseStream();
         if(!NewUser.from_json(RawObject)) {
             return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
         }
@@ -232,10 +178,10 @@ namespace OpenWifi {
             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::ACCESS_DENIED);
+                    return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
                 }
                 if(Id==UserInfo_.userinfo.id) {
-                    return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
+                    return UnAuthorized(RESTAPI::Errors::InsufficientAccessRights, ACCESS_DENIED);
                 }
                 Existing.userRole = NewRole;
             }
@@ -245,7 +191,7 @@ namespace OpenWifi {
             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)OpenWifi::Now(), .createdBy=UserInfo_.userinfo.email, .note=i.note};
+                SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UserInfo_.userinfo.email, .note=i.note};
                 Existing.notes.push_back(ii);
             }
         }
@@ -258,9 +204,9 @@ namespace OpenWifi {
             }
         }
 
-        if(GetBoolParameter("email_verification")) {
+        if(GetParameter("email_verification","false")=="true") {
             if(AuthService::VerifyEmail(Existing))
-                Logger_.information(fmt::format("Verification e-mail requested for {}",Existing.email));
+                Logger_.information(Poco::format("Verification e-mail requested for %s",Existing.email));
         }
 
         if(RawObject->has("userTypeProprietaryInfo")) {
@@ -269,32 +215,23 @@ namespace OpenWifi {
                     return BadRequest(RESTAPI::Errors::BadMFAMethod);
                 }
 
-                if( NewUser.userTypeProprietaryInfo.mfa.enabled &&
-                    NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::SMS &&
-                    !SMSSender()->Enabled()) {
-                    return BadRequest(RESTAPI::Errors::SMSMFANotEnabled);
-                }
+                bool ChangingMFA =
+                        NewUser.userTypeProprietaryInfo.mfa.enabled && !Existing.userTypeProprietaryInfo.mfa.enabled;
+                Existing.userTypeProprietaryInfo.mfa.enabled = NewUser.userTypeProprietaryInfo.mfa.enabled;
 
-                if( NewUser.userTypeProprietaryInfo.mfa.enabled &&
-                    NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::EMAIL &&
-                    !SMTPMailerService()->Enabled()) {
-                    return BadRequest(RESTAPI::Errors::EMailMFANotEnabled);
-                }
-
-                Existing.userTypeProprietaryInfo.mfa.method = NewUser.userTypeProprietaryInfo.mfa.method;
-                Existing.userTypeProprietaryInfo.mfa.enabled = true;
-
-                if (NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::SMS) {
-                    if(NewUser.userTypeProprietaryInfo.mobiles.empty()) {
-                        return BadRequest(RESTAPI::Errors::NeedMobileNumber);
-                    }
-                    if (!SMSSender()->IsNumberValid(NewUser.userTypeProprietaryInfo.mobiles[0].number,UserInfo_.userinfo.email)) {
-                        return BadRequest(RESTAPI::Errors::NeedMobileNumber);
-                    }
+                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;
-                    Existing.userTypeProprietaryInfo.mobiles[0].verified = true;
+                    }
+                    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 (NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::AUTHENTICATOR) {
+                } 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)) {
@@ -304,10 +241,13 @@ namespace OpenWifi {
                     } else {
                         return BadRequest(RESTAPI::Errors::AuthenticatorVerificationIncomplete);
                     }
-                } else if (NewUser.userTypeProprietaryInfo.mfa.method == MFAMETHODS::EMAIL) {
+                } 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();
@@ -315,7 +255,6 @@ namespace OpenWifi {
             }
         }
 
-        Existing.modified = OpenWifi::Now();
         if(StorageService()->UserDB().UpdateUserInfo(UserInfo_.userinfo.email,Id,Existing)) {
             SecurityObjects::UserInfo   NewUserInfo;
             StorageService()->UserDB().GetUserByEmail(UserInfo_.userinfo.email,NewUserInfo);

src/RESTAPI/RESTAPI_user_handler.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_user_handler : public RESTAPIHandler {
     public:
-        RESTAPI_user_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        RESTAPI_user_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,
@@ -20,7 +20,7 @@ namespace OpenWifi {
                                           Server,
                                           TransactionId,
                                           Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/user/{id}"}; };
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/user/{id}"}; };
         void DoGet() final;
         void DoPost() final;
         void DoDelete() final;

src/RESTAPI/RESTAPI_users_handler.cpp

@@ -4,54 +4,51 @@
 
 #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");
-        auto nameSearch = GetParameter("nameSearch");
-        auto emailSearch = GetParameter("emailSearch");
-
-        std::string baseQuery;
-        if(!nameSearch.empty() || !emailSearch.empty()) {
-            if(!nameSearch.empty())
-                baseQuery = fmt::format(" Lower(name) like('%{}%') ", Poco::toLower(nameSearch) );
-            if(!emailSearch.empty())
-                baseQuery += baseQuery.empty() ? fmt::format(" Lower(email) like('%{}%') ", Poco::toLower(emailSearch))
-                                               : fmt::format(" and Lower(email) like('%{}%') ", Poco::toLower(emailSearch));
-        }
 
         if(QB_.Select.empty()) {
-            SecurityObjects::UserInfoList   Users;
-            if(StorageService()->UserDB().GetUsers(QB_.Offset, QB_.Limit, Users.users, baseQuery)) {
-                for (auto &i : Users.users) {
+            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);
-                }
-                if(IdOnly) {
-                    Poco::JSON::Array   Arr;
-                    for(const auto &i:Users.users)
-                        Arr.add(i.id);
-                    Poco::JSON::Object  Answer;
-                    Answer.set("users", Arr);
-                    return ReturnObject(Answer);
+                        i.to_json(Obj);
+                        ArrayObj.add(Obj);
                     }
                 }
-            Poco::JSON::Object  Answer;
-            Users.to_json(Answer);
+                Answer.set(RESTAPI::Protocol::USERS, ArrayObj);
+            }
             return ReturnObject(Answer);
         } else {
-            SecurityObjects::UserInfoList   Users;
+            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);
-                    Users.users.emplace_back(UInfo);
+                        UInfo.to_json(Obj);
+                        ArrayObj.add(Obj);
                     }
                 }
-            Poco::JSON::Object Answer;
-            Users.to_json(Answer);
-            return ReturnObject(Answer);
+            }
+            Poco::JSON::Object RetObj;
+            RetObj.set(RESTAPI::Protocol::USERS, ArrayObj);
+            return ReturnObject(RetObj);
         }
     }
 }

src/RESTAPI/RESTAPI_users_handler.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_users_handler : public RESTAPIHandler {
     public:
-        RESTAPI_users_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        RESTAPI_users_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,
@@ -17,7 +17,7 @@ namespace OpenWifi {
                                   Server,
                                   TransactionId,
                                   Internal) {}
-        static auto PathName() { return std::list<std::string>{"/api/v1/users"}; };
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/users"}; };
         void DoGet() final;
         void DoPost() final {};
         void DoDelete() final {};

src/RESTAPI/RESTAPI_validate_apikey.cpp

@@ -1,31 +0,0 @@
-//
-// Created by stephane bourque on 2022-11-07.
-//
-
-#include "RESTAPI_validate_apikey.h"
-#include "AuthService.h"
-
-namespace OpenWifi {
-
-    void RESTAPI_validate_apikey::DoGet() {
-        Poco::URI URI(Request->getURI());
-        auto Parameters = URI.getQueryParameters();
-        for(auto const &i:Parameters) {
-            if (i.first == "apikey") {
-                //  can we find this token?
-                SecurityObjects::UserInfoAndPolicy SecObj;
-                bool Expired = false;
-                std::uint64_t expiresOn=0;
-                if (AuthService()->IsValidApiKey(i.second, SecObj.webtoken, SecObj.userinfo, Expired, expiresOn)) {
-                    Poco::JSON::Object Answer;
-                    SecObj.to_json(Answer);
-                    Answer.set("expiresOn", expiresOn);
-                    return ReturnObject(Answer);
-                }
-                return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-            }
-        }
-        return NotFound();
-    }
-
-} // OpenWifi

src/RESTAPI/RESTAPI_validate_apikey.h

@@ -1,27 +0,0 @@
-//
-// Created by stephane bourque on 2022-11-07.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-    class RESTAPI_validate_apikey : public RESTAPIHandler {
-    public:
-        RESTAPI_validate_apikey(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &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 auto PathName() { return std::list<std::string>{"/api/v1/validateApiKey"}; };
-        void DoGet() final;
-        void DoPost() final {};
-        void DoDelete() final {};
-        void DoPut() final {};
-    };
-}
-

src/RESTAPI/RESTAPI_validate_sub_token_handler.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#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_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        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,
@@ -17,7 +17,7 @@ namespace OpenWifi {
                           Server,
                           TransactionId,
                           Internal) {};
-        static auto PathName() { return std::list<std::string>{"/api/v1/validateSubToken"}; };
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/validateSubToken"}; };
         void DoGet() final;
         void DoPost() final {};
         void DoDelete() final {};

src/RESTAPI/RESTAPI_validate_token_handler.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_validate_token_handler : public RESTAPIHandler {
     public:
-        RESTAPI_validate_token_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId, bool Internal)
+        RESTAPI_validate_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,
@@ -17,7 +17,7 @@ namespace OpenWifi {
                                           Server,
                                           TransactionId,
                                           Internal) {};
-        static auto PathName() { return std::list<std::string>{"/api/v1/validateToken"}; };
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/validateToken"}; };
         void DoGet() final;
         void DoPost() final {};
         void DoDelete() final {};

src/RESTObjects/RESTAPI_AnalyticsObjects.cpp

@@ -1,624 +0,0 @@
-//
-// Created by stephane bourque on 2022-01-10.
-//
-
-#include "RESTAPI_AnalyticsObjects.h"
-#include "RESTAPI_ProvObjects.h"
-#include "framework/RESTAPI_utils.h"
-
-using OpenWifi::RESTAPI_utils::field_to_json;
-using OpenWifi::RESTAPI_utils::field_from_json;
-
-namespace OpenWifi::AnalyticsObjects {
-
-    void Report::reset() {
-    }
-
-    void Report::to_json([[maybe_unused]] Poco::JSON::Object &Obj) const {
-    }
-
-    void VenueInfo::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"id",id);
-        field_to_json(Obj,"name",name);
-        field_to_json(Obj,"description",description);
-        field_to_json(Obj,"retention",retention);
-        field_to_json(Obj,"interval",interval);
-        field_to_json(Obj,"monitorSubVenues",monitorSubVenues);
-    }
-
-    bool VenueInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"id",id);
-            field_from_json(Obj,"name",name);
-            field_from_json(Obj,"description",description);
-            field_from_json(Obj,"retention",retention);
-            field_from_json(Obj,"interval",interval);
-            field_from_json(Obj,"monitorSubVenues",monitorSubVenues);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void BoardInfo::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json(Obj,"venueList",venueList);
-    }
-
-    bool BoardInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json(Obj,"venueList",venueList);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void DeviceInfo::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"boardId",boardId);
-        field_to_json(Obj,"type",type);
-        field_to_json(Obj,"serialNumber",serialNumber);
-        field_to_json(Obj,"deviceType",deviceType);
-        field_to_json(Obj,"lastContact",lastContact);
-        field_to_json(Obj,"lastPing",lastPing);
-        field_to_json(Obj,"lastState",lastState);
-        field_to_json(Obj,"lastFirmware",lastFirmware);
-        field_to_json(Obj,"lastFirmwareUpdate",lastFirmwareUpdate);
-        field_to_json(Obj,"lastConnection",lastConnection);
-        field_to_json(Obj,"lastDisconnection",lastDisconnection);
-        field_to_json(Obj,"pings",pings);
-        field_to_json(Obj,"states",states);
-        field_to_json(Obj,"connected",connected);
-        field_to_json(Obj,"connectionIp",connectionIp);
-        field_to_json(Obj,"associations_2g",associations_2g);
-        field_to_json(Obj,"associations_5g",associations_5g);
-        field_to_json(Obj,"associations_6g",associations_6g);
-        field_to_json(Obj,"health",health);
-        field_to_json(Obj,"lastHealth",lastHealth);
-        field_to_json(Obj,"locale",locale);
-        field_to_json(Obj,"uptime",uptime);
-        field_to_json(Obj,"memory",memory);
-    }
-
-    bool DeviceInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"boardId",boardId);
-            field_from_json(Obj,"type",type);
-            field_from_json(Obj,"serialNumber",serialNumber);
-            field_from_json(Obj,"deviceType",deviceType);
-            field_from_json(Obj,"lastContact",lastContact);
-            field_from_json(Obj,"lastPing",lastPing);
-            field_from_json(Obj,"lastState",lastState);
-            field_from_json(Obj,"lastFirmware",lastFirmware);
-            field_from_json(Obj,"lastFirmwareUpdate",lastFirmwareUpdate);
-            field_from_json(Obj,"lastConnection",lastConnection);
-            field_from_json(Obj,"lastDisconnection",lastDisconnection);
-            field_from_json(Obj,"pings",pings);
-            field_from_json(Obj,"states",states);
-            field_from_json(Obj,"connected",connected);
-            field_from_json(Obj,"connectionIp",connectionIp);
-            field_from_json(Obj,"associations_2g",associations_2g);
-            field_from_json(Obj,"associations_5g",associations_5g);
-            field_from_json(Obj,"associations_6g",associations_6g);
-            field_from_json(Obj,"health",health);
-            field_from_json(Obj,"lastHealth",lastHealth);
-            field_from_json(Obj,"locale",locale);
-            field_from_json(Obj,"uptime",uptime);
-            field_from_json(Obj,"memory",memory);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void DeviceInfoList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"devices",devices);
-    }
-
-    bool DeviceInfoList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"devices",devices);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void UE_rate::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"bitrate",bitrate);
-        field_to_json(Obj,"mcs",mcs);
-        field_to_json(Obj,"nss",nss);
-        field_to_json(Obj,"ht",ht);
-        field_to_json(Obj,"sgi",sgi);
-        field_to_json(Obj,"chwidth",chwidth);
-    }
-
-    bool UE_rate::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"bitrate",bitrate);
-            field_from_json(Obj,"mcs",mcs);
-            field_from_json(Obj,"nss",nss);
-            field_from_json(Obj,"ht",ht);
-            field_from_json(Obj,"sgi",sgi);
-            field_from_json(Obj,"chwidth",chwidth);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void UETimePoint::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"station",station);
-        field_to_json(Obj,"rssi",rssi);
-        field_to_json(Obj,"tx_bytes",tx_bytes);
-        field_to_json(Obj,"rx_bytes",rx_bytes);
-        field_to_json(Obj,"tx_duration",tx_duration);
-        field_to_json(Obj,"rx_packets",rx_packets);
-        field_to_json(Obj,"tx_packets",tx_packets);
-        field_to_json(Obj,"tx_retries",tx_retries);
-        field_to_json(Obj,"tx_failed",tx_failed);
-        field_to_json(Obj,"connected",connected);
-        field_to_json(Obj,"inactive",inactive);
-        field_to_json(Obj,"tx_rate",tx_rate);
-        field_to_json(Obj,"rx_rate",rx_rate);
-//      field_to_json(Obj, "tidstats", tidstats);
-
-        field_to_json(Obj,"tx_bytes_bw",tx_bytes_bw);
-        field_to_json(Obj,"rx_bytes_bw",rx_bytes_bw);
-        field_to_json(Obj,"tx_packets_bw",tx_packets_bw);
-        field_to_json(Obj,"rx_packets_bw",rx_packets_bw);
-        field_to_json(Obj,"tx_failed_pct",tx_failed_pct);
-        field_to_json(Obj,"tx_retries_pct",tx_retries_pct);
-        field_to_json(Obj,"tx_duration_pct",tx_duration_pct);
-
-        field_to_json(Obj,"tx_bytes_delta",tx_bytes_delta);
-        field_to_json(Obj,"rx_bytes_delta",rx_bytes_delta);
-        field_to_json(Obj,"tx_packets_delta",tx_packets_delta);
-        field_to_json(Obj,"rx_packets_delta",rx_packets_delta);
-        field_to_json(Obj,"tx_failed_delta",tx_failed_delta);
-        field_to_json(Obj,"tx_retries_delta",tx_retries_delta);
-        field_to_json(Obj,"tx_duration_delta",tx_duration_delta);
-    }
-
-    bool UETimePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"station",station);
-            field_from_json(Obj,"rssi",rssi);
-            field_from_json(Obj,"tx_bytes",tx_bytes);
-            field_from_json(Obj,"rx_bytes",rx_bytes);
-            field_from_json(Obj,"tx_duration",tx_duration);
-            field_from_json(Obj,"rx_packets",rx_packets);
-            field_from_json(Obj,"tx_packets",tx_packets);
-            field_from_json(Obj,"tx_retries",tx_retries);
-            field_from_json(Obj,"tx_failed",tx_failed);
-            field_from_json(Obj,"connected",connected);
-            field_from_json(Obj,"inactive",inactive);
-            field_from_json(Obj,"tx_rate",tx_rate);
-            field_from_json(Obj,"rx_rate",rx_rate);
-//          field_from_json(Obj,"tidstats",tidstats);
-            field_from_json(Obj,"tx_bytes_bw",tx_bytes_bw);
-            field_from_json(Obj,"rx_bytes_bw",rx_bytes_bw);
-            field_from_json(Obj,"tx_packets_bw",tx_packets_bw);
-            field_from_json(Obj,"rx_packets_bw",rx_packets_bw);
-            field_from_json(Obj,"tx_failed_pct",tx_failed_pct);
-            field_from_json(Obj,"tx_retries_pct",tx_retries_pct);
-            field_from_json(Obj,"tx_duration_pct",tx_duration_pct);
-            field_from_json(Obj,"tx_bytes_delta",tx_bytes_delta);
-            field_from_json(Obj,"rx_bytes_delta",rx_bytes_delta);
-            field_from_json(Obj,"tx_packets_delta",tx_packets_delta);
-            field_from_json(Obj,"rx_packets_delta",rx_packets_delta);
-            field_from_json(Obj,"tx_failed_delta",tx_failed_delta);
-            field_from_json(Obj,"tx_retries_delta",tx_retries_delta);
-            field_from_json(Obj,"tx_duration_delta",tx_duration_delta);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void APTimePoint::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"collisions",collisions);
-        field_to_json(Obj,"multicast",multicast);
-        field_to_json(Obj,"rx_bytes",rx_bytes);
-        field_to_json(Obj,"rx_dropped",rx_dropped);
-        field_to_json(Obj,"rx_errors",rx_errors);
-        field_to_json(Obj,"rx_packets",rx_packets);
-        field_to_json(Obj,"tx_bytes",tx_bytes);
-        field_to_json(Obj,"tx_packets",tx_packets);
-        field_to_json(Obj,"tx_dropped",tx_dropped);
-        field_to_json(Obj,"tx_errors",tx_errors);
-        field_to_json(Obj,"tx_packets",tx_packets);
-
-        field_to_json(Obj,"tx_bytes_bw",tx_bytes_bw);
-        field_to_json(Obj,"rx_bytes_bw",rx_bytes_bw);
-        field_to_json(Obj,"rx_dropped_pct",rx_dropped_pct);
-        field_to_json(Obj,"tx_dropped_pct",tx_dropped_pct);
-        field_to_json(Obj,"rx_packets_bw",rx_packets_bw);
-        field_to_json(Obj,"tx_packets_bw",tx_packets_bw);
-        field_to_json(Obj,"rx_errors_pct",rx_errors_pct);
-        field_to_json(Obj,"tx_errors_pct",tx_errors_pct);
-
-        field_to_json(Obj,"tx_bytes_delta",tx_bytes_delta);
-        field_to_json(Obj,"rx_bytes_delta",rx_bytes_delta);
-        field_to_json(Obj,"rx_dropped_delta",rx_dropped_delta);
-        field_to_json(Obj,"tx_dropped_delta",tx_dropped_delta);
-        field_to_json(Obj,"rx_packets_delta",rx_packets_delta);
-        field_to_json(Obj,"tx_packets_delta",tx_packets_delta);
-        field_to_json(Obj,"rx_errors_delta",rx_errors_delta);
-        field_to_json(Obj,"tx_errors_delta",tx_errors_delta);
-    }
-
-    bool APTimePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"collisions",collisions);
-            field_from_json(Obj,"multicast",multicast);
-            field_from_json(Obj,"rx_bytes",rx_bytes);
-            field_from_json(Obj,"rx_dropped",rx_dropped);
-            field_from_json(Obj,"rx_errors",rx_errors);
-            field_from_json(Obj,"rx_packets",rx_packets);
-            field_from_json(Obj,"tx_bytes",tx_bytes);
-            field_from_json(Obj,"tx_packets",tx_packets);
-            field_from_json(Obj,"tx_dropped",tx_dropped);
-            field_from_json(Obj,"tx_errors",tx_errors);
-            field_from_json(Obj,"tx_packets",tx_packets);
-
-            field_from_json(Obj,"tx_bytes_bw",tx_bytes_bw);
-            field_from_json(Obj,"rx_bytes_bw",rx_bytes_bw);
-            field_from_json(Obj,"rx_dropped_pct",rx_dropped_pct);
-            field_from_json(Obj,"tx_dropped_pct",tx_dropped_pct);
-            field_from_json(Obj,"rx_packets_bw",rx_packets_bw);
-            field_from_json(Obj,"tx_packets_bw",tx_packets_bw);
-            field_from_json(Obj,"rx_errors_pct",rx_errors_pct);
-            field_from_json(Obj,"tx_errors_pct",tx_errors_pct);
-
-            field_from_json(Obj,"tx_bytes_delta",tx_bytes_delta);
-            field_from_json(Obj,"rx_bytes_delta",rx_bytes_delta);
-            field_from_json(Obj,"rx_dropped_delta",rx_dropped_delta);
-            field_from_json(Obj,"tx_dropped_delta",tx_dropped_delta);
-            field_from_json(Obj,"rx_packets_delta",rx_packets_delta);
-            field_from_json(Obj,"tx_packets_delta",tx_packets_delta);
-            field_from_json(Obj,"rx_errors_delta",rx_errors_delta);
-            field_from_json(Obj,"tx_errors_delta",tx_errors_delta);
-
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void TIDstat_entry::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"rx_msdu",rx_msdu);
-        field_to_json(Obj,"tx_msdu",tx_msdu);
-        field_to_json(Obj,"tx_msdu_failed",tx_msdu_failed);
-        field_to_json(Obj,"tx_msdu_retries",tx_msdu_retries);
-    }
-
-    bool TIDstat_entry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"rx_msdu",rx_msdu);
-            field_from_json(Obj,"tx_msdu",tx_msdu);
-            field_from_json(Obj,"tx_msdu_failed",tx_msdu_failed);
-            field_from_json(Obj,"tx_msdu_retries",tx_msdu_retries);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void RadioTimePoint::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"band",band);
-        field_to_json(Obj,"channel_width",channel_width);
-        field_to_json(Obj,"active_ms",active_ms);
-        field_to_json(Obj,"busy_ms",busy_ms);
-        field_to_json(Obj,"receive_ms",receive_ms);
-        field_to_json(Obj,"transmit_ms",transmit_ms);
-        field_to_json(Obj,"tx_power",tx_power);
-        field_to_json(Obj,"channel",channel);
-        field_to_json(Obj,"temperature",temperature);
-        field_to_json(Obj,"noise",noise);
-        field_to_json(Obj,"active_pct",active_pct);
-        field_to_json(Obj,"busy_pct",busy_pct);
-        field_to_json(Obj,"receive_pct",receive_pct);
-        field_to_json(Obj,"transmit_pct",transmit_pct);
-    }
-
-    bool RadioTimePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"band",band);
-            field_from_json(Obj,"channel_width",channel_width);
-            field_from_json(Obj,"active_ms",active_ms);
-            field_from_json(Obj,"busy_ms",busy_ms);
-            field_from_json(Obj,"receive_ms",receive_ms);
-            field_from_json(Obj,"transmit_ms",transmit_ms);
-            field_from_json(Obj,"tx_power",tx_power);
-            field_from_json(Obj,"channel",channel);
-            field_from_json(Obj,"temperature",temperature);
-            field_from_json(Obj,"noise",noise);
-            field_from_json(Obj,"active_pct",active_pct);
-            field_from_json(Obj,"busy_pct",busy_pct);
-            field_from_json(Obj,"receive_pct",receive_pct);
-            field_from_json(Obj,"transmit_pct",transmit_pct);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void AveragePoint::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"min",min);
-        field_to_json(Obj,"max",max);
-        field_to_json(Obj,"avg",avg);
-    }
-
-    bool AveragePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"min",min);
-            field_from_json(Obj,"max",max);
-            field_from_json(Obj,"avg",avg);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void SSIDTimePoint::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"bssid",bssid);
-        field_to_json(Obj,"mode",mode);
-        field_to_json(Obj,"ssid",ssid);
-        field_to_json(Obj,"band",band);
-        field_to_json(Obj,"channel",channel);
-        field_to_json(Obj,"associations",associations);
-        field_to_json(Obj,"tx_bytes_bw",tx_bytes_bw);
-        field_to_json(Obj,"rx_bytes_bw",rx_bytes_bw);
-        field_to_json(Obj,"tx_packets_bw",tx_packets_bw);
-        field_to_json(Obj,"rx_packets_bw",rx_packets_bw);
-        field_to_json(Obj,"tx_failed_pct",tx_failed_pct);
-        field_to_json(Obj,"tx_retries_pct",tx_retries_pct);
-        field_to_json(Obj,"tx_duration_pct",tx_duration_pct);
-    }
-
-    bool SSIDTimePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"bssid",bssid);
-            field_from_json(Obj,"mode",mode);
-            field_from_json(Obj,"ssid",ssid);
-            field_from_json(Obj,"band",band);
-            field_from_json(Obj,"channel",channel);
-            field_from_json(Obj,"associations",associations);
-            field_from_json(Obj,"tx_bytes_bw",tx_bytes_bw);
-            field_from_json(Obj,"rx_bytes_bw",rx_bytes_bw);
-            field_from_json(Obj,"tx_packets_bw",tx_packets_bw);
-            field_from_json(Obj,"rx_packets_bw",rx_packets_bw);
-            field_from_json(Obj,"tx_failed_pct",tx_failed_pct);
-            field_from_json(Obj,"tx_retries_pct",tx_retries_pct);
-            field_from_json(Obj,"tx_duration_pct",tx_duration_pct);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void DeviceTimePoint::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"id",id);
-        field_to_json(Obj,"boardId",boardId);
-        field_to_json(Obj,"timestamp",timestamp);
-        field_to_json(Obj,"ap_data",ap_data);
-        field_to_json(Obj,"ssid_data",ssid_data);
-        field_to_json(Obj,"radio_data",radio_data);
-        field_to_json(Obj,"device_info",device_info);
-        field_to_json(Obj,"serialNumber",serialNumber);
-    }
-
-    bool DeviceTimePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"id",id);
-            field_from_json(Obj,"boardId",boardId);
-            field_from_json(Obj,"timestamp",timestamp);
-            field_from_json(Obj,"ap_data",ap_data);
-            field_from_json(Obj,"ssid_data",ssid_data);
-            field_from_json(Obj,"radio_data",radio_data);
-            field_from_json(Obj,"device_info",device_info);
-            field_from_json(Obj,"serialNumber",serialNumber);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void DeviceTimePointAnalysis::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"noise",noise);
-        field_to_json(Obj,"temperature",temperature);
-        field_to_json(Obj,"active_pct",active_pct);
-        field_to_json(Obj,"busy_pct",busy_pct);
-        field_to_json(Obj,"receive_pct",receive_pct);
-        field_to_json(Obj,"transmit_pct",transmit_pct);
-        field_to_json(Obj,"tx_power",tx_power);
-        field_to_json(Obj,"tx_bytes_bw",tx_bytes_bw);
-        field_to_json(Obj,"rx_bytes_bw",rx_bytes_bw);
-        field_to_json(Obj,"rx_dropped_pct",rx_dropped_pct);
-        field_to_json(Obj,"tx_dropped_pct",tx_dropped_pct);
-        field_to_json(Obj,"rx_packets_bw",rx_packets_bw);
-        field_to_json(Obj,"tx_packets_bw",tx_packets_bw);
-        field_to_json(Obj,"rx_errors_pct",rx_errors_pct);
-        field_to_json(Obj,"tx_errors_pct",tx_errors_pct);
-    }
-
-    bool DeviceTimePointAnalysis::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"noise",noise);
-            field_from_json(Obj,"temperature",temperature);
-            field_from_json(Obj,"active_pct",active_pct);
-            field_from_json(Obj,"busy_pct",busy_pct);
-            field_from_json(Obj,"receive_pct",receive_pct);
-            field_from_json(Obj,"transmit_pct",transmit_pct);
-            field_from_json(Obj,"tx_power",tx_power);
-            field_from_json(Obj,"tx_bytes_bw",tx_bytes_bw);
-            field_from_json(Obj,"rx_bytes_bw",rx_bytes_bw);
-            field_from_json(Obj,"rx_dropped_pct",rx_dropped_pct);
-            field_from_json(Obj,"tx_dropped_pct",tx_dropped_pct);
-            field_from_json(Obj,"rx_packets_bw",rx_packets_bw);
-            field_from_json(Obj,"tx_packets_bw",tx_packets_bw);
-            field_from_json(Obj,"rx_errors_pct",rx_errors_pct);
-            field_from_json(Obj,"tx_errors_pct",tx_errors_pct);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void DeviceTimePointList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"points",points);
-        field_to_json(Obj,"stats",stats);
-    }
-
-    bool DeviceTimePointList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"points",points);
-            field_from_json(Obj,"stats",stats);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void DeviceTimePointStats::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"firstPoint",firstPoint);
-        field_to_json(Obj,"lastPoint",lastPoint);
-        field_to_json(Obj,"count",count);
-    }
-
-    bool DeviceTimePointStats::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"firstPoint",firstPoint);
-            field_from_json(Obj,"lastPoint",lastPoint);
-            field_from_json(Obj,"count",count);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void WifiClientRate::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"bitrate",bitrate);
-        field_to_json(Obj,"chwidth",chwidth);
-        field_to_json(Obj,"mcs",mcs);
-        field_to_json(Obj,"nss",nss);
-        field_to_json(Obj,"vht",vht);
-    }
-
-    bool WifiClientRate::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"bitrate",bitrate);
-            field_from_json(Obj,"chwidth",chwidth);
-            field_from_json(Obj,"mcs",mcs);
-            field_from_json(Obj,"nss",nss);
-            field_from_json(Obj,"vht",vht);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void WifiClientHistory::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"timestamp",timestamp);
-        field_to_json(Obj,"station_id",station_id);
-        field_to_json(Obj,"bssid",bssid);
-        field_to_json(Obj,"ssid",ssid);
-        field_to_json(Obj,"rssi",rssi);
-        field_to_json(Obj,"rx_bitrate",rx_bitrate);
-        field_to_json(Obj,"rx_chwidth",rx_chwidth);
-        field_to_json(Obj,"rx_mcs",rx_mcs);
-        field_to_json(Obj,"rx_nss",rx_nss);
-        field_to_json(Obj,"rx_vht",rx_vht);
-        field_to_json(Obj,"tx_bitrate",tx_bitrate);
-        field_to_json(Obj,"tx_chwidth",tx_chwidth);
-        field_to_json(Obj,"tx_mcs",tx_mcs);
-        field_to_json(Obj,"tx_nss",tx_nss);
-        field_to_json(Obj,"tx_vht",tx_vht);
-        field_to_json(Obj,"rx_bytes",rx_bytes);
-        field_to_json(Obj,"tx_bytes",tx_bytes);
-        field_to_json(Obj,"rx_duration",rx_duration);
-        field_to_json(Obj,"tx_duration",tx_duration);
-        field_to_json(Obj,"rx_packets",rx_packets);
-        field_to_json(Obj,"tx_packets",tx_packets);
-        field_to_json(Obj,"ipv4",ipv4);
-        field_to_json(Obj,"ipv6",ipv6);
-        field_to_json(Obj,"channel_width",channel_width);
-        field_to_json(Obj,"noise",noise);
-        field_to_json(Obj,"tx_power",tx_power);
-        field_to_json(Obj,"channel",channel);
-        field_to_json(Obj,"active_ms",active_ms);
-        field_to_json(Obj,"busy_ms",busy_ms);
-        field_to_json(Obj,"receive_ms",receive_ms);
-        field_to_json(Obj,"mode",mode);
-        field_to_json(Obj,"ack_signal",ack_signal);
-        field_to_json(Obj,"ack_signal_avg",ack_signal_avg);
-        field_to_json(Obj,"connected",connected);
-        field_to_json(Obj,"inactive",inactive);
-        field_to_json(Obj,"tx_retries",tx_retries);
-        field_to_json(Obj,"venue_id",venue_id);
-    }
-
-    bool WifiClientHistory::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"timestamp",timestamp);
-            field_from_json(Obj,"station_id",station_id);
-            field_from_json(Obj,"bssid",bssid);
-            field_from_json(Obj,"ssid",ssid);
-            field_from_json(Obj,"rssi",rssi);
-            field_from_json(Obj,"rx_bitrate",rx_bitrate);
-            field_from_json(Obj,"rx_chwidth",rx_chwidth);
-            field_from_json(Obj,"rx_mcs",rx_mcs);
-            field_from_json(Obj,"rx_nss",rx_nss);
-            field_from_json(Obj,"rx_vht",rx_vht);
-            field_from_json(Obj,"tx_bitrate",tx_bitrate);
-            field_from_json(Obj,"tx_chwidth",tx_chwidth);
-            field_from_json(Obj,"tx_mcs",tx_mcs);
-            field_from_json(Obj,"tx_nss",tx_nss);
-            field_from_json(Obj,"tx_vht",tx_vht);
-            field_from_json(Obj,"rx_bytes",rx_bytes);
-            field_from_json(Obj,"tx_bytes",tx_bytes);
-            field_from_json(Obj,"rx_duration",rx_duration);
-            field_from_json(Obj,"tx_duration",tx_duration);
-            field_from_json(Obj,"rx_packets",rx_packets);
-            field_from_json(Obj,"tx_packets",tx_packets);
-            field_from_json(Obj,"ipv4",ipv4);
-            field_from_json(Obj,"ipv6",ipv6);
-            field_from_json(Obj,"channel_width",channel_width);
-            field_from_json(Obj,"noise",noise);
-            field_from_json(Obj,"tx_power",tx_power);
-            field_from_json(Obj,"channel",channel);
-            field_from_json(Obj,"active_ms",active_ms);
-            field_from_json(Obj,"busy_ms",busy_ms);
-            field_from_json(Obj,"receive_ms",receive_ms);
-            field_from_json(Obj,"mode",mode);
-            field_from_json(Obj,"ack_signal",ack_signal);
-            field_from_json(Obj,"ack_signal_avg",ack_signal_avg);
-            field_from_json(Obj,"connected",connected);
-            field_from_json(Obj,"inactive",inactive);
-            field_from_json(Obj,"tx_retries",tx_retries);
-            field_from_json(Obj,"venue_id",venue_id);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-}

src/RESTObjects/RESTAPI_AnalyticsObjects.h

@@ -1,423 +0,0 @@
-//
-// Created by stephane bourque on 2022-01-10.
-//
-
-#pragma once
-
-#include "RESTAPI_ProvObjects.h"
-#include "framework/utils.h"
-#include <vector>
-
-namespace OpenWifi {
-
-    namespace AnalyticsObjects {
-
-        struct Report {
-            uint64_t snapShot = 0;
-
-            void reset();
-
-            void to_json(Poco::JSON::Object &Obj) const;
-        };
-
-        struct VenueInfo {
-            OpenWifi::Types::UUID_t id;
-            std::string name;
-            std::string description;
-            uint64_t retention = 0;
-            uint64_t interval = 0;
-            bool monitorSubVenues = false;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        struct BoardInfo {
-            ProvObjects::ObjectInfo info;
-            std::vector<VenueInfo> venueList;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-
-            inline bool operator<(const BoardInfo &bb) const {
-                return info.id < bb.info.id;
-            }
-
-            inline bool operator==(const BoardInfo &bb) const {
-                return info.id == bb.info.id;
-            }
-        };
-
-        struct DeviceInfo {
-            std::string boardId;
-            std::string type;
-            std::string serialNumber;
-            std::string deviceType;
-            uint64_t lastContact = 0 ;
-            uint64_t lastPing = 0;
-            uint64_t lastState = 0;
-            std::string lastFirmware;
-            uint64_t lastFirmwareUpdate = 0;
-            uint64_t lastConnection = 0;
-            uint64_t lastDisconnection = 0;
-            uint64_t pings = 0;
-            uint64_t states = 0;
-            bool connected = false;
-            std::string connectionIp;
-            uint64_t associations_2g = 0;
-            uint64_t associations_5g = 0;
-            uint64_t associations_6g = 0;
-            uint64_t health = 0;
-            uint64_t lastHealth = 0;
-            std::string locale;
-            uint64_t uptime = 0;
-            double memory = 0.0;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        struct DeviceInfoList {
-            std::vector<DeviceInfo> devices;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        enum wifi_band {
-            band_2g = 0, band_5g = 1, band_6g = 2
-        };
-
-        struct TIDstat_entry {
-            uint64_t rx_msdu = 0,
-                    tx_msdu = 0,
-                    tx_msdu_failed = 0,
-                    tx_msdu_retries = 0;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        struct UE_rate {
-            uint64_t    bitrate=0;
-            uint64_t    mcs=0;
-            uint64_t    nss=0;
-            bool        ht=false;
-            bool        sgi=false;
-            uint64_t    chwidth=0;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        struct AveragePoint {
-            double      min = 0.0,
-                        max = 0.0,
-                        avg = 0.0;
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        struct UETimePoint {
-            std::string station;
-            int64_t rssi = 0;
-            uint64_t tx_bytes = 0,
-                    rx_bytes = 0,
-                    tx_duration = 0,
-                    rx_packets = 0,
-                    tx_packets = 0,
-                    tx_retries = 0,
-                    tx_failed = 0,
-                    connected = 0,
-                    inactive = 0;
-
-            double  tx_bytes_bw = 0.0 ,
-                    rx_bytes_bw = 0.0 ,
-                    tx_packets_bw = 0.0 ,
-                    rx_packets_bw = 0.0 ,
-                    tx_failed_pct = 0.0 ,
-                    tx_retries_pct = 0.0 ,
-                    tx_duration_pct = 0.0;
-
-            uint64_t    tx_bytes_delta = 0,
-                        rx_bytes_delta = 0,
-                        tx_duration_delta = 0,
-                        rx_packets_delta = 0,
-                        tx_packets_delta = 0,
-                        tx_retries_delta = 0,
-                        tx_failed_delta = 0;
-
-            UE_rate tx_rate,
-                    rx_rate;
-            std::vector<TIDstat_entry> tidstats;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        enum SSID_MODES {
-            unknown = 0,
-            ap,
-            mesh,
-            sta,
-            wds_ap,
-            wds_sta,
-            wds_repeater
-        };
-
-        inline SSID_MODES SSID_Mode(const std::string &m) {
-            if (m == "ap")
-                return ap;
-            if (m == "sta")
-                return sta;
-            if (m == "mesh")
-                return mesh;
-            if (m == "wds-ap")
-                return wds_ap;
-            if (m == "wds-sta")
-                return wds_sta;
-            if (m == "wds-repeater")
-                return wds_repeater;
-            return unknown;
-        }
-
-        struct SSIDTimePoint {
-            std::string bssid,
-                        mode,
-                        ssid;
-            uint64_t    band=0,
-                        channel=0;
-            std::vector<UETimePoint> associations;
-
-            AveragePoint    tx_bytes_bw,
-                            rx_bytes_bw,
-                            tx_packets_bw,
-                            rx_packets_bw,
-                            tx_failed_pct,
-                            tx_retries_pct,
-                            tx_duration_pct;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-
-        struct APTimePoint {
-            uint64_t    collisions = 0,
-                        multicast = 0,
-                        rx_bytes = 0,
-                        rx_dropped = 0,
-                        rx_errors = 0,
-                        rx_packets = 0,
-                        tx_bytes = 0,
-                        tx_dropped = 0,
-                        tx_errors = 0,
-                        tx_packets = 0;
-
-            double      tx_bytes_bw = 0.0 ,
-                        rx_bytes_bw = 0.0 ,
-                        rx_dropped_pct = 0.0,
-                        tx_dropped_pct = 0.0,
-                        rx_packets_bw = 0.0,
-                        tx_packets_bw = 0.0,
-                        rx_errors_pct = 0.0 ,
-                        tx_errors_pct = 0.0;
-
-            uint64_t    tx_bytes_delta = 0,
-                        rx_bytes_delta = 0 ,
-                        rx_dropped_delta = 0,
-                        tx_dropped_delta = 0,
-                        rx_packets_delta = 0,
-                        tx_packets_delta = 0,
-                        rx_errors_delta = 0,
-                        tx_errors_delta = 0;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        struct RadioTimePoint {
-            uint64_t    band = 0,
-                        channel_width = 0;
-            uint64_t    active_ms = 0,
-                        busy_ms = 0,
-                        receive_ms = 0,
-                        transmit_ms = 0,
-                        tx_power = 0,
-                        channel = 0;
-            int64_t     temperature = 0,
-                        noise = 0;
-
-            double      active_pct = 0.0 ,
-                        busy_pct = 0.0,
-                        receive_pct = 0.0,
-                        transmit_pct = 0.0;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-
-        struct DeviceTimePoint {
-            std::string                     id;
-            std::string                     boardId;
-            uint64_t                        timestamp = 0;
-            APTimePoint                     ap_data;
-            std::vector<SSIDTimePoint>      ssid_data;
-            std::vector<RadioTimePoint>     radio_data;
-            AnalyticsObjects::DeviceInfo    device_info;
-            std::string                     serialNumber;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-
-            inline bool operator<(const DeviceTimePoint &rhs) const {
-                if(timestamp < rhs.timestamp)
-                    return true;
-                if(timestamp > rhs.timestamp)
-                    return false;
-                if(device_info.serialNumber < rhs.device_info.serialNumber)
-                    return true;
-                return false;
-            }
-
-            inline bool operator==(const DeviceTimePoint &rhs) const {
-                return timestamp==rhs.timestamp && device_info.serialNumber==rhs.device_info.serialNumber;
-            }
-
-            inline bool operator>(const DeviceTimePoint &rhs) const {
-                if(timestamp > rhs.timestamp)
-                    return true;
-                if(timestamp < rhs.timestamp)
-                    return false;
-                if(device_info.serialNumber > rhs.device_info.serialNumber)
-                    return true;
-                return false;
-            }
-
-        };
-
-        struct DeviceTimePointAnalysis {
-            uint64_t        timestamp;
-
-            AveragePoint    noise;
-            AveragePoint    temperature;
-            AveragePoint    active_pct;
-            AveragePoint    busy_pct;
-            AveragePoint    receive_pct;
-            AveragePoint    transmit_pct;
-            AveragePoint    tx_power;
-
-            AveragePoint    tx_bytes_bw;
-            AveragePoint    rx_bytes_bw;
-            AveragePoint    rx_dropped_pct;
-            AveragePoint    tx_dropped_pct;
-            AveragePoint    rx_packets_bw;
-            AveragePoint    tx_packets_bw;
-            AveragePoint    rx_errors_pct;
-            AveragePoint    tx_errors_pct;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-
-        };
-
-        struct DeviceTimePointList {
-            std::vector<DeviceTimePoint>            points;
-            std::vector<DeviceTimePointAnalysis>    stats;
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        struct BandwidthAnalysisEntry {
-            uint64_t    timestamp = 0;
-
-        };
-
-        struct BandwidthAnalysis {
-
-        };
-
-        struct AverageValueSigned {
-            int64_t     peak=0, avg=0, low=0;
-        };
-
-        struct AverageValueUnsigned {
-            uint64_t     peak=0, avg=0, low=0;
-        };
-
-        struct RadioAnalysis {
-            uint64_t                timestamp=0;
-            AverageValueSigned      noise, temperature;
-            AverageValueUnsigned    active_ms,
-                                    busy_ms,
-                                    transmit_ms,
-                                    receive_ms;
-        };
-
-        struct DeviceTimePointStats {
-            uint64_t                firstPoint=0;
-            uint64_t                lastPoint=0;
-            uint64_t                count=0;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        struct WifiClientRate {
-            uint32_t    bitrate=0;
-            uint32_t    chwidth=0;
-            uint16_t    mcs=0;
-            uint16_t    nss=0;
-            bool        vht=false;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        struct WifiClientHistory {
-            uint64_t        timestamp=Utils::Now();
-            std::string     station_id;
-            std::string     bssid;
-            std::string     ssid;
-            int64_t         rssi=0;
-            uint32_t        rx_bitrate=0;
-            uint32_t        rx_chwidth=0;
-            uint16_t        rx_mcs=0;
-            uint16_t        rx_nss=0;
-            bool            rx_vht=false;
-            uint32_t        tx_bitrate=0;
-            uint32_t        tx_chwidth=0;
-            uint16_t        tx_mcs=0;
-            uint16_t        tx_nss=0;
-            bool            tx_vht=false;
-            uint64_t        rx_bytes=0;
-            uint64_t        tx_bytes=0;
-            uint64_t        rx_duration=0;
-            uint64_t        tx_duration=0;
-            uint64_t        rx_packets=0;
-            uint64_t        tx_packets=0;
-            std::string     ipv4;
-            std::string     ipv6;
-            uint64_t        channel_width=0;
-            int64_t         noise=0;
-            uint64_t        tx_power=0;
-            uint64_t        channel=0;
-            uint64_t        active_ms=0;
-            uint64_t        busy_ms=0;
-            uint64_t        receive_ms=0;
-            std::string     mode;
-            int64_t         ack_signal=0;
-            int64_t         ack_signal_avg=0;
-            uint64_t        connected=0;
-            uint64_t        inactive=0;
-            uint64_t        tx_retries=0;
-            std::string     venue_id;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-    }
-
-}

src/RESTObjects/RESTAPI_CertObjects.cpp

@@ -3,12 +3,12 @@
 //
 
 #include "RESTAPI_CertObjects.h"
-#include "framework/RESTAPI_utils.h"
 
 using OpenWifi::RESTAPI_utils::field_to_json;
 using OpenWifi::RESTAPI_utils::field_from_json;
 
-namespace OpenWifi::CertObjects {
+namespace OpenWifi {
+    namespace  CertObjects {
         void CertificateEntry::to_json(Poco::JSON::Object &Obj) const {
             field_to_json(Obj,"id", id);
             field_to_json(Obj,"entity", entity);
@@ -29,7 +29,6 @@ namespace OpenWifi::CertObjects {
             field_to_json(Obj,"modified", modified);
             field_to_json(Obj,"revoked", revoked);
             field_to_json(Obj,"revokeCount", revokeCount);
-        field_to_json(Obj,"synched", synched);
         }
 
         bool CertificateEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -53,7 +52,6 @@ namespace OpenWifi::CertObjects {
                 field_from_json(Obj,"modified", modified);
                 field_from_json(Obj,"revoked", revoked);
                 field_from_json(Obj,"revokeCount", revokeCount);
-            field_from_json(Obj,"synched", synched);
                 return true;
             } catch (...) {
             }
@@ -154,7 +152,6 @@ namespace OpenWifi::CertObjects {
             field_to_json(Obj,"submitted", submitted);
             field_to_json(Obj,"started", started);
             field_to_json(Obj,"completed", completed);
-        field_to_json(Obj,"requesterUsername", requesterUsername);
         }
 
         bool JobEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -172,39 +169,10 @@ namespace OpenWifi::CertObjects {
                 field_from_json(Obj,"submitted", submitted);
                 field_from_json(Obj,"started", started);
                 field_from_json(Obj,"completed", completed);
-            field_from_json(Obj,"requesterUsername", requesterUsername);
                 return true;
             } catch (...) {
             }
             return false;
         }
-
-    void DashBoardYearlyStats::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "year", year);
-        field_to_json(Obj, "activeCerts", activeCerts);
-        field_to_json(Obj, "revokedCerts", revokedCerts);
-    }
-
-    void Dashboard::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"snapshot", snapshot);
-        field_to_json(Obj,"numberOfIssuedCerts", numberOfIssuedCerts);
-        field_to_json(Obj,"numberOfRevokedCerts", numberOfRevokedCerts);
-        field_to_json(Obj,"activeCertsPerOrganization", activeCertsPerOrganization);
-        field_to_json(Obj,"revokedCertsPerOrganization", revokedCertsPerOrganization);
-        field_to_json(Obj,"numberOfRedirectors", numberOfRedirectors);
-        field_to_json(Obj,"deviceTypes", deviceTypes);
-        field_to_json(Obj,"monthlyNumberOfCerts", monthlyNumberOfCerts);
-        field_to_json(Obj,"monthlyNumberOfCertsPerOrgPerYear", monthlyNumberOfCertsPerOrgPerYear);
-    }
-
-    void Dashboard::reset() {
-        snapshot=0;
-        numberOfRevokedCerts = numberOfIssuedCerts = 0;
-        activeCertsPerOrganization.clear();
-        revokedCertsPerOrganization.clear();
-        numberOfRedirectors.clear();
-        deviceTypes.clear();
-        monthlyNumberOfCerts.clear();
-        monthlyNumberOfCertsPerOrgPerYear.clear();
     }
 }

src/RESTObjects/RESTAPI_CertObjects.h

@@ -5,10 +5,13 @@
 #pragma once
 
 #include <string>
+#include "framework/MicroService.h"
 #include "framework/OpenWifiTypes.h"
 #include "RESTObjects/RESTAPI_SecurityObjects.h"
 
-namespace OpenWifi::CertObjects {
+namespace OpenWifi {
+
+    namespace CertObjects {
 
         struct CertificateEntry {
             OpenWifi::Types::UUID_t         id;
@@ -30,7 +33,6 @@ namespace OpenWifi::CertObjects {
             uint64_t                        modified = 0;
             uint64_t                        revoked = 0;
             uint64_t                        revokeCount = 0;
-        uint64_t                        synched = 0;
 
             void to_json(Poco::JSON::Object &Obj) const;
             bool from_json(const Poco::JSON::Object::Ptr &Obj);
@@ -91,33 +93,9 @@ namespace OpenWifi::CertObjects {
             uint64_t                        submitted=0;
             uint64_t                        started=0;
             uint64_t                        completed=0;
-        std::string                     requesterUsername;
 
             void to_json(Poco::JSON::Object &Obj) const;
             bool from_json(const Poco::JSON::Object::Ptr &Obj);
         };
-
-    struct DashBoardYearlyStats {
-        uint64_t                            year=0;
-        OpenWifi::Types::Counted3DMapSII    activeCerts;
-        OpenWifi::Types::Counted3DMapSII    revokedCerts;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-    };
-
-    struct Dashboard {
-        uint64_t                            snapshot=0;
-        uint64_t                            numberOfIssuedCerts=0;
-        uint64_t                            numberOfRevokedCerts=0;
-        OpenWifi::Types::CountedMap         activeCertsPerOrganization;
-        OpenWifi::Types::CountedMap         revokedCertsPerOrganization;
-        OpenWifi::Types::CountedMap         numberOfRedirectors;
-        OpenWifi::Types::CountedMap         deviceTypes;
-        OpenWifi::Types::CountedMap         monthlyNumberOfCerts;
-        std::vector<DashBoardYearlyStats>   monthlyNumberOfCertsPerOrgPerYear;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        void reset();
-    };
-
+    }
 }

src/RESTObjects/RESTAPI_FMSObjects.cpp

@@ -3,8 +3,7 @@
 //
 
 #include "RESTAPI_FMSObjects.h"
-#include "framework/RESTAPI_utils.h"
-#include "framework/utils.h"
+#include "framework/MicroService.h"
 
 using OpenWifi::RESTAPI_utils::field_to_json;
 using OpenWifi::RESTAPI_utils::field_from_json;
@@ -234,10 +233,10 @@ namespace OpenWifi::FMSObjects {
         UnknownFirmwares_.clear();
         totalSecondsOld_.clear();
         numberOfDevices = 0 ;
-        snapshot = Utils::Now();
+        snapshot = std::time(nullptr);
     }
 
-    bool DeviceReport::from_json([[maybe_unused]] const Poco::JSON::Object::Ptr &Obj) {
+    bool DeviceReport::from_json(const Poco::JSON::Object::Ptr &Obj) {
         try {
 
             return true;
@@ -246,65 +245,4 @@ namespace OpenWifi::FMSObjects {
         }
         return false;
     }
-
-    void DeviceInformation::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "serialNumber",serialNumber);
-        field_to_json(Obj, "history", history);
-        field_to_json(Obj, "currentFirmware", currentFirmware);
-        field_to_json(Obj, "currentFirmwareDate", currentFirmwareDate);
-        field_to_json(Obj, "latestFirmware", latestFirmware);
-        field_to_json(Obj, "latestFirmwareDate", latestFirmwareDate);
-        field_to_json(Obj, "latestFirmwareAvailable",latestFirmwareAvailable);
-        field_to_json(Obj, "latestFirmwareURI",latestFirmwareURI);
-    }
-
-    bool DeviceInformation::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "serialNumber",serialNumber);
-            field_from_json(Obj, "history", history);
-            field_from_json(Obj, "currentFirmware", currentFirmware);
-            field_from_json(Obj, "currentFirmwareDate", currentFirmwareDate);
-            field_from_json(Obj, "latestFirmware", latestFirmware);
-            field_from_json(Obj, "latestFirmwareDate", latestFirmwareDate);
-            field_from_json(Obj, "latestFirmwareAvailable",latestFirmwareAvailable);
-            field_from_json(Obj, "latestFirmwareURI",latestFirmwareURI);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void DeviceCurrentInfo::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "serialNumber",serialNumber);
-        field_to_json(Obj, "revision", revision);
-        field_to_json(Obj, "upgraded", upgraded);
-    }
-
-    bool DeviceCurrentInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "serialNumber",serialNumber);
-            field_from_json(Obj, "revision", revision);
-            field_from_json(Obj, "upgraded", upgraded);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void DeviceCurrentInfoList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "devices",devices);
-    }
-
-    bool DeviceCurrentInfoList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "devices",devices);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
 }

src/RESTObjects/RESTAPI_FMSObjects.h

@@ -4,7 +4,9 @@
 
 #include <string>
 
-#pragma once
+#ifndef UCENTRALFMS_RESTAPI_FMSOBJECTS_H
+#define UCENTRALFMS_RESTAPI_FMSOBJECTS_H
+
 
 #include "RESTAPI_SecurityObjects.h"
 #include "framework/OpenWifiTypes.h"
@@ -27,7 +29,7 @@ namespace OpenWifi::FMSObjects {
         std::string     location;
         std::string     uploader;
         std::string     digest;
-        bool            latest=false;
+        bool            latest=0;
         SecurityObjects::NoteInfoVec    notes;
         uint64_t        created=0;
 
@@ -125,35 +127,7 @@ namespace OpenWifi::FMSObjects {
         void reset();
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
     };
-
-    struct DeviceInformation {
-        std::string                 serialNumber;
-        RevisionHistoryEntryList    history;
-        std::string                 currentFirmware;
-        uint64_t                    currentFirmwareDate=0;
-        std::string                 latestFirmware;
-        uint64_t                    latestFirmwareDate=0;
-        bool                        latestFirmwareAvailable;
-        std::string                 latestFirmwareURI;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct DeviceCurrentInfo {
-        std::string                 serialNumber;
-        std::string                 revision;
-        uint64_t                    upgraded=0;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct DeviceCurrentInfoList {
-        std::vector<DeviceCurrentInfo>  devices;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
 }
+
+
+#endif //UCENTRALFMS_RESTAPI_FMSOBJECTS_H

src/RESTObjects/RESTAPI_GWobjects.cpp

@@ -11,13 +11,12 @@
 
 #include "Daemon.h"
 #ifdef	TIP_GATEWAY_SERVICE
-#include "AP_WS_Server.h"
+#include "DeviceRegistry.h"
 #include "CapabilitiesCache.h"
 #endif
 
 #include "RESTAPI_GWobjects.h"
-#include "framework/RESTAPI_utils.h"
-#include "framework/utils.h"
+#include "framework/MicroService.h"
 
 using OpenWifi::RESTAPI_utils::field_to_json;
 using OpenWifi::RESTAPI_utils::field_from_json;
@@ -28,7 +27,7 @@ namespace OpenWifi::GWObjects {
 	void Device::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj,"serialNumber", SerialNumber);
 #ifdef TIP_GATEWAY_SERVICE
-		field_to_json(Obj,"deviceType", CapabilitiesCache::instance()->GetPlatform(Compatible));
+		field_to_json(Obj,"deviceType", CapabilitiesCache::instance()->Get(Compatible));
 #endif
 		field_to_json(Obj,"macAddress", MACAddress);
 		field_to_json(Obj,"manufacturer", Manufacturer);
@@ -46,14 +45,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj,"compatible", Compatible);
 		field_to_json(Obj,"fwUpdatePolicy", FWUpdatePolicy);
 		field_to_json(Obj,"devicePassword", DevicePassword);
-		field_to_json(Obj,"subscriber", subscriber);
-		field_to_json(Obj,"entity", entity);
-		field_to_json(Obj,"modified", modified);
-		field_to_json(Obj,"locale", locale);
-		field_to_json(Obj,"restrictedDevice", restrictedDevice);
-		field_to_json(Obj,"pendingConfiguration", pendingConfiguration);
-		field_to_json(Obj,"pendingConfigurationCmd", pendingConfigurationCmd);
-		field_to_json(Obj,"restrictionDetails", restrictionDetails);
 	}
 
 	void Device::to_json_with_status(Poco::JSON::Object &Obj) const {
@@ -62,7 +53,7 @@ namespace OpenWifi::GWObjects {
 #ifdef TIP_GATEWAY_SERVICE
 		ConnectionState ConState;
 
-		if (AP_WS_Server()->GetState(SerialNumber, ConState)) {
+		if (DeviceRegistry()->GetState(SerialNumber, ConState)) {
 			ConState.to_json(Obj);
 		} else {
 			field_to_json(Obj,"ipAddress", "");
@@ -74,12 +65,11 @@ namespace OpenWifi::GWObjects {
 			field_to_json(Obj,"verifiedCertificate", "NO_CERTIFICATE");
 			field_to_json(Obj,"associations_2G", (uint64_t) 0);
 			field_to_json(Obj,"associations_5G", (uint64_t) 0);
-			field_to_json(Obj,"associations_6G", (uint64_t) 0);
 		}
 #endif
 	}
 
-	bool Device::from_json(const Poco::JSON::Object::Ptr &Obj) {
+	bool Device::from_json(Poco::JSON::Object::Ptr &Obj) {
 		try {
 			field_from_json(Obj,"serialNumber",SerialNumber);
 			field_from_json(Obj,"deviceType",DeviceType);
@@ -91,13 +81,6 @@ namespace OpenWifi::GWObjects {
 			field_from_json(Obj,"location",Location);
 			field_from_json(Obj,"venue",Venue);
 			field_from_json(Obj,"compatible",Compatible);
-			field_from_json(Obj,"subscriber", subscriber);
-			field_from_json(Obj,"entity", entity);
-			field_from_json(Obj,"locale", locale);
-			field_from_json(Obj,"restrictedDevice", restrictedDevice);
-			field_from_json(Obj,"pendingConfiguration", pendingConfiguration);
-			field_from_json(Obj,"pendingConfigurationCmd", pendingConfigurationCmd);
-			field_from_json(Obj,"restrictionDetails", restrictionDetails);
 			return true;
 		} catch (const Poco::Exception &E) {
 		}
@@ -166,7 +149,7 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj,"executionTime", executionTime);
 	}
 
-	bool DefaultConfiguration::from_json(const Poco::JSON::Object::Ptr &Obj) {
+	bool DefaultConfiguration::from_json(Poco::JSON::Object::Ptr &Obj) {
 		try {
 			field_from_json(Obj,"name",Name);
 			field_from_json(Obj,"configuration",Configuration);
@@ -185,7 +168,7 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj,"created", created);
 	}
 
-	bool BlackListedDevice::from_json(const Poco::JSON::Object::Ptr &Obj) {
+	bool BlackListedDevice::from_json(Poco::JSON::Object::Ptr &Obj) {
 		try {
 			field_from_json(Obj,"serialNumber",serialNumber);
 			field_from_json(Obj,"author",author);
@@ -208,17 +191,10 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj,"lastContact", LastContact);
 		field_to_json(Obj,"associations_2G", Associations_2G);
 		field_to_json(Obj,"associations_5G", Associations_5G);
-		field_to_json(Obj,"associations_6G", Associations_6G);
 		field_to_json(Obj,"webSocketClients", webSocketClients);
 		field_to_json(Obj,"websocketPackets", websocketPackets);
 		field_to_json(Obj,"kafkaClients", kafkaClients);
 		field_to_json(Obj,"kafkaPackets", kafkaPackets);
-		field_to_json(Obj,"locale", locale);
-		field_to_json(Obj,"started", started);
-		field_to_json(Obj,"sessionId", sessionId);
-		field_to_json(Obj,"connectionCompletionTime", connectionCompletionTime);
-		field_to_json(Obj,"totalConnectionTime", Utils::Now() - started);
-		field_to_json(Obj,"certificateExpiryDate", certificateExpiryDate);
 
 		switch(VerifiedCertificate) {
 			case NO_CERTIFICATE:
@@ -234,23 +210,6 @@ namespace OpenWifi::GWObjects {
 		}
 	}
 
-	void DeviceConnectionStatistics::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"averageConnectionTime", averageConnectionTime);
-		field_to_json(Obj,"connectedDevices", connectedDevices );
-		field_to_json(Obj,"connectingDevices", connectingDevices );
-	}
-
-	bool DeviceConnectionStatistics::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj,"averageConnectionTime", averageConnectionTime);
-			field_from_json(Obj,"connectedDevices", connectedDevices );
-			field_from_json(Obj,"connectingDevices", connectingDevices );
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
 	void RttySessionDetails::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj,"serialNumber", SerialNumber);
 		field_to_json(Obj,"server", Server);
@@ -297,7 +256,7 @@ namespace OpenWifi::GWObjects {
 		lastContact.clear();
 		associations.clear();
 		numberOfDevices = 0 ;
-		snapshot = Utils::Now();
+		snapshot = std::time(nullptr);
 	}
 
 	void CapabilitiesModel::to_json(Poco::JSON::Object &Obj) const{
@@ -305,243 +264,5 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj,"capabilities", capabilities);
 	};
 
-	void ScriptRequest::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"serialNumber",serialNumber);
-		field_to_json(Obj,"timeout",timeout);
-		field_to_json(Obj,"type",type);
-		field_to_json(Obj,"scriptId",scriptId);
-		field_to_json(Obj,"script",script);
-		field_to_json(Obj,"when",when);
-		field_to_json(Obj,"signature", signature);
-		field_to_json(Obj,"deferred", deferred);
-		field_to_json(Obj,"uri", uri);
-	}
-
-	bool ScriptRequest::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj,"serialNumber",serialNumber);
-			field_from_json(Obj,"timeout",timeout);
-			field_from_json(Obj,"type",type);
-			field_from_json(Obj,"script",script);
-			field_from_json(Obj,"scriptId",scriptId);
-			field_from_json(Obj,"when",when);
-			field_from_json(Obj,"signature", signature);
-			field_from_json(Obj,"deferred", deferred);
-			field_from_json(Obj,"uri", uri);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	void RadiusProxyPoolList::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"pools",pools);
-	}
-
-	bool RadiusProxyPoolList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj,"pools",pools);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	void RadiusProxyPool::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"name",name);
-		field_to_json(Obj,"description",description);
-		field_to_json(Obj,"authConfig",authConfig);
-		field_to_json(Obj,"acctConfig",acctConfig);
-		field_to_json(Obj,"coaConfig",coaConfig);
-		field_to_json(Obj,"useByDefault",useByDefault);
-	}
-
-	bool RadiusProxyPool::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj,"name",name);
-			field_from_json(Obj,"description",description);
-			field_from_json(Obj,"authConfig",authConfig);
-			field_from_json(Obj,"acctConfig",acctConfig);
-			field_from_json(Obj,"coaConfig",coaConfig);
-			field_from_json(Obj,"useByDefault",useByDefault);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	void RadiusProxyServerConfig::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"strategy",strategy);
-		field_to_json(Obj,"monitor",monitor);
-		field_to_json(Obj,"monitorMethod",monitorMethod);
-		field_to_json(Obj,"methodParameters",methodParameters);
-		field_to_json(Obj,"servers",servers);
-	}
-
-	bool RadiusProxyServerConfig::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj,"strategy",strategy);
-			field_from_json(Obj,"monitor",monitor);
-			field_from_json(Obj,"monitorMethod",monitorMethod);
-			field_from_json(Obj,"methodParameters",methodParameters);
-			field_from_json(Obj,"servers",servers);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	void RadiusProxyServerEntry::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"name",name);
-		field_to_json(Obj,"ip",ip);
-		field_to_json(Obj,"port",port);
-		field_to_json(Obj,"weight",weight);
-		field_to_json(Obj,"secret",secret);
-		field_to_json(Obj,"certificate",certificate);
-		field_to_json(Obj,"radsec",radsec);
-		field_to_json(Obj,"allowSelfSigned",allowSelfSigned);
-		field_to_json(Obj,"radsecPort",radsecPort);
-		field_to_json(Obj,"radsecSecret",radsecSecret);
-		field_to_json(Obj,"radsecCacerts",radsecCacerts);
-		field_to_json(Obj,"radsecCert",radsecCert);
-		field_to_json(Obj,"radsecKey",radsecKey);
-		field_to_json(Obj,"radsecRealms",radsecRealms);
-		field_to_json(Obj,"ignore",ignore);
-	}
-
-	bool RadiusProxyServerEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj,"name",name);
-			field_from_json(Obj,"ip",ip);
-			field_from_json(Obj,"port",port);
-			field_from_json(Obj,"weight",weight);
-			field_from_json(Obj,"secret",secret);
-			field_from_json(Obj,"certificate",certificate);
-			field_from_json(Obj,"radsec",radsec);
-			field_from_json(Obj,"allowSelfSigned",allowSelfSigned);
-			field_from_json(Obj,"radsecSecret",radsecSecret);
-			field_from_json(Obj,"radsecPort",radsecPort);
-			field_from_json(Obj,"radsecCacerts",radsecCacerts);
-			field_from_json(Obj,"radsecCert",radsecCert);
-			field_from_json(Obj,"radsecKey",radsecKey);
-			field_from_json(Obj,"radsecRealms",radsecRealms);
-			field_from_json(Obj,"ignore",ignore);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	void ScriptEntry::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"id", id);
-		field_to_json(Obj,"name", name);
-		field_to_json(Obj,"description", description);
-		field_to_json(Obj,"uri", uri);
-		field_to_json(Obj,"content", content);
-		field_to_json(Obj,"version", version);
-		field_to_json(Obj,"type", type);
-		field_to_json(Obj,"created", created);
-		field_to_json(Obj,"modified", modified);
-		field_to_json(Obj,"author", author);
-		field_to_json(Obj,"restricted", restricted);
-		field_to_json(Obj,"deferred", deferred);
-		field_to_json(Obj,"timeout", timeout);
-		field_to_json(Obj,"defaultUploadURI", defaultUploadURI);
-	}
-
-	bool ScriptEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj,"id", id);
-			field_from_json(Obj,"name", name);
-			field_from_json(Obj,"description", description);
-			field_from_json(Obj,"uri", uri);
-			field_from_json(Obj,"content", content);
-			field_from_json(Obj,"version", version);
-			field_from_json(Obj,"type", type);
-			field_from_json(Obj,"created", created);
-			field_from_json(Obj,"modified", modified);
-			field_from_json(Obj,"author", author);
-			field_from_json(Obj,"restricted", restricted);
-			field_from_json(Obj,"deferred", deferred);
-			field_from_json(Obj,"timeout", timeout);
-			field_from_json(Obj,"defaultUploadURI", defaultUploadURI);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	void ScriptEntryList::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"scripts",scripts);
-	}
-
-	bool ScriptEntryList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj,"scripts",scripts);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	void DeviceRestrictionsKeyInfo::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"vendor", vendor);
-		field_to_json(Obj,"algo", algo);
-	}
-
-	bool DeviceRestrictionsKeyInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj,"vendor", vendor);
-			field_from_json(Obj,"algo", algo);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-
-	}
-
-	void DeviceRestrictions::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"dfs", dfs);
-		field_to_json(Obj,"ssh", ssh);
-		field_to_json(Obj,"rtty", rtty);
-		field_to_json(Obj,"tty", tty);
-		field_to_json(Obj,"developer", developer);
-		field_to_json(Obj,"upgrade", upgrade);
-		field_to_json(Obj,"commands", commands);
-		field_to_json(Obj,"country", country);
-		field_to_json(Obj,"key_info", key_info);
-	}
-
-	bool DeviceRestrictions::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj,"dfs", dfs);
-			field_from_json(Obj,"ssh", ssh);
-			field_from_json(Obj,"rtty", rtty);
-			field_from_json(Obj,"tty", tty);
-			field_from_json(Obj,"developer", developer);
-			field_from_json(Obj,"upgrade", upgrade);
-			field_from_json(Obj,"commands", commands);
-			field_from_json(Obj,"country", country);
-			field_from_json(Obj,"key_info", key_info);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	bool DeviceRestrictionsKeyInfo::operator!=(const OpenWifi::GWObjects::DeviceRestrictionsKeyInfo &T) const {
-		return (T.algo!=algo) || (T.vendor!=vendor);
-	}
-
-	bool DeviceRestrictions::operator!=(const OpenWifi::GWObjects::DeviceRestrictions &T) const {
-		return (	(T.dfs!=dfs)					||
-					(T.rtty!=rtty)					||
-					(T.upgrade!=upgrade)		||
-					(T.commands != commands)		||
-					(T.developer != developer)		||
-					(T.ssh !=ssh) 					||
-					(T.key_info != key_info)		||
-					(T.country != country) );
-	}
 }
 

src/RESTObjects/RESTAPI_GWobjects.h

@@ -28,7 +28,6 @@ namespace OpenWifi::GWObjects {
 		uint64_t TX = 0, RX = 0;
 		uint64_t Associations_2G=0;
 		uint64_t Associations_5G=0;
-		uint64_t Associations_6G=0;
 		bool Connected = false;
 		uint64_t LastContact=0;
 		std::string Firmware;
@@ -38,42 +37,9 @@ namespace OpenWifi::GWObjects {
 		uint64_t 	webSocketClients=0;
 		uint64_t 	kafkaPackets=0;
 		uint64_t 	websocketPackets=0;
-		std::string 	locale;
-		uint64_t 		started=0;
-		uint64_t 		sessionId=0;
-		double      	connectionCompletionTime=0.0;
-		std::uint64_t	certificateExpiryDate=0;
-
 		void to_json(Poco::JSON::Object &Obj) const;
 	};
 
-	struct DeviceRestrictionsKeyInfo {
-		std::string 	vendor;
-		std::string 	algo;
-
-		bool operator !=(const DeviceRestrictionsKeyInfo &b) const;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct DeviceRestrictions {
-		bool    					dfs = false;
-		bool    					ssh = false;
-		bool    					rtty = false;
-		bool    					tty = false;
-		bool    					developer = false;
-		bool    					upgrade = false;
-		bool    					commands = false;
-		std::vector<std::string>   	country;
-		DeviceRestrictionsKeyInfo	key_info;
-
-		bool operator !=(const DeviceRestrictions &D) const;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
 	struct Device {
 		std::string SerialNumber;
 		std::string DeviceType;
@@ -93,30 +59,12 @@ namespace OpenWifi::GWObjects {
 		uint64_t LastFWUpdate = 0 ;
 		std::string Venue;
 		std::string DevicePassword;
-		std::string subscriber;
-		std::string entity;
-		uint64_t 	modified=0;
-		std::string locale;
-		bool 		restrictedDevice=false;
-		std::string pendingConfiguration;
-		std::string pendingConfigurationCmd;
-		DeviceRestrictions	restrictionDetails;
-
 		void to_json(Poco::JSON::Object &Obj) const;
 		void to_json_with_status(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+		bool from_json(Poco::JSON::Object::Ptr &Obj);
 		void Print() const;
 	};
 
-	struct DeviceConnectionStatistics {
-		std::uint64_t connectedDevices = 0;
-		std::uint64_t averageConnectionTime = 0;
-		std::uint64_t connectingDevices = 0;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
 	struct Statistics {
 		std::string SerialNumber;
 		uint64_t 	UUID = 0 ;
@@ -170,7 +118,7 @@ namespace OpenWifi::GWObjects {
 		uint64_t 	Created;
 		uint64_t 	LastModified;
 		void 		to_json(Poco::JSON::Object &Obj) const;
-		bool 		from_json(const Poco::JSON::Object::Ptr &Obj);
+		bool 		from_json(Poco::JSON::Object::Ptr &Obj);
 	};
 
 	struct CommandDetails {
@@ -202,7 +150,7 @@ namespace OpenWifi::GWObjects {
 		std::string author;
 		uint64_t created;
 		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+		bool from_json(Poco::JSON::Object::Ptr &Obj);
 	};
 
 	struct RttySessionDetails {
@@ -245,98 +193,4 @@ namespace OpenWifi::GWObjects {
 
 		void to_json(Poco::JSON::Object &Obj) const;
 	};
-
-	struct ScriptEntry {
-		std::string 		id;
-		std::string 		name;
-		std::string 		description;
-		std::string 		uri;
-		std::string 		content;
-		std::string 		version;
-		std::string 		type;
-		std::uint64_t 		created;
-		std::uint64_t 		modified;
-		std::string 		author;
-		Types::StringVec 	restricted;
-		bool				deferred=false;
-		std::uint64_t 		timeout=30;
-		std::string 		defaultUploadURI;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct ScriptEntryList {
-		std::vector<ScriptEntry>	scripts;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct ScriptRequest {
-		std::string serialNumber;
-		uint64_t 	timeout=30;
-		std::string type;
-		std::string script;
-		std::string scriptId;
-		std::uint64_t when;
-		std::string signature;
-		bool deferred;
-		std::string uri;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct RadiusProxyServerEntry {
-		std::string name;
-		std::string ip;
-		uint16_t 	port=0;
-		uint64_t 	weight=0;
-		std::string secret;
-		std::string certificate;
-		bool 		radsec=false;
-		bool 		allowSelfSigned=false;
-		uint16_t 	radsecPort=2083;
-		std::string radsecSecret;
-		std::string radsecKey;
-		std::string radsecCert;
-		std::vector<std::string> 	radsecCacerts;
-		std::vector<std::string>	radsecRealms;
-		bool 		ignore=false;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct RadiusProxyServerConfig {
-		std::string 	strategy;
-		bool 			monitor=false;
-		std::string 	monitorMethod;
-		std::vector<std::string>	methodParameters;
-		std::vector<RadiusProxyServerEntry>	servers;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct 	RadiusProxyPool {
-		std::string name;
-		std::string description;
-		RadiusProxyServerConfig	authConfig;
-		RadiusProxyServerConfig	acctConfig;
-		RadiusProxyServerConfig	coaConfig;
-		bool 		useByDefault=false;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct RadiusProxyPoolList {
-		std::vector<RadiusProxyPool>	pools;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
 }

src/RESTObjects/RESTAPI_OWLSobjects.cpp

@@ -1,110 +0,0 @@
-//
-// Created by stephane bourque on 2021-08-31.
-//
-
-#include "framework/RESTAPI_utils.h"
-
-using OpenWifi::RESTAPI_utils::field_to_json;
-using OpenWifi::RESTAPI_utils::field_from_json;
-using OpenWifi::RESTAPI_utils::EmbedDocument;
-
-#include "RESTAPI_OWLSobjects.h"
-
-// SIM -> 0x53/0x073, 0x49/0x69, 0x4d/0x6d
-
-namespace OpenWifi::OWLSObjects {
-
-    void SimulationDetails::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"id", id);
-        field_to_json(Obj,"name", name);
-        field_to_json(Obj,"gateway", gateway);
-        field_to_json(Obj,"certificate", certificate);
-        field_to_json(Obj,"key", key);
-        field_to_json(Obj,"macPrefix", macPrefix);
-        field_to_json(Obj,"deviceType", deviceType);
-        field_to_json(Obj,"devices", devices);
-        field_to_json(Obj,"healthCheckInterval", healthCheckInterval);
-        field_to_json(Obj,"stateInterval", stateInterval);
-        field_to_json(Obj,"minAssociations", minAssociations);
-        field_to_json(Obj,"maxAssociations", maxAssociations);
-        field_to_json(Obj,"minClients", minClients);
-        field_to_json(Obj,"maxClients", maxClients);
-        field_to_json(Obj,"simulationLength", simulationLength);
-        field_to_json(Obj,"threads", threads);
-        field_to_json(Obj,"clientInterval", clientInterval);
-        field_to_json(Obj,"keepAlive", keepAlive);
-        field_to_json(Obj,"reconnectInterval", reconnectInterval);
-        field_to_json(Obj,"concurrentDevices", concurrentDevices);
-    }
-
-    bool SimulationDetails::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"id", id);
-            field_from_json(Obj,"name", name);
-            field_from_json(Obj,"gateway", gateway);
-            field_from_json(Obj,"certificate", certificate);
-            field_from_json(Obj,"key", key);
-            field_from_json(Obj,"macPrefix", macPrefix);
-            field_from_json(Obj,"deviceType", deviceType);
-            field_from_json(Obj,"devices", devices);
-            field_from_json(Obj,"healthCheckInterval", healthCheckInterval);
-            field_from_json(Obj,"stateInterval", stateInterval);
-            field_from_json(Obj,"minAssociations", minAssociations);
-            field_from_json(Obj,"maxAssociations", maxAssociations);
-            field_from_json(Obj,"minClients", minClients);
-            field_from_json(Obj,"maxClients", maxClients);
-            field_from_json(Obj,"simulationLength", simulationLength);
-            field_from_json(Obj,"threads", threads);
-            field_from_json(Obj,"clientInterval", clientInterval);
-            field_from_json(Obj,"keepAlive", keepAlive);
-            field_from_json(Obj,"reconnectInterval", reconnectInterval);
-            field_from_json(Obj,"concurrentDevices", concurrentDevices);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void SimulationDetailsList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"list", list);
-    }
-
-    bool SimulationDetailsList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"list", list);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void SimulationStatus::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"id", id);
-        field_to_json(Obj,"simulationId", simulationId);
-        field_to_json(Obj,"state", state);
-        field_to_json(Obj,"tx", tx);
-        field_to_json(Obj,"rx", rx);
-        field_to_json(Obj,"msgsTx", msgsTx);
-        field_to_json(Obj,"msgsRx", msgsRx);
-        field_to_json(Obj,"liveDevices", liveDevices);
-        field_to_json(Obj,"timeToFullDevices", timeToFullDevices);
-        field_to_json(Obj,"startTime", startTime);
-        field_to_json(Obj,"endTime", endTime);
-        field_to_json(Obj,"errorDevices", errorDevices);
-        field_to_json(Obj,"owner", owner);
-    }
-
-    void Dashboard::to_json([[maybe_unused]] Poco::JSON::Object &Obj) const {
-
-    }
-
-    bool Dashboard::from_json([[maybe_unused]] const Poco::JSON::Object::Ptr &Obj) {
-        return true;
-    }
-
-    void Dashboard::reset() {
-
-    }
-}

src/RESTObjects/RESTAPI_OWLSobjects.h

@@ -1,77 +0,0 @@
-//
-// Created by stephane bourque on 2021-08-31.
-//
-
-#ifndef UCENTRALSIM_RESTAPI_OWLSOBJECTS_H
-#define UCENTRALSIM_RESTAPI_OWLSOBJECTS_H
-
-#include <vector>
-#include "Poco/JSON/Object.h"
-
-namespace OpenWifi::OWLSObjects {
-
-    struct SimulationDetails {
-        std::string     id;
-        std::string     name;
-        std::string     gateway;
-        std::string     certificate;
-        std::string     key;
-        std::string     macPrefix;
-        std::string     deviceType;
-        uint64_t        devices = 5;
-        uint64_t        healthCheckInterval = 60;
-        uint64_t        stateInterval = 60 ;
-        uint64_t        minAssociations = 1;
-        uint64_t        maxAssociations = 3;
-        uint64_t        minClients = 1 ;
-        uint64_t        maxClients = 3;
-        uint64_t        simulationLength = 60 * 60;
-        uint64_t        threads = 16;
-        uint64_t        clientInterval = 1;
-        uint64_t        keepAlive = 300;
-        uint64_t        reconnectInterval = 30 ;
-        uint64_t        concurrentDevices = 5;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct SimulationDetailsList {
-        std::vector<SimulationDetails>  list;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct SimulationStatus {
-        std::string     id;
-        std::string     simulationId;
-        std::string     state;
-        uint64_t        tx;
-        uint64_t        rx;
-        uint64_t        msgsTx;
-        uint64_t        msgsRx;
-        uint64_t        liveDevices;
-        uint64_t        timeToFullDevices;
-        uint64_t        startTime;
-        uint64_t        endTime;
-        uint64_t        errorDevices;
-        std::string     owner;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-    };
-
-
-    struct Dashboard {
-        int O;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        void reset();
-
-    };
-
-}
-
-
-#endif //UCENTRALSIM_RESTAPI_OWLSOBJECTS_H

src/RESTObjects/RESTAPI_ProvObjects.cpp

@@ -8,9 +8,7 @@
 
 
 #include "RESTAPI_ProvObjects.h"
-#include "framework/RESTAPI_utils.h"
-#include "framework/MicroServiceFuncs.h"
-#include "framework/utils.h"
+#include "framework/MicroService.h"
 
 using OpenWifi::RESTAPI_utils::field_to_json;
 using OpenWifi::RESTAPI_utils::field_from_json;
@@ -93,13 +91,8 @@ namespace OpenWifi::ProvObjects {
         field_to_json( Obj,"managementPolicy",managementPolicy);
         field_to_json( Obj,"deviceConfiguration",deviceConfiguration);
         field_to_json( Obj,"devices",devices);
-        field_to_json( Obj,"deviceRules",deviceRules);
+        field_to_json( Obj,"rrm",rrm);
         field_to_json( Obj,"sourceIP",sourceIP);
-        field_to_json( Obj,"variables", variables);
-        field_to_json( Obj,"managementPolicies", managementPolicies);
-        field_to_json( Obj,"managementRoles", managementRoles);
-        field_to_json( Obj,"maps", maps);
-        field_to_json( Obj,"configurations", configurations);
     }
 
     bool Entity::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -113,13 +106,8 @@ namespace OpenWifi::ProvObjects {
             field_from_json( Obj,"managementPolicy",managementPolicy);
             field_from_json( Obj,"deviceConfiguration",deviceConfiguration);
             field_from_json( Obj,"devices",devices);
-            field_from_json( Obj,"deviceRules",deviceRules);
+            field_from_json( Obj,"rrm",rrm);
             field_from_json( Obj,"sourceIP",sourceIP);
-            field_from_json( Obj,"variables", variables);
-            field_from_json( Obj,"managementPolicies", managementPolicies);
-            field_from_json( Obj,"managementRoles", managementRoles);
-            field_from_json( Obj,"maps", maps);
-            field_from_json( Obj,"configurations", configurations);
             return true;
         } catch(...) {
 
@@ -154,16 +142,10 @@ namespace OpenWifi::ProvObjects {
         field_to_json( Obj,"design",design);
         field_to_json( Obj,"managementPolicy",managementPolicy);
         field_to_json( Obj,"deviceConfiguration",deviceConfiguration);
-        field_to_json( Obj,"contacts",contacts);
+        field_to_json( Obj,"contact",contact);
         field_to_json( Obj,"location",location);
-        field_to_json( Obj,"deviceRules",deviceRules);
+        field_to_json( Obj,"rrm",rrm);
         field_to_json( Obj,"sourceIP",sourceIP);
-        field_to_json( Obj,"variables", variables);
-        field_to_json( Obj,"managementPolicies", managementPolicies);
-        field_to_json( Obj,"managementRoles", managementRoles);
-        field_to_json( Obj,"maps", maps);
-        field_to_json( Obj,"configurations", configurations);
-        field_to_json( Obj,"boards", boards);
     }
 
     bool Venue::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -178,16 +160,10 @@ namespace OpenWifi::ProvObjects {
             field_from_json( Obj,"design",design);
             field_from_json( Obj,"managementPolicy",managementPolicy);
             field_from_json( Obj,"deviceConfiguration",deviceConfiguration);
-            field_from_json( Obj,"contacts",contacts);
+            field_from_json( Obj,"contact",contact);
             field_from_json( Obj,"location",location);
-            field_from_json( Obj,"deviceRules",deviceRules);
+            field_from_json( Obj,"rrm",rrm);
             field_from_json( Obj,"sourceIP",sourceIP);
-            field_from_json( Obj,"variables", variables);
-            field_from_json( Obj,"managementPolicies", managementPolicies);
-            field_from_json( Obj,"managementRoles", managementRoles);
-            field_from_json( Obj,"maps", maps);
-            field_from_json( Obj,"configurations", configurations);
-            field_from_json( Obj,"boards", boards);
             return true;
         } catch (...) {
 
@@ -195,89 +171,6 @@ namespace OpenWifi::ProvObjects {
         return false;
     }
 
-    void Operator::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json( Obj,"managementPolicy",managementPolicy);
-        field_to_json( Obj,"managementRoles",managementRoles);
-        field_to_json( Obj,"deviceRules",deviceRules);
-        field_to_json( Obj,"variables",variables);
-        field_to_json( Obj,"defaultOperator",defaultOperator);
-        field_to_json( Obj,"sourceIP",sourceIP);
-        field_to_json( Obj,"registrationId",registrationId);
-    }
-
-    bool Operator::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json( Obj,"managementPolicy",managementPolicy);
-            field_from_json( Obj,"managementRoles",managementRoles);
-            field_from_json( Obj,"deviceRules",deviceRules);
-            field_from_json( Obj,"variables",variables);
-            field_from_json( Obj,"defaultOperator",defaultOperator);
-            field_from_json( Obj,"sourceIP",sourceIP);
-            field_from_json( Obj,"registrationId",registrationId);
-            return true;
-        } catch(...) {
-        }
-        return false;
-    }
-
-    void OperatorList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj,"operators",operators);
-    }
-
-    bool OperatorList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"operators",operators);
-            return true;
-        } catch(...) {
-        }
-        return false;
-    }
-
-    void ServiceClass::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json( Obj,"operatorId",operatorId);
-        field_to_json( Obj,"managementPolicy",managementPolicy);
-        field_to_json( Obj,"cost",cost);
-        field_to_json( Obj,"currency",currency);
-        field_to_json( Obj,"period",period);
-        field_to_json( Obj,"billingCode",billingCode);
-        field_to_json( Obj,"variables",variables);
-        field_to_json( Obj,"defaultService",defaultService);
-    }
-
-    bool ServiceClass::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json( Obj,"operatorId",operatorId);
-            field_from_json( Obj,"managementPolicy",managementPolicy);
-            field_from_json( Obj,"cost",cost);
-            field_from_json( Obj,"currency",currency);
-            field_from_json( Obj,"period",period);
-            field_from_json( Obj,"billingCode",billingCode);
-            field_from_json( Obj,"variables",variables);
-            field_from_json( Obj,"defaultService",defaultService);
-            return true;
-        } catch(...) {
-        }
-        return false;
-
-    }
-
-    void ServiceClassList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj,"serviceClasses",serviceClasses);
-    }
-
-    bool ServiceClassList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"serviceClasses",serviceClasses);
-            return true;
-        } catch(...) {
-        }
-        return false;
-    }
-
     void UserInfoDigest::to_json(Poco::JSON::Object &Obj) const {
         field_to_json( Obj,"id",id);
         field_to_json( Obj,"entity",loginId);
@@ -300,7 +193,6 @@ namespace OpenWifi::ProvObjects {
         field_to_json( Obj,"managementPolicy",managementPolicy);
         field_to_json( Obj,"users",users);
         field_to_json( Obj,"entity",entity);
-        field_to_json( Obj,"venue",venue);
     }
 
     bool ManagementRole::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -309,7 +201,6 @@ namespace OpenWifi::ProvObjects {
             field_from_json( Obj,"managementPolicy",managementPolicy);
             field_from_json( Obj,"users",users);
             field_from_json( Obj,"entity",entity);
-            field_from_json( Obj,"venue",venue);
             return true;
         } catch(...) {
         }
@@ -358,92 +249,6 @@ namespace OpenWifi::ProvObjects {
         return false;
     }
 
-    void OperatorLocation::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json( Obj,"type",type);
-        field_to_json( Obj,"buildingName",buildingName);
-        field_to_json( Obj,"addressLines",addressLines);
-        field_to_json( Obj,"city",city);
-        field_to_json( Obj,"state",state);
-        field_to_json( Obj,"postal",postal);
-        field_to_json( Obj,"country",country);
-        field_to_json( Obj,"phones",phones);
-        field_to_json( Obj,"mobiles",mobiles);
-        field_to_json( Obj,"geoCode",geoCode);
-        field_to_json( Obj,"operatorId",operatorId);
-        field_to_json( Obj,"subscriberDeviceId",subscriberDeviceId);
-        field_to_json( Obj,"managementPolicy",managementPolicy);
-    }
-
-    bool OperatorLocation::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json( Obj,"type", type);
-            field_from_json( Obj,"buildingName",buildingName);
-            field_from_json( Obj,"addressLines",addressLines);
-            field_from_json( Obj,"city",city);
-            field_from_json( Obj,"state",state);
-            field_from_json( Obj,"postal",postal);
-            field_from_json( Obj,"country",country);
-            field_from_json( Obj,"phones",phones);
-            field_from_json( Obj,"mobiles",mobiles);
-            field_from_json( Obj,"geoCode",geoCode);
-            field_from_json( Obj,"operatorId",operatorId);
-            field_from_json( Obj,"subscriberDeviceId",subscriberDeviceId);
-            field_from_json( Obj,"managementPolicy",managementPolicy);
-            return true;
-        } catch (...) {
-
-        }
-        return false;
-    }
-
-    void SubLocation::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj,"type",type);
-        field_to_json( Obj,"buildingName",buildingName);
-        field_to_json( Obj,"addressLines",addressLines);
-        field_to_json( Obj,"city",city);
-        field_to_json( Obj,"state",state);
-        field_to_json( Obj,"postal",postal);
-        field_to_json( Obj,"country",country);
-        field_to_json( Obj,"phones",phones);
-        field_to_json( Obj,"mobiles",mobiles);
-        field_to_json( Obj,"geoCode",geoCode);
-    }
-
-    bool SubLocation::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"type", type);
-            field_from_json( Obj,"buildingName",buildingName);
-            field_from_json( Obj,"addressLines",addressLines);
-            field_from_json( Obj,"city",city);
-            field_from_json( Obj,"state",state);
-            field_from_json( Obj,"postal",postal);
-            field_from_json( Obj,"country",country);
-            field_from_json( Obj,"phones",phones);
-            field_from_json( Obj,"mobiles",mobiles);
-            field_from_json( Obj,"geoCode",geoCode);
-            return true;
-        } catch (...) {
-
-        }
-        return false;
-    }
-
-    void OperatorLocationList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj, "locations", locations);
-    }
-
-    bool OperatorLocationList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj, "locations", locations);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
     void Contact::to_json(Poco::JSON::Object &Obj) const {
         info.to_json(Obj);
         field_to_json( Obj,"type", to_string(type));
@@ -490,119 +295,21 @@ namespace OpenWifi::ProvObjects {
         return false;
     }
 
-    void OperatorContact::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json( Obj,"type", type);
-        field_to_json( Obj,"title",title);
-        field_to_json( Obj,"salutation",salutation);
-        field_to_json( Obj,"firstname",firstname);
-        field_to_json( Obj,"lastname",lastname);
-        field_to_json( Obj,"initials",initials);
-        field_to_json( Obj,"visual",visual);
-        field_to_json( Obj,"mobiles",mobiles);
-        field_to_json( Obj,"phones",phones);
-        field_to_json( Obj,"primaryEmail",primaryEmail);
-        field_to_json( Obj,"secondaryEmail",secondaryEmail);
-        field_to_json( Obj,"accessPIN",accessPIN);
-        field_to_json( Obj,"operatorId",operatorId);
-        field_to_json( Obj,"subscriberDeviceId",subscriberDeviceId);
-        field_to_json( Obj,"managementPolicy",managementPolicy);
-    }
-
-    bool OperatorContact::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json( Obj,"type", type);
-            field_from_json( Obj,"title",title);
-            field_from_json( Obj,"salutation",salutation);
-            field_from_json( Obj,"firstname",firstname);
-            field_from_json( Obj,"lastname",lastname);
-            field_from_json( Obj,"initials",initials);
-            field_from_json( Obj,"visual",visual);
-            field_from_json( Obj,"mobiles",mobiles);
-            field_from_json( Obj,"phones",phones);
-            field_from_json( Obj,"primaryEmail",primaryEmail);
-            field_from_json( Obj,"secondaryEmail",secondaryEmail);
-            field_from_json( Obj,"accessPIN",accessPIN);
-            field_from_json( Obj,"operatorId",operatorId);
-            field_from_json( Obj,"subscriberDeviceId",subscriberDeviceId);
-            field_from_json( Obj,"managementPolicy",managementPolicy);
-            return true;
-        } catch (...) {
-
-        }
-        return false;
-    }
-
-    void SubContact::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj,"type", type);
-        field_to_json( Obj,"title",title);
-        field_to_json( Obj,"salutation",salutation);
-        field_to_json( Obj,"firstname",firstname);
-        field_to_json( Obj,"lastname",lastname);
-        field_to_json( Obj,"initials",initials);
-        field_to_json( Obj,"visual",visual);
-        field_to_json( Obj,"mobiles",mobiles);
-        field_to_json( Obj,"phones",phones);
-        field_to_json( Obj,"primaryEmail",primaryEmail);
-        field_to_json( Obj,"secondaryEmail",secondaryEmail);
-        field_to_json( Obj,"accessPIN",accessPIN);
-    }
-
-    bool SubContact::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"type", type);
-            field_from_json( Obj,"title",title);
-            field_from_json( Obj,"salutation",salutation);
-            field_from_json( Obj,"firstname",firstname);
-            field_from_json( Obj,"lastname",lastname);
-            field_from_json( Obj,"initials",initials);
-            field_from_json( Obj,"visual",visual);
-            field_from_json( Obj,"mobiles",mobiles);
-            field_from_json( Obj,"phones",phones);
-            field_from_json( Obj,"primaryEmail",primaryEmail);
-            field_from_json( Obj,"secondaryEmail",secondaryEmail);
-            field_from_json( Obj,"accessPIN",accessPIN);
-            return true;
-        } catch (...) {
-
-        }
-        return false;
-    }
-
-    void OperatorContactList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj, "contacts", contacts);
-    }
-
-    bool OperatorContactList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj, "contacts", contacts);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
     void InventoryTag::to_json(Poco::JSON::Object &Obj) const {
         info.to_json(Obj);
-        field_to_json( Obj, "serialNumber", serialNumber);
-        field_to_json( Obj, "venue", venue);
-        field_to_json( Obj, "entity", entity);
-        field_to_json( Obj, "subscriber", subscriber);
-        field_to_json( Obj, "deviceType", deviceType);
-        field_to_json( Obj, "qrCode", qrCode);
-        field_to_json( Obj, "geoCode", geoCode);
-        field_to_json( Obj, "location", location);
-        field_to_json( Obj, "contact", contact);
-        field_to_json( Obj, "deviceConfiguration",deviceConfiguration);
-        field_to_json( Obj,"deviceRules",deviceRules);
-        field_to_json( Obj, "managementPolicy",managementPolicy);
-        field_to_json( Obj, "state",state);
-        field_to_json( Obj, "devClass",devClass);
-        field_to_json( Obj, "locale",locale);
-        field_to_json( Obj, "realMacAddress",realMacAddress);
-        field_to_json( Obj, "doNotAllowOverrides",doNotAllowOverrides);
+        field_to_json(Obj, "serialNumber", serialNumber);
+        field_to_json(Obj, "venue", venue);
+        field_to_json(Obj, "entity", entity);
+        field_to_json(Obj, "subscriber", subscriber);
+        field_to_json(Obj, "deviceType", deviceType);
+        field_to_json(Obj, "qrCode", qrCode);
+        field_to_json(Obj, "geoCode", geoCode);
+        field_to_json(Obj, "location", location);
+        field_to_json(Obj, "contact", contact);
+        field_to_json( Obj,"deviceConfiguration",deviceConfiguration);
+        field_to_json( Obj,"rrm",rrm);
+        field_to_json( Obj,"managementPolicy",managementPolicy);
+        field_to_json( Obj,"state",state);
     }
 
     bool InventoryTag::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -613,18 +320,14 @@ namespace OpenWifi::ProvObjects {
             field_from_json( Obj,"entity",entity);
             field_from_json( Obj,"subscriber",subscriber);
             field_from_json( Obj,"deviceType",deviceType);
-            field_from_json( Obj,"qrCode", qrCode);
+            field_from_json(Obj, "qrCode", qrCode);
             field_from_json( Obj,"geoCode",geoCode);
             field_from_json( Obj,"location",location);
             field_from_json( Obj,"contact",contact);
             field_from_json( Obj,"deviceConfiguration",deviceConfiguration);
-            field_from_json( Obj,"deviceRules",deviceRules);
+            field_from_json( Obj,"rrm",rrm);
             field_from_json( Obj,"managementPolicy",managementPolicy);
             field_from_json( Obj,"state",state);
-            field_from_json( Obj,"devClass",devClass);
-            field_from_json( Obj,"locale",locale);
-            field_from_json( Obj,"realMacAddress",realMacAddress);
-            field_from_json( Obj, "doNotAllowOverrides",doNotAllowOverrides);
             return true;
         } catch(...) {
 
@@ -632,26 +335,6 @@ namespace OpenWifi::ProvObjects {
         return false;
     }
 
-    void InventoryConfigApplyResult::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj, "appliedConfiguration", appliedConfiguration);
-        field_to_json( Obj, "warnings", warnings);
-        field_to_json( Obj, "errors", errors);
-        field_to_json( Obj, "errorCode", errorCode);
-    }
-
-    bool InventoryConfigApplyResult::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj, "appliedConfiguration", appliedConfiguration);
-            field_from_json( Obj, "warnings", warnings);
-            field_from_json( Obj, "errors", errors);
-            field_from_json( Obj, "errorCode", errorCode);
-            return true;
-        } catch (...) {
-
-        }
-        return false;
-    }
-
     void InventoryTagList::to_json(Poco::JSON::Object &Obj) const {
         field_to_json( Obj,"taglist",taglist);
     }
@@ -659,7 +342,7 @@ namespace OpenWifi::ProvObjects {
     bool InventoryTagList::from_json(const Poco::JSON::Object::Ptr &Obj) {
         try {
             field_from_json( Obj,"taglist",taglist);
-            return true;
+            return false;
         } catch (...) {
 
         }
@@ -690,14 +373,12 @@ namespace OpenWifi::ProvObjects {
         info.to_json(Obj);
         field_to_json( Obj,"managementPolicy",managementPolicy);
         field_to_json( Obj,"deviceTypes",deviceTypes);
-        field_to_json( Obj,"subscriberOnly",subscriberOnly);
-        field_to_json( Obj,"entity", entity);
-        field_to_json( Obj,"venue", venue);
-        field_to_json( Obj,"subscriber", subscriber);
         field_to_json( Obj,"configuration",configuration);
         field_to_json( Obj,"inUse",inUse);
         field_to_json( Obj,"variables",variables);
-        field_to_json( Obj,"deviceRules",deviceRules);
+        field_to_json( Obj,"rrm",rrm);
+        field_to_json( Obj,"firmwareUpgrade",firmwareUpgrade);
+        field_to_json( Obj,"firmwareRCOnly",firmwareRCOnly);
     }
 
     bool DeviceConfiguration::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -705,14 +386,12 @@ namespace OpenWifi::ProvObjects {
             info.from_json(Obj);
             field_from_json( Obj,"managementPolicy",managementPolicy);
             field_from_json( Obj,"deviceTypes",deviceTypes);
+            field_from_json( Obj,"configuration",configuration);
             field_from_json( Obj,"inUse",inUse);
             field_from_json( Obj,"variables",variables);
-            field_from_json( Obj,"subscriberOnly",subscriberOnly);
-            field_from_json( Obj,"entity", entity);
-            field_from_json( Obj,"venue", venue);
-            field_from_json( Obj,"subscriber", subscriber);
-            field_from_json( Obj,"configuration",configuration);
-            field_from_json( Obj,"deviceRules",deviceRules);
+            field_from_json( Obj,"rrm",rrm);
+            field_from_json( Obj,"firmwareUpgrade",firmwareUpgrade);
+            field_from_json( Obj,"firmwareRCOnly",firmwareRCOnly);
             return true;
         } catch(...) {
 
@@ -791,16 +470,46 @@ namespace OpenWifi::ProvObjects {
         return false;
     }
 
+    void field_to_json(Poco::JSON::Object &Obj, const char * FieldName, ACLACCESS A) {
+        switch(A) {
+            case READ: Obj.set(FieldName,"read"); break;
+            case MODIFY: Obj.set(FieldName,"modify"); break;
+            case CREATE: Obj.set(FieldName,"create"); break;
+            case DELETE: Obj.set(FieldName,"delete"); break;
+            case NONE:
+                default:
+                    Obj.set(FieldName,"none");
+        }
+    }
+
+    void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char * FieldName, ACLACCESS &A) {
+        if(Obj->has(FieldName)) {
+            auto V = Obj->getValue<std::string>(FieldName);
+            if(V=="read")
+                A = READ;
+            else if(V=="modify")
+                A = MODIFY;
+            else if(V=="create")
+                A = CREATE;
+            else if(V=="delete")
+                A = DELETE;
+            else if(V=="none")
+                A = NONE;
+            else
+                throw Poco::Exception("invalid JSON");
+        }
+    }
+
     void ObjectACL::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "users", users);
-        field_to_json(Obj, "roles", roles);
+        RESTAPI_utils::field_to_json(Obj, "users", users);
+        RESTAPI_utils::field_to_json(Obj, "roles", roles);
         field_to_json(Obj, "access", access);
     }
 
     bool ObjectACL::from_json(const Poco::JSON::Object::Ptr &Obj) {
         try {
-            field_from_json(Obj, "users", users);
-            field_from_json(Obj, "roles", roles);
+            RESTAPI_utils::field_from_json(Obj, "users", users);
+            RESTAPI_utils::field_from_json(Obj, "roles", roles);
             field_from_json(Obj, "access", access);
             return true;
         } catch(...) {
@@ -810,12 +519,12 @@ namespace OpenWifi::ProvObjects {
     }
     
     void ObjectACLList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "list", list);
+        RESTAPI_utils::field_to_json(Obj, "list", list);
     }
 
     bool ObjectACLList::from_json(const Poco::JSON::Object::Ptr &Obj) {
         try {
-            field_from_json(Obj, "list", list);
+            RESTAPI_utils::field_from_json(Obj, "list", list);
             return true;
         } catch(...) {
 
@@ -823,15 +532,44 @@ namespace OpenWifi::ProvObjects {
         return false;
     }
 
+    std::string to_string(VISIBILITY A) {
+        switch(A) {
+            case PUBLIC: return "public";
+            case SELECT: return "select";
+            case PRIVATE:
+            default:
+                return "private";
+        }
+    }
+
+    void field_to_json(Poco::JSON::Object &Obj, const char * FieldName, VISIBILITY A) {
+        Obj.set(FieldName,to_string(A));
+    }
+
+    VISIBILITY visibility_from_string(const std::string &V) {
+        if(V=="public")
+            return PUBLIC;
+        else if(V=="select")
+            return SELECT;
+        else if(V=="private")
+            return PRIVATE;
+        throw Poco::Exception("invalid json");
+    }
+
+    void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char * FieldName, VISIBILITY &A) {
+        if(Obj->has(FieldName)) {
+            auto V = Obj->getValue<std::string>(FieldName);
+            A = visibility_from_string(V);
+        }
+    }
+
     void Map::to_json(Poco::JSON::Object &Obj) const {
         info.to_json(Obj);
-        field_to_json( Obj,"data",data);
-        field_to_json( Obj,"entity",entity);
-        field_to_json( Obj,"creator",creator);
+        RESTAPI_utils::field_to_json( Obj,"data",data);
+        RESTAPI_utils::field_to_json( Obj,"entity",entity);
+        RESTAPI_utils::field_to_json( Obj,"creator",creator);
         field_to_json( Obj,"visibility",visibility);
-        field_to_json( Obj,"access",access);
-        field_to_json( Obj,"managementPolicy", managementPolicy);
-        field_to_json( Obj,"venue", venue);
+        RESTAPI_utils::field_to_json( Obj,"access",access);
     }
 
     bool Map::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -840,24 +578,8 @@ namespace OpenWifi::ProvObjects {
             RESTAPI_utils::field_from_json( Obj,"data",data);
             RESTAPI_utils::field_from_json( Obj,"entity",entity);
             RESTAPI_utils::field_from_json( Obj,"creator",creator);
-            RESTAPI_utils::field_from_json( Obj,"visibility",visibility);
+            field_from_json( Obj,"visibility",visibility);
             RESTAPI_utils::field_from_json( Obj,"access",access);
-            RESTAPI_utils::field_from_json( Obj,"managementPolicy", managementPolicy);
-            RESTAPI_utils::field_from_json( Obj,"venue", venue);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void SerialNumberList::to_json(Poco::JSON::Object &Obj) const {
-        RESTAPI_utils::field_to_json( Obj,"serialNumbers",serialNumbers);
-    }
-
-    bool SerialNumberList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            RESTAPI_utils::field_from_json( Obj,"serialNumbers",serialNumbers);
             return true;
         } catch(...) {
 
@@ -879,223 +601,8 @@ namespace OpenWifi::ProvObjects {
         return false;
     }
 
-    void SignupEntry::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json( Obj,"email", email);
-        field_to_json( Obj,"userId", userId);
-        field_to_json( Obj,"macAddress", macAddress);
-        field_to_json( Obj,"serialNumber", serialNumber);
-        field_to_json( Obj,"submitted", submitted);
-        field_to_json( Obj,"completed", completed);
-        field_to_json( Obj,"status", status);
-        field_to_json( Obj,"error", error);
-        field_to_json( Obj,"statusCode", statusCode);
-        field_to_json( Obj,"deviceID", deviceID);
-        field_to_json( Obj,"registrationId",registrationId);
-        field_to_json( Obj,"operatorId",operatorId);
-    }
-
-    bool SignupEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json( Obj,"email", email);
-            field_from_json( Obj,"userId", userId);
-            field_from_json( Obj,"macAddress", macAddress);
-            field_from_json( Obj,"serialNumber", serialNumber);
-            field_from_json( Obj,"submitted", submitted);
-            field_from_json( Obj,"completed", completed);
-            field_from_json( Obj,"status", status);
-            field_from_json( Obj,"error", error);
-            field_from_json( Obj,"statusCode", statusCode);
-            field_from_json( Obj,"deviceID", deviceID);
-            field_from_json( Obj,"registrationId",registrationId);
-            field_from_json( Obj,"operatorId",operatorId);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void Variable::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj,"type", type);
-        field_to_json( Obj,"weight", weight);
-        field_to_json( Obj,"prefix", prefix);
-        field_to_json( Obj,"value", value);
-    }
-
-    bool Variable::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"type", type);
-            field_from_json( Obj,"weight", weight);
-            field_from_json( Obj,"prefix", prefix);
-            field_from_json( Obj,"value", value);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void VariableList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj,"variables", variables);
-    }
-
-    bool VariableList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"variables", variables);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void VariableBlock::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json( Obj,"variables", variables);
-        field_to_json( Obj,"entity", entity);
-        field_to_json( Obj,"venue", venue);
-        field_to_json( Obj,"subscriber", subscriber);
-        field_to_json( Obj,"inventory", inventory);
-        field_to_json( Obj,"configurations", configurations);
-        field_to_json( Obj,"managementPolicy", managementPolicy);
-    }
-
-    bool VariableBlock::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json( Obj,"variables", variables);
-            field_from_json( Obj,"entity", entity);
-            field_from_json( Obj,"venue", venue);
-            field_from_json( Obj,"subscriber", subscriber);
-            field_from_json( Obj,"inventory", inventory);
-            field_from_json( Obj,"configurations", configurations);
-            field_from_json( Obj,"managementPolicy", managementPolicy);
-            return true;
-        } catch(...) {
-        }
-        return false;
-    }
-
-    void VariableBlockList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj,"variableBlocks", variableBlocks);
-    }
-
-    bool VariableBlockList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"variableBlocks", variableBlocks);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void ConfigurationDetails::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj,"configuration", configuration);
-        field_to_json( Obj,"rrm", rrm);
-        field_to_json( Obj,"firmwareRCOnly", firmwareRCOnly);
-        field_to_json( Obj,"firmwareUpgrade", firmwareUpgrade);
-    }
-
-    bool ConfigurationDetails::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"configuration", configuration);
-            field_from_json( Obj,"rrm", rrm);
-            field_from_json( Obj,"firmwareRCOnly", firmwareRCOnly);
-            field_from_json( Obj,"firmwareUpgrade", firmwareUpgrade);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void SubscriberDevice::to_json(Poco::JSON::Object &Obj) const {
-        info.to_json(Obj);
-        field_to_json( Obj,"serialNumber", serialNumber);
-        field_to_json( Obj,"deviceType", deviceType);
-        field_to_json( Obj,"operatorId", operatorId);
-        field_to_json( Obj,"subscriberId", subscriberId);
-        field_to_json( Obj,"location", location);
-        field_to_json( Obj,"contact", contact);
-        field_to_json( Obj,"managementPolicy", managementPolicy);
-        field_to_json( Obj,"serviceClass", serviceClass);
-        field_to_json( Obj,"qrCode", qrCode);
-        field_to_json( Obj,"geoCode", geoCode);
-        field_to_json( Obj,"deviceRules",deviceRules);
-        field_to_json( Obj,"state", state);
-        field_to_json( Obj,"locale", locale);
-        field_to_json( Obj,"billingCode", billingCode);
-        field_to_json( Obj,"configuration", configuration);
-        field_to_json( Obj,"suspended", suspended);
-        field_to_json( Obj,"realMacAddress", realMacAddress);
-    }
-
-    bool SubscriberDevice::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            info.from_json(Obj);
-            field_from_json( Obj,"serialNumber", serialNumber);
-            field_from_json( Obj,"deviceType", deviceType);
-            field_from_json( Obj,"operatorId", operatorId);
-            field_from_json( Obj,"subscriberId", subscriberId);
-            field_from_json( Obj,"location", location);
-            field_from_json( Obj,"contact", contact);
-            field_from_json( Obj,"managementPolicy", managementPolicy);
-            field_from_json( Obj,"serviceClass", serviceClass);
-            field_from_json( Obj,"qrCode", qrCode);
-            field_from_json( Obj,"geoCode", geoCode);
-            field_from_json( Obj,"deviceRules",deviceRules);
-            field_from_json( Obj,"state", state);
-            field_from_json( Obj,"locale", locale);
-            field_from_json( Obj,"billingCode", billingCode);
-            field_from_json( Obj,"configuration", configuration);
-            field_from_json( Obj,"suspended", suspended);
-            field_from_json( Obj,"realMacAddress", realMacAddress);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void SubscriberDeviceList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json( Obj,"subscriberDevices", subscriberDevices);
-    }
-
-    bool SubscriberDeviceList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json( Obj,"subscriberDevices", subscriberDevices);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void VenueDeviceList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"id",id);
-        field_to_json(Obj,"name",name);
-        field_to_json(Obj,"description",description);
-        field_to_json(Obj,"devices",devices);
-    }
-
-    bool VenueDeviceList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"id",id);
-            field_from_json(Obj,"name",name);
-            field_from_json(Obj,"description",description);
-            field_from_json(Obj,"devices",devices);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
     bool UpdateObjectInfo(const Poco::JSON::Object::Ptr &O, const SecurityObjects::UserInfo &U, ObjectInfo &I) {
-        uint64_t Now = Utils::Now();
+        uint64_t Now = std::time(nullptr);
         if(O->has("name"))
             I.name = O->get("name").toString();
 
@@ -1116,7 +623,7 @@ namespace OpenWifi::ProvObjects {
     }
 
     bool CreateObjectInfo(const Poco::JSON::Object::Ptr &O, const SecurityObjects::UserInfo &U, ObjectInfo &I) {
-        uint64_t Now = Utils::Now();
+        uint64_t Now = std::time(nullptr);
         if(O->has("name"))
             I.name = O->get("name").toString();
 
@@ -1134,111 +641,9 @@ namespace OpenWifi::ProvObjects {
         }
         I.notes = N;
         I.modified = I.created = Now;
-        I.id = MicroServiceCreateUUID();
+        I.id = MicroService::CreateUUID();
 
         return true;
     }
-
-    bool CreateObjectInfo([[maybe_unused]] const SecurityObjects::UserInfo &U, ObjectInfo &I) {
-        I.modified = I.created = Utils::Now();
-        I.id = MicroServiceCreateUUID();
-        return true;
-    }
-
-    void DeviceRules::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"rcOnly",rcOnly);
-        field_to_json(Obj,"rrm",rrm);
-        field_to_json(Obj,"firmwareUpgrade",firmwareUpgrade);
-    }
-
-    bool DeviceRules::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"rcOnly",rcOnly);
-            field_from_json(Obj,"rrm",rrm);
-            field_from_json(Obj,"firmwareUpgrade",firmwareUpgrade);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void RRMAlgorithmDetails::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"name",name);
-        field_to_json(Obj,"parameters",parameters);
-    }
-
-    bool RRMAlgorithmDetails::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"name",name);
-            field_from_json(Obj,"parameters",parameters);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void RRMDetails::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"vendor",vendor);
-        field_to_json(Obj,"schedule",schedule);
-        field_to_json(Obj,"algorithms",algorithms);
-    }
-
-    bool RRMDetails::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"vendor",vendor);
-            field_from_json(Obj,"schedule",schedule);
-            field_from_json(Obj,"algorithms",algorithms);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void ConfigurationOverride::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"source",source);
-        field_to_json(Obj,"reason",reason);
-        field_to_json(Obj,"parameterName",parameterName);
-        field_to_json(Obj,"parameterType",parameterType);
-        field_to_json(Obj,"parameterValue",parameterValue);
-        field_to_json(Obj,"modified",modified);
-    }
-
-    bool ConfigurationOverride::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"source",source);
-            field_from_json(Obj,"reason",reason);
-            field_from_json(Obj,"parameterName",parameterName);
-            field_from_json(Obj,"parameterType",parameterType);
-            field_from_json(Obj,"parameterValue",parameterValue);
-            field_from_json(Obj,"modified",modified);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
-    void ConfigurationOverrideList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"serialNumber",serialNumber);
-        field_to_json(Obj,"managementPolicy",managementPolicy);
-        field_to_json(Obj,"overrides",overrides);
-    }
-
-    bool ConfigurationOverrideList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"serialNumber",serialNumber);
-            field_from_json(Obj,"managementPolicy",managementPolicy);
-            field_from_json(Obj,"overrides",overrides);
-            return true;
-        } catch(...) {
-
-        }
-        return false;
-    }
-
 }
 
-

src/RESTObjects/RESTAPI_ProvObjects.h

@@ -8,7 +8,8 @@
 
 #pragma once
 
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
+#include <string>
+#include "RESTAPI_SecurityObjects.h"
 
 namespace OpenWifi::ProvObjects {
 
@@ -32,13 +33,6 @@ namespace OpenWifi::ProvObjects {
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
     };
 
-    struct SerialNumberList {
-        Types::UUIDvec_t    serialNumbers;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
     struct ManagementPolicyEntry {
         Types::UUIDvec_t users;
         Types::UUIDvec_t resources;
@@ -54,37 +48,12 @@ namespace OpenWifi::ProvObjects {
         std::vector<ManagementPolicyEntry>  entries;
         Types::StringVec    inUse;
         Types::UUID_t       entity;
-        Types::UUID_t       venue;
 
         void to_json(Poco::JSON::Object &Obj) const;
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
     };
     typedef std::vector<ManagementPolicy>      ManagementPolicyVec;
 
-    struct RRMAlgorithmDetails {
-        std::string     name;
-        std::string     parameters;
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct RRMDetails {
-        std::string     vendor;
-        std::string     schedule;
-        std::vector<RRMAlgorithmDetails>    algorithms;
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct DeviceRules {
-        std::string     rcOnly{"inherit"};
-        std::string     rrm{"inherit"};
-        std::string     firmwareUpgrade{"inherit"};
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
     struct Entity {
         ObjectInfo              info;
         Types::UUID_t           parent;
@@ -95,13 +64,8 @@ namespace OpenWifi::ProvObjects {
         Types::UUID_t           managementPolicy;
         Types::UUIDvec_t        deviceConfiguration;
         Types::UUIDvec_t        devices;
-        DeviceRules             deviceRules;
+        std::string             rrm;
         Types::StringVec        sourceIP;
-        Types::UUIDvec_t        variables;
-        Types::UUIDvec_t        managementPolicies;
-        Types::UUIDvec_t        managementRoles;
-        Types::UUIDvec_t        maps;
-        Types::UUIDvec_t        configurations;
 
         void to_json(Poco::JSON::Object &Obj) const;
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
@@ -128,16 +92,10 @@ namespace OpenWifi::ProvObjects {
         DiGraph             topology;
         std::string         design;
         Types::UUIDvec_t    deviceConfiguration;
-        Types::UUIDvec_t    contacts;
+        std::string         contact;
         std::string         location;
-        DeviceRules         deviceRules;
+        std::string         rrm;
         Types::StringVec    sourceIP;
-        Types::UUIDvec_t    variables;
-        Types::UUIDvec_t    configurations;
-        Types::UUIDvec_t    maps;
-        Types::UUIDvec_t    managementPolicies;
-        Types::UUIDvec_t    managementRoles;
-        Types::UUIDvec_t    boards;
 
         void to_json(Poco::JSON::Object &Obj) const;
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
@@ -159,7 +117,6 @@ namespace OpenWifi::ProvObjects {
         Types::UUIDvec_t    users;
         Types::StringVec    inUse;
         Types::UUID_t       entity;
-        Types::UUID_t       venue;
 
         void to_json(Poco::JSON::Object &Obj) const;
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
@@ -223,51 +180,6 @@ namespace OpenWifi::ProvObjects {
     };
     typedef std::vector<Location>      LocationVec;
 
-    struct OperatorLocation {
-        ObjectInfo          info;
-        std::string         type;
-        std::string         buildingName;
-        Types::StringVec    addressLines;
-        std::string         city;
-        std::string         state;
-        std::string         postal;
-        std::string         country;
-        Types::StringVec    phones;
-        Types::StringVec    mobiles;
-        std::string         geoCode;
-        Types::UUID_t       operatorId;
-        Types::UUID_t       subscriberDeviceId;
-        Types::UUID_t       managementPolicy;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-    typedef std::vector<Location>      LocationVec;
-
-    struct SubLocation {
-        std::string         type;
-        std::string         buildingName;
-        Types::StringVec    addressLines;
-        std::string         city;
-        std::string         state;
-        std::string         postal;
-        std::string         country;
-        Types::StringVec    phones;
-        Types::StringVec    mobiles;
-        std::string         geoCode;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct OperatorLocationList {
-        std::vector<OperatorLocation>    locations;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-
     enum ContactType {
         CT_SUBSCRIBER, CT_USER, CT_INSTALLER, CT_CSR, CT_MANAGER,
         CT_BUSINESSOWNER, CT_TECHNICIAN, CT_CORPORATE, CT_UNKNOWN
@@ -331,55 +243,6 @@ namespace OpenWifi::ProvObjects {
     };
     typedef std::vector<Contact>      ContactVec;
 
-    struct OperatorContact {
-        ObjectInfo      info;
-        std::string     type;
-        std::string     title;
-        std::string     salutation;
-        std::string     firstname;
-        std::string     lastname;
-        std::string     initials;
-        std::string     visual;
-        Types::StringVec mobiles;
-        Types::StringVec phones;
-        std::string     primaryEmail;
-        std::string     secondaryEmail;
-        std::string     accessPIN;
-        Types::UUID_t   operatorId;
-        Types::UUID_t   subscriberDeviceId;
-        Types::UUID_t   managementPolicy;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct SubContact {
-        std::string     type;
-        std::string     title;
-        std::string     salutation;
-        std::string     firstname;
-        std::string     lastname;
-        std::string     initials;
-        std::string     visual;
-        Types::StringVec mobiles;
-        Types::StringVec phones;
-        std::string     primaryEmail;
-        std::string     secondaryEmail;
-        std::string     accessPIN;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct OperatorContactList {
-        std::vector<OperatorContact>    contacts;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    typedef std::vector<OperatorContact>      OperatorContactVec;
-
     struct DeviceConfigurationElement {
         std::string name;
         std::string description;
@@ -397,19 +260,16 @@ namespace OpenWifi::ProvObjects {
         Types::StringVec                deviceTypes;
         DeviceConfigurationElementVec   configuration;
         Types::StringVec                inUse;
-        Types::UUIDvec_t                variables;
-        DeviceRules                     deviceRules;
-        bool                            subscriberOnly=false;
-        std::string                     venue;
-        std::string                     entity;
-        std::string                     subscriber;
+        Types::StringPairVec            variables;
+        std::string                     rrm;
+        std::string                     firmwareUpgrade;
+        bool                            firmwareRCOnly=false;
 
         void to_json(Poco::JSON::Object &Obj) const;
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
     };
     typedef std::vector<DeviceConfiguration>      DeviceConfigurationVec;
 
-
     struct InventoryTag {
         ObjectInfo      info;
         std::string     serialNumber;
@@ -422,13 +282,9 @@ namespace OpenWifi::ProvObjects {
         std::string     location;
         std::string     contact;
         std::string     deviceConfiguration;
-        DeviceRules     deviceRules;
+        std::string     rrm;
         Types::UUID_t   managementPolicy;
         std::string     state;
-        std::string     devClass;
-        std::string     locale;
-        std::string     realMacAddress;
-        bool            doNotAllowOverrides=false;
 
         void to_json(Poco::JSON::Object &Obj) const;
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
@@ -443,15 +299,6 @@ namespace OpenWifi::ProvObjects {
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
     };
 
-    struct InventoryConfigApplyResult {
-        std::string         appliedConfiguration;
-        Types::StringVec    errors;
-        Types::StringVec    warnings;
-        uint64_t            errorCode;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
 
     struct Report {
         uint64_t            snapShot=0;
@@ -486,20 +333,20 @@ namespace OpenWifi::ProvObjects {
     };
 
     struct UuidList {
-        Types::UUIDvec_t    list;
+        std::vector<std::string>    list;
 
         void to_json(Poco::JSON::Object &Obj) const;
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
     };
 
     enum ACLACCESS {
-        NONE = 0, READ=1, MODIFY=2, CREATE=3, DELETE=4
+        NONE, READ, MODIFY, CREATE, DELETE
     };
 
     struct ObjectACL {
         UuidList        users;
         UuidList        roles;
-        uint64_t        access = (uint64_t) NONE;
+        ACLACCESS       access = NONE;
 
         void to_json(Poco::JSON::Object &Obj) const;
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
@@ -512,15 +359,20 @@ namespace OpenWifi::ProvObjects {
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
     };
 
+    enum VISIBILITY {
+        PUBLIC, PRIVATE, SELECT
+    };
+
+    std::string to_string(VISIBILITY A);
+    VISIBILITY visibility_from_string(const std::string &V);
+
     struct Map {
         ObjectInfo          info;
         std::string         data;
         std::string         entity;
         std::string         creator;
-        std::string         visibility{"private"};
+        VISIBILITY          visibility = PRIVATE;
         ObjectACLList       access;
-        Types::UUID_t       managementPolicy;
-        std::string         venue;
 
         void to_json(Poco::JSON::Object &Obj) const;
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
@@ -533,189 +385,6 @@ namespace OpenWifi::ProvObjects {
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
     };
 
-    enum SignupStatusCodes {
-        SignupCreated = 0 ,
-        SignupWaitingForEmail,
-        SignupWaitingForDevice,
-        SignupSuccess,
-        SignupFailure,
-        SignupCanceled,
-        SignupTimedOut
-    };
-
-    struct SignupEntry {
-        ObjectInfo          info;
-        std::string         email;
-        std::string         userId;
-        std::string         macAddress;
-        std::string         serialNumber;
-        uint64_t            submitted = 0 ;
-        uint64_t            completed = 0 ;
-        std::string         status;
-        uint64_t            error=0;
-        uint64_t            statusCode=0;
-        std::string         deviceID;
-        std::string         registrationId;
-        std::string         operatorId;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct Variable {
-        std::string         type;
-        uint64_t            weight=0;
-        std::string         prefix;
-        std::string         value;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct VariableList {
-        std::vector<Variable>   variables;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct VariableBlock {
-        ObjectInfo                  info;
-        std::vector<Variable>       variables;
-        std::string                 entity;
-        std::string                 venue;
-        std::string                 subscriber;
-        std::string                 inventory;
-        Types::UUIDvec_t            configurations;
-        Types::UUID_t               managementPolicy;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct VariableBlockList {
-        std::vector<VariableBlock>      variableBlocks;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct Operator {
-        ObjectInfo                      info;
-        Types::UUID_t                   managementPolicy;
-        Types::UUIDvec_t                managementRoles;
-        DeviceRules                     deviceRules;
-        std::vector<Variable>           variables;
-        bool                            defaultOperator=false;
-        Types::StringVec                sourceIP;
-        std::string                     registrationId;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct OperatorList {
-        std::vector<Operator>            operators;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct VenueDeviceList {
-        std::string         id;
-        std::string         name;
-        std::string         description;
-        Types::UUIDvec_t    devices;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct ServiceClass {
-        ObjectInfo                      info;
-        Types::UUID_t                   operatorId;
-        Types::UUID_t                   managementPolicy;
-        double                          cost=0.0;
-        std::string                     currency;
-        std::string                     period;
-        std::string                     billingCode;
-        std::vector<Variable>           variables;
-        bool                            defaultService=false;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct ServiceClassList {
-        std::vector<ServiceClass>            serviceClasses;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct ConfigurationDetails {
-        DeviceConfigurationElementVec   configuration;
-        std::string                     rrm{"inherit"};
-        std::string                     firmwareUpgrade{"inherit"};
-        std::string                     firmwareRCOnly{"inherit"};
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct SubscriberDevice {
-        ObjectInfo                      info;
-        std::string                     serialNumber;
-        std::string                     deviceType;
-        Types::UUID_t                   operatorId;
-        Types::UUID_t                   subscriberId;
-        SubLocation                     location;
-        SubContact                      contact;
-        Types::UUID_t                   managementPolicy;
-        Types::UUID_t                   serviceClass;
-        std::string                     qrCode;
-        std::string                     geoCode;
-        DeviceRules                     deviceRules;
-        std::string                     state;
-        std::string                     locale;
-        std::string                     billingCode;
-        DeviceConfigurationElementVec   configuration;
-        bool                            suspended=false;
-        std::string                     realMacAddress;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct SubscriberDeviceList {
-        std::vector<SubscriberDevice>       subscriberDevices;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct ConfigurationOverride {
-        std::string     source;
-        std::string     reason;
-        std::string     parameterName;
-        std::string     parameterType;
-        std::string     parameterValue;
-        std::uint64_t   modified;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct ConfigurationOverrideList {
-        std::string     serialNumber;
-        Types::UUID_t   managementPolicy;
-        std::vector<ConfigurationOverride>  overrides;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
     bool UpdateObjectInfo(const Poco::JSON::Object::Ptr &O, const SecurityObjects::UserInfo &U, ObjectInfo &I);
     bool CreateObjectInfo(const Poco::JSON::Object::Ptr &O, const SecurityObjects::UserInfo &U, ObjectInfo &I);
-    bool CreateObjectInfo(const SecurityObjects::UserInfo &U, ObjectInfo &I);
 };

src/RESTObjects/RESTAPI_SecurityObjects.cpp

@@ -9,7 +9,7 @@
 #include "Poco/JSON/Parser.h"
 #include "Poco/JSON/Stringifier.h"
 
-#include "framework/RESTAPI_utils.h"
+#include "framework/MicroService.h"
 #include "RESTAPI_SecurityObjects.h"
 
 using OpenWifi::RESTAPI_utils::field_to_json;
@@ -95,7 +95,6 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj, "PortalLogin", PortalLogin_);
 			return true;
 		} catch(...) {
-            std::cout << "Cannot parse: AclTemplate" << std::endl;
 		}
 		return false;
 	}
@@ -113,8 +112,6 @@ namespace OpenWifi::SecurityObjects {
         field_to_json(Obj,"userMustChangePassword",userMustChangePassword);
         field_to_json(Obj,"errorCode", errorCode);
 		Obj.set("aclTemplate",AclTemplateObj);
-        field_to_json(Obj,"errorCode", errorCode);
-        field_to_json(Obj,"lastRefresh", lastRefresh_);
 	}
 
 	bool WebToken::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -131,10 +128,9 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj, "created", created_);
 			field_from_json(Obj, "username", username_);
             field_from_json(Obj, "userMustChangePassword",userMustChangePassword);
-            field_from_json(Obj,"lastRefresh", lastRefresh_);
 			return true;
 		} catch (...) {
-            std::cout << "Cannot parse: WebToken" << std::endl;
+
 		}
 		return false;
 	}
@@ -145,14 +141,14 @@ namespace OpenWifi::SecurityObjects {
 	    field_to_json(Obj,"primary", primary);
 	}
 
-	bool MobilePhoneNumber::from_json(const Poco::JSON::Object::Ptr &Obj) {
+	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 (...) {
-            std::cout << "Cannot parse: MobilePhoneNumber" << std::endl;
+
 	    }
 	    return false;
 	};
@@ -162,13 +158,13 @@ namespace OpenWifi::SecurityObjects {
 	    field_to_json(Obj,"method", method);
 	}
 
-	bool MfaAuthInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
+	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 (...) {
-            std::cout << "Cannot parse: MfaAuthInfo" << std::endl;
+
 	    }
 	    return false;
 	}
@@ -179,14 +175,14 @@ namespace OpenWifi::SecurityObjects {
         field_to_json(Obj, "authenticatorSecret", authenticatorSecret);
 	}
 
-	bool UserLoginLoginExtensions::from_json(const Poco::JSON::Object::Ptr &Obj) {
+	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 (...) {
-            std::cout << "Cannot parse: UserLoginLoginExtensions" << std::endl;
+
 	    }
 	    return false;
 	}
@@ -198,7 +194,7 @@ namespace OpenWifi::SecurityObjects {
         field_to_json(Obj, "method", method);
     }
 
-    bool MFAChallengeRequest::from_json(const Poco::JSON::Object::Ptr &Obj) {
+    bool MFAChallengeRequest::from_json(Poco::JSON::Object::Ptr &Obj) {
 	    try {
 	        field_from_json(Obj,"uuid",uuid);
 	        field_from_json(Obj,"question",question);
@@ -206,7 +202,7 @@ namespace OpenWifi::SecurityObjects {
 	        field_from_json(Obj,"method",method);
 	        return true;
 	    } catch (...) {
-            std::cout << "Cannot parse: MFAChallengeRequest" << std::endl;
+
 	    }
 	    return false;
 	};
@@ -214,15 +210,16 @@ namespace OpenWifi::SecurityObjects {
     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(const Poco::JSON::Object::Ptr &Obj) {
+    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 (...) {
-            std::cout << "Cannot parse: MFAChallengeResponse" << std::endl;
+
         }
         return false;
 
@@ -260,7 +257,6 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj,"oauthType",oauthType);
 		field_to_json(Obj,"oauthUserInfo",oauthUserInfo);
         field_to_json(Obj,"modified",modified);
-        field_to_json(Obj,"signingUp",signingUp);
     };
 
     bool UserInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -296,28 +292,13 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj,"oauthType",oauthType);
 			field_from_json(Obj,"oauthUserInfo",oauthUserInfo);
             field_from_json(Obj,"modified",modified);
-            field_from_json(Obj,"signingUp",signingUp);
             return true;
         } catch (const Poco::Exception &E) {
-            std::cout << "Cannot parse: UserInfo" << std::endl;
+
         }
         return false;
     };
 
-    void UserInfoList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj,"users",users);
-    }
-
-    bool UserInfoList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"users",users);
-            return true;
-        } catch (...) {
-            std::cout << "Cannot parse: InternalServiceInfo" << std::endl;
-        }
-        return false;
-    }
-
 	void InternalServiceInfo::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj,"privateURI",privateURI);
 		field_to_json(Obj,"publicURI",publicURI);
@@ -331,7 +312,7 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj,"token",token);
 			return true;
 		} catch (...) {
-            std::cout << "Cannot parse: InternalServiceInfo" << std::endl;
+
 		}
 		return false;
 	};
@@ -349,7 +330,7 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj, "services", services);
 			return true;
 		} catch(...) {
-            std::cout << "Cannot parse: InternalSystemServices" << std::endl;
+
 		}
 		return false;
 	};
@@ -371,7 +352,7 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj, "authenticationType", authenticationType);
 			return true;
 		} catch (...) {
-            std::cout << "Cannot parse: SystemEndpoint" << std::endl;
+
 		}
 		return false;
 	};
@@ -385,7 +366,7 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj, "endpoints", endpoints);
 			return true;
 		} catch (...) {
-            std::cout << "Cannot parse: SystemEndpointList" << std::endl;
+
 		}
 		return false;
 	}
@@ -404,7 +385,7 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj, "userInfo", userinfo);
 			return true;
 		} catch(...) {
-            std::cout << "Cannot parse: UserInfoAndPolicy" << std::endl;
+
 		}
 		return false;
 	}
@@ -415,14 +396,14 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj,"note", note);
 	}
 
-	bool NoteInfo::from_json(const 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);
+			field_from_json(Obj,"note",note);
 			return true;
 		} catch(...) {
-            std::cout << "Cannot parse: NoteInfo" << std::endl;
+
 		}
 		return false;
 	}
@@ -433,20 +414,20 @@ namespace OpenWifi::SecurityObjects {
 	            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)Utils::Now(), .createdBy=UInfo.email, .note=i.note};
+	                SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UInfo.email, .note=i.note};
 	                Notes.push_back(ii);
 	            }
 	        }
 	        return true;
 	    } catch(...) {
-            std::cout << "Cannot parse: MergeNotes" << std::endl;
+
 	    }
 	    return false;
 	}
 
 	bool MergeNotes(const NoteInfoVec & NewNotes, const UserInfo &UInfo, NoteInfoVec & ExistingNotes) {
 	    for(auto const &i:NewNotes) {
-	        SecurityObjects::NoteInfo   ii{.created=(uint64_t)Utils::Now(), .createdBy=UInfo.email, .note=i.note};
+	        SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UInfo.email, .note=i.note};
 	        ExistingNotes.push_back(ii);
 	    }
         return true;
@@ -457,13 +438,13 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json<ResourceAccessType>(Obj,"access", access, ResourceAccessTypeToString);
 	}
 
-	bool ProfileAction::from_json(const 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(...) {
-            std::cout << "Cannot parse: ProfileAction" << std::endl;
+
 		}
 		return false;
 	}
@@ -477,7 +458,7 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj,"notes", notes);
 	}
 
-	bool SecurityProfile::from_json(const 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);
@@ -487,7 +468,7 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj,"notes",notes);
 			return true;
 		} catch(...) {
-            std::cout << "Cannot parse: SecurityProfile" << std::endl;
+
 		}
 		return false;
 	}
@@ -496,12 +477,12 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj, "profiles", profiles);
 	}
 
-	bool SecurityProfileList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+	bool SecurityProfileList::from_json(Poco::JSON::Object::Ptr &Obj) {
 		try {
 			field_from_json(Obj,"profiles",profiles);
 			return true;
 		} catch(...) {
-            std::cout << "Cannot parse: SecurityProfileList" << std::endl;
+
 		}
 		return false;
 	}
@@ -522,7 +503,7 @@ namespace OpenWifi::SecurityObjects {
         field_to_json(Obj,"userAction",userAction);
 	}
 
-    bool ActionLink::from_json(const Poco::JSON::Object::Ptr &Obj) {
+    bool ActionLink::from_json(Poco::JSON::Object::Ptr &Obj) {
 	    try {
 	        field_from_json(Obj,"id",id);
 	        field_from_json(Obj,"action",action);
@@ -539,7 +520,7 @@ namespace OpenWifi::SecurityObjects {
             field_from_json(Obj,"userAction",userAction);
 	        return true;
 	    } catch(...) {
-            std::cout << "Cannot parse: ActionLink" << std::endl;
+
 	    }
 	    return false;
 	}
@@ -550,14 +531,14 @@ namespace OpenWifi::SecurityObjects {
 	    field_to_json(Obj,"data",data);
 	}
 
-    bool Preferences::from_json(const Poco::JSON::Object::Ptr &Obj) {
+    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(...) {
-            std::cout << "Cannot parse: Preferences" << std::endl;
+
 	    }
 	    return false;
 	}
@@ -569,7 +550,7 @@ namespace OpenWifi::SecurityObjects {
 	    field_to_json(Obj,"email",email);
 	}
 
-    bool SubMfaConfig::from_json(const Poco::JSON::Object::Ptr &Obj) {
+    bool SubMfaConfig::from_json(Poco::JSON::Object::Ptr &Obj) {
 	    try {
 	        field_from_json(Obj,"id",id);
 	        field_from_json(Obj,"type",type);
@@ -577,7 +558,7 @@ namespace OpenWifi::SecurityObjects {
 	        field_from_json(Obj,"email",email);
 	        return true;
 	    } catch(...) {
-            std::cout << "Cannot parse: SubMfaConfig" << std::endl;
+
 	    }
 	    return false;
 	}
@@ -591,10 +572,9 @@ namespace OpenWifi::SecurityObjects {
         field_to_json(Obj,"expires",expires);
         field_to_json(Obj,"idleTimeout",idleTimeout);
         field_to_json(Obj,"revocationDate",revocationDate);
-        field_to_json(Obj,"lastRefresh", lastRefresh);
     }
 
-    bool Token::from_json(const Poco::JSON::Object::Ptr &Obj) {
+    bool Token::from_json(Poco::JSON::Object::Ptr &Obj) {
         try {
             field_from_json(Obj,"token",token);
             field_from_json(Obj,"refreshToken",refreshToken);
@@ -604,10 +584,9 @@ namespace OpenWifi::SecurityObjects {
             field_from_json(Obj,"expires",expires);
             field_from_json(Obj,"idleTimeout",idleTimeout);
             field_from_json(Obj,"revocationDate",revocationDate);
-            field_from_json(Obj,"lastRefresh", lastRefresh);
             return true;
         } catch(...) {
-            std::cout << "Cannot parse: Token" << std::endl;
+
         }
         return false;
     }
@@ -619,80 +598,5 @@ namespace OpenWifi::SecurityObjects {
         field_to_json(Obj,"login",login);
         field_to_json(Obj,"logout",logout);
     }
-
-    void ApiKeyAccessRight::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "service", service);
-        field_to_json(Obj, "access", access);
-    }
-
-    bool ApiKeyAccessRight::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "service", service);
-            field_from_json(Obj, "access", access);
-            return true;
-        } catch(...) {
-            std::cout << "Cannot parse: Token" << std::endl;
-        }
-        return false;
-    }
-
-    void ApiKeyAccessRightList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "acls", acls);
-    }
-
-    bool ApiKeyAccessRightList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "acls", acls);
-            return true;
-        } catch(...) {
-            std::cout << "Cannot parse: Token" << std::endl;
-        }
-        return false;
-    }
-
-    void ApiKeyEntry::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "id", id);
-        field_to_json(Obj, "userUuid", userUuid);
-        field_to_json(Obj, "name", name);
-        field_to_json(Obj, "apiKey", apiKey);
-        field_to_json(Obj, "salt", salt);
-        field_to_json(Obj, "description", description);
-        field_to_json(Obj, "expiresOn", expiresOn);
-        field_to_json(Obj, "rights", rights);
-        field_to_json(Obj, "lastUse", lastUse);
-    }
-
-    bool ApiKeyEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "id", id);
-            field_from_json(Obj, "userUuid", userUuid);
-            field_from_json(Obj, "name", name);
-            field_from_json(Obj, "apiKey", apiKey);
-            field_from_json(Obj, "salt", salt);
-            field_from_json(Obj, "description", description);
-            field_from_json(Obj, "expiresOn", expiresOn);
-            field_from_json(Obj, "rights", rights);
-            field_from_json(Obj, "lastUse", lastUse);
-            return true;
-        } catch(...) {
-            std::cout << "Cannot parse: Token" << std::endl;
-        }
-        return false;
-    }
-
-    void ApiKeyEntryList::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "apiKeys", apiKeys);
-    }
-
-    bool ApiKeyEntryList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "apiKeys", apiKeys);
-            return true;
-        } catch(...) {
-            std::cout << "Cannot parse: Token" << std::endl;
-        }
-        return false;
-    }
-
 }
 

src/RESTObjects/RESTAPI_SecurityObjects.h

@@ -9,15 +9,12 @@
 #pragma once
 
 #include <string>
-#include <type_traits>
 #include "framework/OpenWifiTypes.h"
 #include "Poco/JSON/Object.h"
 #include "Poco/Data/LOB.h"
 #include "Poco/Data/LOBStream.h"
-#include "framework/utils.h"
 
 namespace OpenWifi {
-    uint64_t Now();
     namespace SecurityObjects {
 
         typedef std::string USER_ID_TYPE;
@@ -29,13 +26,8 @@ namespace OpenWifi {
             bool Delete_ = true;
             bool PortalLogin_ = true;
 
-            AclTemplate()  noexcept = default;
-
             void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        static_assert( std::is_nothrow_move_constructible_v<AclTemplate> );
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);	};
 
         struct WebToken {
             std::string access_token_;
@@ -49,7 +41,6 @@ namespace OpenWifi {
             uint64_t idle_timeout_=0;
             AclTemplate acl_template_;
             uint64_t created_=0;
-            uint64_t lastRefresh_=0;
 
             void to_json(Poco::JSON::Object &Obj) const;
             bool from_json(const Poco::JSON::Object::Ptr &Obj);
@@ -63,12 +54,11 @@ namespace OpenWifi {
         std::string UserTypeToString(USER_ROLE U);
 
         struct NoteInfo {
-            uint64_t    created=0; // = Utils::Now();
+            uint64_t created = std::time(nullptr);
             std::string createdBy;
             std::string note;
-
             void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+            bool from_json(Poco::JSON::Object::Ptr &Obj);
         };
         typedef std::vector<NoteInfo>	NoteInfoVec;
 
@@ -78,7 +68,7 @@ namespace OpenWifi {
             bool primary = false;
 
             void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+            bool from_json(Poco::JSON::Object::Ptr &Obj);
         };
 
         struct MfaAuthInfo {
@@ -86,7 +76,7 @@ namespace OpenWifi {
             std::string method;
 
             void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+            bool from_json(Poco::JSON::Object::Ptr &Obj);
         };
 
         struct UserLoginLoginExtensions {
@@ -95,17 +85,17 @@ namespace OpenWifi {
             std::string                     authenticatorSecret;
 
             void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+            bool from_json(Poco::JSON::Object::Ptr &Obj);
         };
 
         struct MFAChallengeRequest {
             std::string uuid;
             std::string question;
             std::string method;
-            uint64_t    created = Utils::Now();
+            uint64_t    created = std::time(nullptr);
 
             void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+            bool from_json(Poco::JSON::Object::Ptr &Obj);
         };
 
         struct MFAChallengeResponse {
@@ -113,7 +103,7 @@ namespace OpenWifi {
             std::string answer;
 
             void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+            bool from_json(Poco::JSON::Object::Ptr &Obj);
         };
 
         struct UserInfo {
@@ -148,20 +138,12 @@ namespace OpenWifi {
             std::string oauthType;
             std::string oauthUserInfo;
             uint64_t    modified;
-            std::string signingUp;
 
             void to_json(Poco::JSON::Object &Obj) const;
             bool from_json(const Poco::JSON::Object::Ptr &Obj);
         };
         typedef std::vector<UserInfo>   UserInfoVec;
 
-        struct UserInfoList {
-            std::vector<UserInfo>   users;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
         // bool append_from_json(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes);
         bool MergeNotes(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes);
         bool MergeNotes(const NoteInfoVec & NewNotes, const UserInfo &UInfo, NoteInfoVec & ExistingNotes);
@@ -225,7 +207,7 @@ namespace OpenWifi {
             std::string resource;
             ResourceAccessType access;
             void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+            bool from_json(Poco::JSON::Object::Ptr &Obj);
         };
         typedef std::vector<ProfileAction>	ProfileActionVec;
 
@@ -237,23 +219,21 @@ namespace OpenWifi {
             std::string role;
             NoteInfoVec notes;
             void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+            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(const Poco::JSON::Object::Ptr &Obj);
+            bool from_json(Poco::JSON::Object::Ptr &Obj);
         };
 
         enum LinkActions {
             FORGOT_PASSWORD=1,
             VERIFY_EMAIL,
             SUB_FORGOT_PASSWORD,
-            SUB_VERIFY_EMAIL,
-            SUB_SIGNUP,
-            EMAIL_INVITATION
+            SUB_VERIFY_EMAIL
         };
 
         struct ActionLink {
@@ -265,14 +245,14 @@ namespace OpenWifi {
             std::string         locale;
             std::string         message;
             uint64_t            sent=0;
-            uint64_t            created=Utils::Now();
+            uint64_t            created=std::time(nullptr);
             uint64_t            expires=0;
             uint64_t            completed=0;
             uint64_t            canceled=0;
             bool                userAction=true;
 
             void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+            bool from_json(Poco::JSON::Object::Ptr &Obj);
         };
 
         struct Preferences {
@@ -280,7 +260,7 @@ namespace OpenWifi {
             uint64_t                            modified;
             Types::StringPairVec                data;
             void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+            bool from_json(Poco::JSON::Object::Ptr &Obj);
         };
 
         struct SubMfaConfig {
@@ -290,7 +270,7 @@ namespace OpenWifi {
             std::string                         email;
 
             void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+            bool from_json(Poco::JSON::Object::Ptr &Obj);
         };
 
         struct Token {
@@ -302,10 +282,9 @@ namespace OpenWifi {
             uint64_t            expires=0;
             uint64_t            idleTimeout=0;
             uint64_t            revocationDate=0;
-            uint64_t            lastRefresh=0;
 
             void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+            bool from_json(Poco::JSON::Object::Ptr &Obj);
         };
 
         struct Avatar {
@@ -313,7 +292,7 @@ namespace OpenWifi {
             std::string             type;
             uint64_t                created=0;
             std::string             name;
-            Poco::Data::BLOB        avatar;
+            Poco::Data::LOB<char>   avatar;
         };
 
         struct LoginRecordInfo {
@@ -325,44 +304,5 @@ namespace OpenWifi {
 
             void to_json(Poco::JSON::Object &Obj) const;
         };
-
-        struct ApiKeyAccessRight {
-            std::string     service;
-            std::string     access;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        struct ApiKeyAccessRightList {
-            std::vector<ApiKeyAccessRight>      acls;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        struct ApiKeyEntry {
-            Types::UUID_t           id;
-            Types::UUID_t           userUuid;
-            std::string             name;
-            std::string             description;
-            std::string             apiKey;
-            std::string             salt;
-            std::uint64_t           created;
-            std::uint64_t           expiresOn=0;
-            ApiKeyAccessRightList   rights;
-            std::uint64_t           lastUse=0;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
-        struct ApiKeyEntryList {
-            std::vector<ApiKeyEntry>    apiKeys;
-
-            void to_json(Poco::JSON::Object &Obj) const;
-            bool from_json(const Poco::JSON::Object::Ptr &Obj);
-        };
-
     }
 }

src/RESTObjects/RESTAPI_SubObjects.cpp

@@ -3,11 +3,12 @@
 //
 
 #include "RESTAPI_SubObjects.h"
-#include "framework/RESTAPI_utils.h"
+#include "framework/MicroService.h"
 
 using OpenWifi::RESTAPI_utils::field_to_json;
 using OpenWifi::RESTAPI_utils::field_from_json;
 
+
 namespace OpenWifi::SubObjects {
 
     void HomeDeviceMode::to_json(Poco::JSON::Object &Obj) const {
@@ -279,7 +280,6 @@ namespace OpenWifi::SubObjects {
         field_to_json(Obj, "ipv6", ipv6);
         field_to_json(Obj, "tx", tx);
         field_to_json(Obj, "rx", rx);
-        field_to_json(Obj, "manufacturer", manufacturer);
     }
 
     bool Association::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -293,7 +293,6 @@ namespace OpenWifi::SubObjects {
             field_from_json(Obj, "ipv6", ipv6);
             field_from_json(Obj, "tx", tx);
             field_from_json(Obj, "rx", rx);
-            field_from_json(Obj, "manufacturer", manufacturer);
             return true;
         } catch (...) {
         }
@@ -325,7 +324,6 @@ namespace OpenWifi::SubObjects {
         field_to_json(Obj, "ipv6", ipv6);
         field_to_json(Obj, "tx", tx);
         field_to_json(Obj, "rx", rx);
-        field_to_json(Obj, "manufacturer", manufacturer);
     }
 
     bool Client::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -337,7 +335,6 @@ namespace OpenWifi::SubObjects {
             field_from_json(Obj, "ipv6", ipv6);
             field_from_json(Obj, "tx", tx);
             field_from_json(Obj, "rx", rx);
-            field_from_json(Obj, "manufacturer", manufacturer);
             return true;
         } catch (...) {
         }
@@ -436,8 +433,6 @@ namespace OpenWifi::SubObjects {
         field_to_json(Obj, "rates", rates);
         field_to_json(Obj, "he", he);
         field_to_json(Obj, "rawInfo", rawInfo);
-        field_to_json(Obj, "allowDFS", allowDFS);
-        field_to_json(Obj, "mimo", mimo);
     }
 
     bool RadioInformation::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -457,8 +452,6 @@ namespace OpenWifi::SubObjects {
             field_from_json(Obj, "rates", rates);
             field_from_json(Obj, "he", he);
             field_from_json(Obj, "rawInfo", rawInfo);
-            field_from_json(Obj, "allowDFS", allowDFS);
-            field_from_json(Obj, "mimo", mimo);
             return true;
         } catch (...) {
         }
@@ -468,7 +461,6 @@ namespace OpenWifi::SubObjects {
     void AccessPoint::to_json(Poco::JSON::Object &Obj) const {
         field_to_json(Obj, "id", id);
         field_to_json(Obj, "macAddress", macAddress);
-        field_to_json(Obj, "serialNumber", serialNumber);
         field_to_json(Obj, "name", name);
         field_to_json(Obj, "deviceType", deviceType);
         field_to_json(Obj, "subscriberDevices", subscriberDevices);
@@ -481,19 +473,12 @@ namespace OpenWifi::SubObjects {
         field_to_json(Obj, "radios", radios);
         field_to_json(Obj, "automaticUpgrade", automaticUpgrade);
         field_to_json(Obj, "configurationUUID", configurationUUID);
-        field_to_json(Obj, "currentFirmware", currentFirmware);
-        field_to_json(Obj, "currentFirmwareDate", currentFirmwareDate);
-        field_to_json(Obj, "latestFirmware", latestFirmware);
-        field_to_json(Obj, "latestFirmwareDate", latestFirmwareDate);
-        field_to_json(Obj, "newFirmwareAvailable", newFirmwareAvailable);
-        field_to_json(Obj, "latestFirmwareURI", latestFirmwareURI);
     }
 
     bool AccessPoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
         try {
             field_from_json(Obj, "id", id);
             field_from_json(Obj, "macAddress", macAddress);
-            field_from_json(Obj, "serialNumber", serialNumber);
             field_from_json(Obj, "name", name);
             field_from_json(Obj, "deviceType", deviceType);
             field_from_json(Obj, "subscriberDevices", subscriberDevices);
@@ -506,12 +491,6 @@ namespace OpenWifi::SubObjects {
             field_from_json(Obj, "radios", radios);
             field_from_json(Obj, "automaticUpgrade", automaticUpgrade);
             field_from_json(Obj, "configurationUUID", configurationUUID);
-            field_from_json(Obj, "currentFirmware", currentFirmware);
-            field_from_json(Obj, "currentFirmwareDate", currentFirmwareDate);
-            field_from_json(Obj, "latestFirmware", latestFirmware);
-            field_from_json(Obj, "latestFirmwareDate", latestFirmwareDate);
-            field_from_json(Obj, "newFirmwareAvailable", newFirmwareAvailable);
-            field_from_json(Obj, "latestFirmwareURI", latestFirmwareURI);
             return true;
         } catch (...) {
         }
@@ -565,38 +544,4 @@ namespace OpenWifi::SubObjects {
         }
         return false;
     }
-
-    void StatsEntry::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "timestamp", timestamp);
-        field_to_json(Obj, "tx", tx);
-        field_to_json(Obj, "rx", rx);
-    }
-
-    bool StatsEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "timestamp", timestamp);
-            field_from_json(Obj, "tx", tx);
-            field_from_json(Obj, "rx", rx);
-            return true;
-        } catch (...) {
-        }
-        return false;
-    }
-
-    void StatsBlock::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "modified", modified);
-        field_to_json(Obj, "external", external);
-        field_to_json(Obj, "internal", internal);
-    }
-
-    bool StatsBlock::from_json(const Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj, "modified", modified);
-            field_from_json(Obj, "external", external);
-            field_from_json(Obj, "internal", internal);
-            return true;
-        } catch (...) {
-        }
-        return false;
-    }
 }

src/RESTObjects/RESTAPI_SubObjects.h

@@ -24,7 +24,6 @@ namespace OpenWifi::SubObjects {
         int             subnetMaskV6=0;
         std::string     startIPV6;
         std::string     endIPV6;
-        std::string     leaseTime;
 
         void to_json(Poco::JSON::Object &Obj) const;
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
@@ -157,7 +156,6 @@ namespace OpenWifi::SubObjects {
         std::string     ipv6;
         uint64_t        tx=0;
         uint64_t        rx=0;
-        std::string     manufacturer;
 
         void to_json(Poco::JSON::Object &Obj) const;
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
@@ -180,7 +178,6 @@ namespace OpenWifi::SubObjects {
         std::string     ipv6;
         uint64_t        tx=0;
         uint64_t        rx=0;
-        std::string     manufacturer;
 
         void to_json(Poco::JSON::Object &Obj) const;
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
@@ -241,8 +238,6 @@ namespace OpenWifi::SubObjects {
         uint64_t                maximumClients = 64;
         RadioRates              rates;
         RadioHE                 he;
-        bool                    allowDFS=false;
-        std::string             mimo;
         std::vector<std::string>    rawInfo;
 
         void to_json(Poco::JSON::Object &Obj) const;
@@ -252,7 +247,6 @@ namespace OpenWifi::SubObjects {
     struct AccessPoint {
         std::string                 id;
         std::string                 macAddress;
-        std::string                 serialNumber;
         std::string                 name;
         std::string                 deviceType;
         SubscriberDeviceList        subscriberDevices;
@@ -265,12 +259,6 @@ namespace OpenWifi::SubObjects {
         std::vector<RadioInformation>   radios;
         bool                        automaticUpgrade = true;
         std::string                 configurationUUID;
-        std::string                 currentFirmware;
-        uint64_t                    currentFirmwareDate;
-        std::string                 latestFirmware;
-        uint64_t                    latestFirmwareDate;
-        bool                        newFirmwareAvailable;
-        std::string                 latestFirmwareURI;
 
         void to_json(Poco::JSON::Object &Obj) const;
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
@@ -300,23 +288,6 @@ namespace OpenWifi::SubObjects {
         void to_json(Poco::JSON::Object &Obj) const;
         bool from_json(const Poco::JSON::Object::Ptr &Obj);
     };
-
-    struct StatsEntry {
-        uint64_t        timestamp=0;
-        uint64_t        tx=0;
-        uint64_t        rx=0;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
-
-    struct StatsBlock {
-        uint64_t                    modified=0;
-        std::vector<StatsEntry>     external, internal;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(const Poco::JSON::Object::Ptr &Obj);
-    };
 }
 
 #endif //OWSUB_RESTAPI_SUBOBJECTS_H

src/SMSSender.cpp

@@ -2,18 +2,23 @@
 // Created by stephane bourque on 2021-10-09.
 //
 
+#include <aws/sns/SNSClient.h>
+#include <aws/sns/model/PublishRequest.h>
+#include <aws/sns/model/PublishResult.h>
+#include <aws/sns/model/GetSMSAttributesRequest.h>
+
 #include "MFAServer.h"
 #include "SMS_provider_aws.h"
 #include "SMS_provider_twilio.h"
 #include "SMSSender.h"
+#include "framework/MicroService.h"
 
-#include "framework/MicroServiceFuncs.h"
 namespace OpenWifi {
 
     int SMSSender::Start() {
-        Enabled_ = MicroServiceConfigGetBool("smssender.enabled",false);
+        Enabled_ = MicroService::instance().ConfigGetBool("smssender.enabled",false);
         if(Enabled_) {
-            Provider_ = MicroServiceConfigGetString("smssender.provider","aws");
+            Provider_ = MicroService::instance().ConfigGetString("smssender.provider","aws");
             if(Provider_=="aws") {
                 ProviderImpl_ = std::make_unique<SMS_provider_aws>(Logger());
             } else if(Provider_=="twilio") {
@@ -29,7 +34,7 @@ namespace OpenWifi {
     }
 
     void SMSSender::CleanCache() {
-        uint64_t Now=OpenWifi::Now();
+        uint64_t Now=std::time(nullptr);
         for(auto i=begin(Cache_);i!=end(Cache_);) {
             if((Now-i->Created)>300)
                 i = Cache_.erase(i);
@@ -40,10 +45,8 @@ namespace OpenWifi {
 
     bool SMSSender::StartValidation(const std::string &Number, const std::string &UserName) {
         std::lock_guard     G(Mutex_);
-        if(!Enabled_)
-            return false;
         CleanCache();
-        uint64_t Now=OpenWifi::Now();
+        uint64_t Now=std::time(nullptr);
         auto Challenge = MFAServer::MakeChallenge();
         Cache_.emplace_back(SMSValidationCacheEntry{.Number=Number, .Code=Challenge, .UserName=UserName, .Created=Now});
         std::string Message = "Please enter the following code on your login screen: " + Challenge;
@@ -53,9 +56,6 @@ namespace OpenWifi {
     bool SMSSender::IsNumberValid(const std::string &Number, const std::string &UserName) {
         std::lock_guard     G(Mutex_);
 
-        if(!Enabled_)
-            return false;
-
         for(const auto &i:Cache_) {
             if(i.Number==Number && i.UserName==UserName)
                 return i.Validated;
@@ -66,9 +66,6 @@ namespace OpenWifi {
     bool SMSSender::CompleteValidation(const std::string &Number, const std::string &Code, const std::string &UserName) {
         std::lock_guard     G(Mutex_);
 
-        if(!Enabled_)
-            return false;
-
         for(auto &i:Cache_) {
             if(i.Code==Code && i.Number==Number && i.UserName==UserName) {
                 i.Validated=true;
@@ -80,7 +77,7 @@ namespace OpenWifi {
 
     bool SMSSender::Send(const std::string &PhoneNumber, const std::string &Message) {
         if(!Enabled_) {
-            poco_information(Logger(),"SMS has not been enabled. Messages cannot be sent.");
+            Logger().information("SMS has not been enabled. Messages cannot be sent.");
             return false;
         }
         return ProviderImpl_->Send(PhoneNumber,Message);

src/SMSSender.h

@@ -2,13 +2,14 @@
 // Created by stephane bourque on 2021-10-09.
 //
 
-#pragma once
+#ifndef OWSEC_SMSSENDER_H
+#define OWSEC_SMSSENDER_H
 
 #include <aws/core/Aws.h>
 #include <aws/s3/S3Client.h>
 #include <aws/core/auth/AWSCredentials.h>
 
-#include "framework/SubSystemServer.h"
+#include "framework/MicroService.h"
 #include "SMS_provider.h"
 
 namespace OpenWifi {
@@ -17,7 +18,7 @@ namespace OpenWifi {
         std::string Number;
         std::string Code;
         std::string UserName;
-        uint64_t    Created = OpenWifi::Now();
+        uint64_t    Created = std::time(nullptr);
         bool        Validated = false;
     };
 
@@ -53,3 +54,6 @@ namespace OpenWifi {
     inline SMSSender * SMSSender() { return SMSSender::instance(); }
 
 }
+
+
+#endif //OWSEC_SMSSENDER_H