Functioning integration
This commit is contained in:
@@ -25,7 +25,10 @@ angular.module('app')
|
||||
.controller('FooterCtrl', function ($rootScope, authManager, modelManager, $timeout, dbManager,
|
||||
syncManager, storageManager, passcodeManager, componentManager, singletonManager, nativeExtManager) {
|
||||
|
||||
this.securityUpdateAvailable = authManager.checkForSecurityUpdate();
|
||||
authManager.checkForSecurityUpdate().then((available) => {
|
||||
this.securityUpdateAvailable = available;
|
||||
})
|
||||
|
||||
$rootScope.$on("security-update-status-changed", () => {
|
||||
this.securityUpdateAvailable = authManager.securityUpdateAvailable;
|
||||
})
|
||||
|
||||
@@ -88,7 +88,7 @@ angular.module('app')
|
||||
$rootScope.$broadcast(syncEvent, data || {});
|
||||
});
|
||||
|
||||
syncManager.loadLocalItems(function(items) {
|
||||
syncManager.loadLocalItems().then(() => {
|
||||
$scope.allTag.didLoad = true;
|
||||
$scope.$apply();
|
||||
|
||||
@@ -285,20 +285,20 @@ angular.module('app')
|
||||
return $location.search()[key];
|
||||
}
|
||||
|
||||
function autoSignInFromParams() {
|
||||
async function autoSignInFromParams() {
|
||||
var server = urlParam("server");
|
||||
var email = urlParam("email");
|
||||
var pw = urlParam("pw");
|
||||
|
||||
if(!authManager.offline()) {
|
||||
// check if current account
|
||||
if(syncManager.serverURL === server && authManager.user.email === email) {
|
||||
if(await syncManager.getServerURL() === server && authManager.user.email === email) {
|
||||
// already signed in, return
|
||||
return;
|
||||
} else {
|
||||
// sign out
|
||||
authManager.signOut();
|
||||
storageManager.clearAllData(() => {
|
||||
storageManager.clearAllData().then(() => {
|
||||
window.location.reload();
|
||||
})
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ class LockScreen {
|
||||
}
|
||||
|
||||
authManager.signOut();
|
||||
storageManager.clearAllData(() => {
|
||||
storageManager.clearAllData().then(() => {
|
||||
window.location.reload();
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user