summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFulup Ar Foll <fulup@iot.bzh>2016-05-26 00:06:57 +0200
committerFulup Ar Foll <fulup@iot.bzh>2016-05-26 00:06:57 +0200
commit6d06a2a9a02906ce4c848540d74c3c5798688664 (patch)
tree63f7d1e0b14b0d09ce9de094678773f59a6897b7
parentc8a7784c665e1571400853c0c91b9c47be3ce86f (diff)
Update to LoginClient Plugin
-rw-r--r--afb-client/app/Frontend/pages/Home/Home.html4
-rw-r--r--afb-client/app/Frontend/pages/Home/HomeModule.js24
-rw-r--r--afb-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js7
3 files changed, 18 insertions, 17 deletions
diff --git a/afb-client/app/Frontend/pages/Home/Home.html b/afb-client/app/Frontend/pages/Home/Home.html
index df20ee2..509bd6f 100644
--- a/afb-client/app/Frontend/pages/Home/Home.html
+++ b/afb-client/app/Frontend/pages/Home/Home.html
@@ -16,10 +16,10 @@ animationIn: slideInRight
<div class="button-box box-content ">
- <submit-button class="session-button {{ctrl.class.create}}" icon="fi-unlock" label="Open" clicked="ctrl.OpenSession" ></submit-button>
+ <submit-button class="session-button {{ctrl.class.login}}" icon="fi-unlock" label="Login" clicked="ctrl.LoginClient" ></submit-button>
<submit-button class="session-button {{ctrl.class.check}}" icon="fi-checkbox" label="Check" clicked="ctrl.CheckSession" ></submit-button>
<submit-button class="session-button {{ctrl.class.refresh}}" icon="fi-arrows-compress" label="Refresh" clicked="ctrl.RefreshSession" ></submit-button>
- <submit-button class="session-button {{ctrl.class.reset}}" icon="fi-lock" label="Close" clicked="ctrl.ResetSession" ></submit-button>
+ <submit-button class="session-button {{ctrl.class.logout}}" icon="fi-lock" label="Logout" clicked="ctrl.LogoutClient" ></submit-button>
</div>
<div class="message-box box-content vertical grid-frame">
diff --git a/afb-client/app/Frontend/pages/Home/HomeModule.js b/afb-client/app/Frontend/pages/Home/HomeModule.js
index b082ee0..1743654 100644
--- a/afb-client/app/Frontend/pages/Home/HomeModule.js
+++ b/afb-client/app/Frontend/pages/Home/HomeModule.js
@@ -30,8 +30,8 @@ angular.module('HomeModule', ['SubmitButton', 'TokenRefresh','ModalNotification'
}
switch (jresp.request.reqid) {
- case 'create':
- case 'reset':
+ case 'login':
+ case 'logout':
scope.class={};
break;
@@ -58,29 +58,29 @@ angular.module('HomeModule', ['SubmitButton', 'TokenRefresh','ModalNotification'
console.log ("FX: "+ JSON.stringify(response));
};
- scope.OpenSession = function() {
- console.log ("OpenSession");
- AppCall.get ("token", "create", {/*query*/}, scope.OnResponse, scope.InvalidApiCall);
+ scope.LoginClient = function() {
+ console.log ("LoginClient");
+ AppCall.get ("auth", "login", {/*query*/}, scope.OnResponse, scope.InvalidApiCall);
};
scope.CheckSession = function() {
- console.log ("CloseSession");
- AppCall.get ("token", "check", {/*query*/}, scope.OnResponse, scope.InvalidApiCall);
+ console.log ("CheckSession");
+ AppCall.get ("auth", "check", {/*query*/}, scope.OnResponse, scope.InvalidApiCall);
};
scope.RefreshSession = function() {
console.log ("RefreshSession");
- AppCall.get ("token", "refresh", {/*query*/}, scope.OnResponse, scope.InvalidApiCall);
+ AppCall.get ("auth", "refresh", {/*query*/}, scope.OnResponse, scope.InvalidApiCall);
};
- scope.ResetSession = function() {
- console.log ("ResetSession");
- AppCall.get ("token", "reset", {/*query*/}, scope.OnResponse, scope.InvalidApiCall);
+ scope.LogoutClient = function() {
+ console.log ("LogoutClient");
+ AppCall.get ("auth", "logout", {/*query*/}, scope.OnResponse, scope.InvalidApiCall);
};
scope.Initialised = function () {
- scope.class = {create: "success"};
+ scope.class = {login: "success"};
}
});
diff --git a/afb-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js b/afb-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js
index 4dff4c9..3e5e8d6 100644
--- a/afb-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js
+++ b/afb-client/app/Frontend/widgets/Notifications/TokenRefreshSvc.js
@@ -86,7 +86,7 @@ angular.module('TokenRefresh', ['AppConfig', 'ModalNotification'])
// Check Binder status
scope.getping = function() {
- AppCall.get ("token", "ping", {/*query*/},function(jresp, errcode) {
+ AppCall.get (scope.plugin, "ping", {/*query*/},function(jresp, errcode) {
if (errcode !== 200 || jresp.request.status !== "success") {
Notification.warning ({message: jresp.request.info, delay: 5000});
scope.offline();
@@ -100,7 +100,7 @@ angular.module('TokenRefresh', ['AppConfig', 'ModalNotification'])
// Check Binder status
scope.refresh = function() {
- AppCall.get ("token", "refresh", {/*query*/}, function(jresp, errcode) {
+ AppCall.get (scope.plugin, "refresh", {/*query*/}, function(jresp, errcode) {
scope.onsuccess (jresp, errcode);
@@ -111,7 +111,7 @@ angular.module('TokenRefresh', ['AppConfig', 'ModalNotification'])
// Initial connection
scope.loggin = function() {
- AppCall.get ("token", "create", {token: AppConfig.session.initial}, function(jresp, errcode) {
+ AppCall.get (scope.plugin, "login", {token: AppConfig.session.initial}, function(jresp, errcode) {
if (!scope.onsuccess (jresp, errcode)) return;
@@ -124,6 +124,7 @@ angular.module('TokenRefresh', ['AppConfig', 'ModalNotification'])
// Parse Widget Parameters
+ scope.plugin = attrs.plugin || "auth";
scope.icon = attrs.icon || "fi-lightbulb";
scope.hostname = $location.host();
scope.httpdport = $location.port();