clean up code for auth and server information

Change-Id: I0881874cb00d687eb45610a0bdc8249cbdf69969
Signed-off-by: Sangkoo Kim <sangkoo.kim@samsung.com>

diff --git a/res/device_info.ini b/res/device_info.ini
index fafd30436ed1bf03ef61f08b3ce781e8321756d0..92a1ae07b62f693a47f34abcdc5d6f7b7edc6b31 100755 (executable)
--- a/res/device_info.ini
+++ b/res/device_info.ini
@@ -1,9 +1,7 @@
 [device_info]
-manufacturer=samsung
-model_name=tm1
-firmware_ver=1.0
+manufacturer=
+model_name=
+firmware_ver=
 firmware_update_state=0
-uuid=
-access_token=
-content_server=http://13.124.95.191:8000
-ocf_server=13.124.29.169:5683
+content_server=
+ocf_server=

diff --git a/src/ua_client.cpp b/src/ua_client.cpp
index 0f81bf3c5f314a3b8335770e3573680986700598..02bbaf71af4f783fcf4e9cb9f7bda25738097b41 100755 (executable)
--- a/src/ua_client.cpp
+++ b/src/ua_client.cpp
@@ -35,16 +35,11 @@
 
 #include "ua_client.h"
 
-#define _WIFI_AUTO_CONNECT_ // WIFI Auto connection :: FOR TEST
-
 #define OC_SECURITY_DB_DAT_FILE_NAME           "oic_svr_db.dat"
 #define OC_RSRVD_PROTOCOL_INDEPENDENT_ID       "piid"
 #define OC_CONTROLEE_DATA_FILE_PATH                    "/opt/usr/data/ua_client/"
 #define OC_CONTROLEE_DB_DAT_FILE_NAME          ".firmware_controlee.dat"
 
-//#define UA_OCF_SERVER_URL                    "13.124.29.169:5683"
-//#define UA_CONTENTS_SERVER_URL               "http://13.124.95.191:8000"
-
 #define UPDATE_FILE "/opt/usr/data/fota/tota_init"
 
 using namespace OC;
@@ -703,8 +698,8 @@ void handleSignupCB(const HeaderOptions &,
         g_accesstoken = rep.getValueToString("accesstoken");
         g_uid = rep.getValueToString("uid");
 
-               _set_device_info("uuid", g_uid.c_str());
-               _set_device_info("access_token", g_accesstoken.c_str());
+//             _set_device_info("uuid", g_uid.c_str());
+//             _set_device_info("access_token", g_accesstoken.c_str());
     }
 
     g_callbackLock.notify_all();
@@ -1237,7 +1232,7 @@ void *_start_ua_client(void *data)
        }
 #endif
 
-       // For TDC
+
        ua_account_info_s *account_info = (ua_account_info_s *)calloc(1, sizeof(ua_account_info_s));
 
        if (account_info) {
@@ -1261,20 +1256,11 @@ void *_start_ua_client(void *data)
             accountMgr->signIn(g_uid, g_accesstoken, &handleSigninCB);
             g_callbackLock.wait(lock);
         } else {
-#if 1 // FOR TDC
-            UA_LOG("Sign-up...");
-            accountMgr->signUp(account_info->account, account_info->auth_code, &handleSignupCB);
-            g_callbackLock.wait(lock);
-            UA_LOG("Sign-In...");
-            accountMgr->signIn(g_uid, g_accesstoken, &handleSigninCB);
-            g_callbackLock.wait(lock);
-#else
             UA_LOG("Sign-In...");
             string uuid(device->uuid);
             string access_token(device->access_token);
             accountMgr->signIn(uuid, access_token, &handleSigninCB);
             g_callbackLock.wait(lock);
-#endif
         }
     }
     catch (exception& e){