Merge branch 'fronkdev' into 'master'

Fixed Vodia Identity switching when impersonated

See merge request fronk/thetool!1621

application/Api/v1/Modules/Operationaldata/SnoppCitycom.php

@@ -71,11 +71,12 @@ class SnoppCitycom extends Modules\ApiControllerModule
         $cc_api_client = new \Citycom_OanApiClient(CITYCOM_OAN_API_USER, CITYCOM_OAN_API_PASS);
         $cc_api = new \Citycom_OanApiHelper($cc_api_client);
 
-        if(!$cc_api->orderServices($preorder, $cc_home_id, $data)) {
+        $services = $cc_api->orderServices($preorder, $cc_home_id, $data);
+        if(!$services) {
             return \mfResponse::InternalServerError(["message" => "Error activating service"]);
         }
 
-        return \mfResponse::Ok();
+        return \mfResponse::Ok(["message" => "Services ordered successfully", "activation_status" => "active"]);
 
     }
 

application/User/UserController.php

@@ -417,21 +417,23 @@ class UserController extends mfBaseController
     }
 
     protected function apiAction() {
-      if(!$this->me->is(["Admin"])) {
-        $this->redirect("Dashboard");
-      }
       $do = $this->request->do;
       $data = [];
 
+      $me = new User();
+      $me->load();
+
+      $return = false;
+
       switch($do) {
         case "sse":
-          $return = $this->startSuperexpertApi();
+          $me->is(["Admin"]) && $return = $this->startSuperexpertApi();
           break;
         case "ese":
-          $return = $this->extendSuperexpertApi();
+          $me->is(["Admin"]) && $return = $this->extendSuperexpertApi();
           break;
         case "endse":
-          $return = $this->endSuperexpertApi();
+          $me->is(["Admin"]) && $return = $this->endSuperexpertApi();
           break;
         case "getVodiaIdentity":
           $return = $this->getVodiaIdentityApi();
@@ -457,11 +459,14 @@ class UserController extends mfBaseController
             return ["enabled" => false];
         }
 
+        $me = new User();
+        $me->loadMe();
+
         $vodia = new Vodia_Api(VODIA_API_URL, VODIA_API_ADMIN_USER, VODIA_API_ADMIN_PASS);
 
-        $domain = $this->me->getFlag("vodia_identity_domain")->value();
-        $username = $this->me->getFlag("vodia_identity_username")->value();
-        $default = $this->me->getFlag("vodia_identity_default")->value();
+        $domain = $me->getFlag("vodia_identity_domain")->value();
+        $username = $me->getFlag("vodia_identity_username")->value();
+        $default = $me->getFlag("vodia_identity_default")->value();
 
 
         if(!$domain || !$username || !$default) {
@@ -503,8 +508,11 @@ class UserController extends mfBaseController
             return false;
         }
 
-        $domain = $this->me->getFlag("vodia_identity_domain")->value();
-        $username = $this->me->getFlag("vodia_identity_username")->value();
+        $me = new User();
+        $me->loadMe();
+
+        $domain = $me->getFlag("vodia_identity_domain")->value();
+        $username = $me->getFlag("vodia_identity_username")->value();
 
         if(!$domain || !$username) {
             return ["enabled" => false];

lib/Citycom/OanApiHelper.php

@@ -165,6 +165,7 @@ class Citycom_OanApiHelper {
             }
 
             $service_return[] = [
+                "service_number" => $new_service->service_number,
                 "sublocation_id" => $sublocation_id,
                 "service_type" => $ctag_service_type,
                 "ctag" => $ctag,
@@ -176,6 +177,7 @@ class Citycom_OanApiHelper {
 
             $service_return[] = [
                 "sublocation_id" => $sublocation_id,
+                "service_number" => "30-fggreger-01",
                 "service_type" => $ctag_service_type,
                 "ctag" => $ctag,
                 "ont" => [