diff --git a/build b/build index 43c451e..7c6ba0f 100644 --- a/build +++ b/build @@ -1 +1 @@ -54 \ No newline at end of file +55 \ No newline at end of file diff --git a/openpapi/ucentralsec/owsec.yaml b/openpapi/ucentralsec/owsec.yaml index 09ab34b..26ab0d1 100644 --- a/openpapi/ucentralsec/owsec.yaml +++ b/openpapi/ucentralsec/owsec.yaml @@ -299,10 +299,12 @@ components: enum: - root - admin - - sub + - subscriber - csr - system - - special + - installer + - noc + - accounting oauthType: type: string enum: diff --git a/src/RESTAPI_SecurityObjects.cpp b/src/RESTAPI_SecurityObjects.cpp index ce6f378..31bad13 100644 --- a/src/RESTAPI_SecurityObjects.cpp +++ b/src/RESTAPI_SecurityObjects.cpp @@ -58,21 +58,28 @@ namespace OpenWifi::SecurityObjects { return CSR; else if (!Poco::icompare(U, "system")) return SYSTEM; - else if (!Poco::icompare(U, "special")) - return SPECIAL; + else if (!Poco::icompare(U, "installer")) + return INSTALLER; + else if (!Poco::icompare(U, "noc")) + return NOC; + else if (!Poco::icompare(U, "accounting")) + return ACCOUNTING; return UNKNOWN; } std::string UserTypeToString(USER_ROLE U) { switch(U) { - case UNKNOWN: return "unknown"; case ROOT: return "root"; + case ADMIN: return "admin"; case SUBSCRIBER: return "subscriber"; case CSR: return "csr"; case SYSTEM: return "system"; - case SPECIAL: return "special"; - case ADMIN: return "admin"; - default: return "unknown"; + case INSTALLER: return "installer"; + case NOC: return "noc"; + case ACCOUNTING: return "accounting"; + case UNKNOWN: + default: + return "unknown"; } } diff --git a/src/RESTAPI_SecurityObjects.h b/src/RESTAPI_SecurityObjects.h index 16b88f6..1c7511b 100644 --- a/src/RESTAPI_SecurityObjects.h +++ b/src/RESTAPI_SecurityObjects.h @@ -42,7 +42,7 @@ namespace OpenWifi::SecurityObjects { }; enum USER_ROLE { - UNKNOWN, ROOT, ADMIN, SUBSCRIBER, CSR, SYSTEM, SPECIAL + UNKNOWN, ROOT, ADMIN, SUBSCRIBER, CSR, SYSTEM, INSTALLER, NOC, ACCOUNTING }; USER_ROLE UserTypeFromString(const std::string &U);