X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fsrc%2Fusermanagement.cpp;h=59d25d2f260ee3730611da248887255f84633f99;hb=33c97e0f4b6bdb183197e73ea7e15b26699abfb9;hp=2537afc373da46525ea2a934ddb27034e28fe48a;hpb=25461276ebc1d5e9e765a99ff44ee8e4edd144e5;p=apps%2Fhomescreen.git

diff --git a/homescreen/src/usermanagement.cpp b/homescreen/src/usermanagement.cpp
index 2537afc..59d25d2 100644
--- a/homescreen/src/usermanagement.cpp
+++ b/homescreen/src/usermanagement.cpp
@@ -1,7 +1,11 @@
+#include <stdlib.h>
 #include "usermanagement.h"
 #include <QDebug>
 #include <QtCore/QJsonDocument>
 #include <QByteArray>
+
+#define APINAME "identity"
+
 UserManagement::UserManagement(QObject *root) : QObject()
 {
     home = root->findChild<QObject *>("Home");
@@ -41,7 +45,7 @@ void UserManagement::slot_disconnect()
     QMetaObject::invokeMethod(home, "changeFlag", Q_ARG(QVariant, "./images/us_flag.png"));
     QMetaObject::invokeMethod(home, "setUser", Q_ARG(QVariant, ""), Q_ARG(QVariant, ""));
     QVariantList list;
-    list << 2 << QString().setNum(++sequence) << "agl-identity-agent/logout" << true;
+    list << 2 << QString().setNum(++sequence) << APINAME"/logout" << true;
     listToJson(list, &data);
     slot_sendData();
 }
@@ -100,7 +104,7 @@ void UserManagement::slot_turnOffRed()
 void UserManagement::connectWebsockets()
 {
 #ifdef REAL_SERVER
-    const QUrl url(REAL_SERVER);
+    const QUrl url(getenv("IDENTITY_WEBSOCKET") ?: REAL_SERVER);
 #else
     const QUrl url(QStringLiteral("ws://localhost:1234"));
 #endif
@@ -125,11 +129,11 @@ void UserManagement::onConnected()
             this, &UserManagement::onTextMessageReceived);
     QVariantList list;
     QByteArray json;
-    list << 2 << QString().setNum(++sequence) << "agl-identity-agent/subscribe" << true;
+    list << 2 << QString().setNum(++sequence) << APINAME"/subscribe" << true;
     listToJson(list, &json);
     webSocket.sendTextMessage(QString(json));
     list .clear();
-    list << 2 << QString().setNum(++sequence) << "agl-identity-agent/scan" << true;
+    list << 2 << QString().setNum(++sequence) << APINAME"/scan" << true;
     listToJson(list, &json);
     webSocket.sendTextMessage(QString(json));
 }
@@ -151,7 +155,7 @@ void UserManagement::onTextMessageReceived(QString message)
         if(map["eventName"].toString() == "login") {
             //qWarning()<<"login received in client";
             list.clear();
-            list << 2 << QString().setNum(++sequence) << "agl-identity-agent/get" << true;
+            list << 2 << QString().setNum(++sequence) << APINAME"/get" << true;
             listToJson(list, &data);
             QTimer::singleShot(300, this, SLOT(slot_sendData()));
         }
@@ -302,9 +306,9 @@ void UserManagement::processTextMessage(QString message)
     QString reply;
     switch(messType) {
     case 2:
-        if(cmd == "agl-identity-agent/subscribe") {
+        if(cmd == APINAME"/subscribe") {
             reply = "[3,\"999maitai999\",{\"jtype\":\"afb-reply\",\"request\":{\"status\":\"success\",\"uuid\":\"1f2f7678-6f2e-4f54-b7b5-d0d4dcbf2e41\"}}]";
-        } else if (cmd == "agl-identity-agent/get") {
+        } else if (cmd == APINAME"/get") {
             reply = "[3,\"999maitai99\",{\"jtype\":\"afb-reply\",\"request\":{\"status\":\"success\"},\"response\":....}]";
             reply = reply.replace("....", clientDetails);
         } else {
@@ -344,8 +348,8 @@ void UserManagement::slot_timerTest()
         timerTest.stop();
         return;
     }
-    pSocket->sendTextMessage("[5,\"agl-identity-agent/event\",{\"event\":\"agl-identity-agent\/event\",\"data\":{\"eventName\":\"incoming\",\"accountid\":\"D2:D4:71:0D:B5:F1\",\"nickname\":\"D2:D4:71:0D:B5:F1\"},\"jtype\":\"afb-event\"}]");
-    pSocket->sendTextMessage("[5,\"agl-identity-agent/event\",{\"event\":\"agl-identity-agent\/event\",\"data\":{\"eventName\":\"login\",\"accountid\":\"null\"},\"jtype\":\"afb-event\"}]");
+    pSocket->sendTextMessage("[5,\APINAME"/event\",{\"event\":\APINAME"\/event\",\"data\":{\"eventName\":\"incoming\",\"accountid\":\"D2:D4:71:0D:B5:F1\",\"nickname\":\"D2:D4:71:0D:B5:F1\"},\"jtype\":\"afb-event\"}]");
+    pSocket->sendTextMessage("[5,\APINAME"/event\",{\"event\":\APINAME"\/event\",\"data\":{\"eventName\":\"login\",\"accountid\":\"null\"},\"jtype\":\"afb-event\"}]");
 }
 void UserManagement::onServerClosed()
 {