Fixing the USERROLEs

build

@@ -1 +1 @@
-54
+55

openpapi/ucentralsec/owsec.yaml

@@ -299,10 +299,12 @@ components:
           enum:
             - root
             - admin
-            - sub
+            - subscriber
             - csr
             - system
-            - special
+            - installer
+            - noc
+            - accounting
         oauthType:
           type: string
           enum:

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";
         }
     }
 

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);