@incdevco/framework
Version:
node.js lambda framework
1 lines • 196 kB
JavaScript
{"filter":false,"title":"bootstrap.js","tooltip":"/angular/modules/auth/bootstrap.js","undoManager":{"mark":29,"position":29,"stack":[[{"start":{"row":36,"column":0},"end":{"row":231,"column":26},"action":"remove","lines":["<<<<<<< daae3e09b0afd65e62c705be8134d8a42a0d1125","/*.factory('Auth', ["," 'COGNITO_IDENTITY_POOL_ID',"," 'COGNITO_IDENTITY_POOL_REGION',"," 'API',"," 'CognitoCredentials',"," '$injector',"," '$q',"," '$rootScope',"," '$timeout',"," function (IdentityPoolId, "," IdentityPoolRegion, "," API,"," CognitoCredentials, "," $injector, "," $q,"," $rootScope,"," $timeout) {"," "," var authenticatePromise, "," credentials, "," credentialsKey = 'auth.credentials',"," expiration,"," identity, "," logins;"," "," function getLocalCredentials() {"," "," var possible = localStorage.getItem(credentialsKey);"," "," var exp;"," "," if (possible) {"," "," possible = JSON.parse(possible);"," "," if (possible) {"," "," exp = moment.unix(possible.expireTime);"," "," }"," "," }"," "," if (exp && exp.isBefore()) {"," "," credentials = angular.copy(possible);"," "," expiration = exp;"," "," }"," "," }"," "," $rootScope.$on('cognito.credentials', function (event, creds) {"," "," credentials = creds;"," "," localStorage.setItem(credentialsKey, JSON.stringify(credentials));"," "," });"," "," return {"," authenticate: function (RoleSessionName, $targetEvent) {"," "," if (this.is()) {"," "," return $q.resolve(credentials);"," "," }"," "," if (!authenticatePromise) {"," "," authenticatePromise = $injector.get('$mdDialog').show({"," controller: 'AuthenticateController',"," controllerAs: 'crtl',"," templateUrl: 'auth/templates/authenticate.html',"," fullscreen: true,"," clickOutsideToClose: true,"," parent: angular.element(document.body),"," targetEvent: $targetEvent"," })"," .then(function (result) {"," "," logins = result.logins;"," "," return CognitoCredentials({"," IdentityId: null,"," IdentityPoolId: IdentityPoolId,"," Logins: result.logins,"," RoleSessionName: RoleSessionName"," }, IdentityPoolRegion);"," "," })"," .then(function (result) {"," "," credentials = result.credentials;"," "," identity = result.identity;"," "," $rootScope.$broadcast('authenticated', identity);"," "," return credentials;"," "," })"," .finally(function () {"," "," authenticatePromise = null;"," "," });"," "," }"," "," return authenticatePromise;"," "," },"," credentials: credentials,"," deauthenticate: function (RoleSessionName, $targetEvent) {"," "," $rootScope.$broadcast('deauthenticated');"," "," return $injector.get('$mdDialog').show({"," controller: 'DeauthenticateController',"," controllerAs: 'crtl',"," templateUrl: 'auth/templates/deauthenticate.html',"," fullscreen: true,"," clickOutsideToClose: true,"," parent: angular.element(document.body),"," targetEvent: $targetEvent"," })"," .then(function (result) {"," "," return CognitoCredentials({"," IdentityId: null,"," IdentityPoolId: IdentityPoolId,"," Logins: result.logins,"," RoleSessionName: RoleSessionName"," }, IdentityPoolRegion);"," "," })"," .then(function (result) {"," "," credentials = result.credentials;"," "," identity = result.identity;"," "," $rootScope.$broadcast('anonymous', result.credentials);"," "," return credentials;"," "," });"," "," },"," identity: identity,"," is: function () {"," "," var current = (new Date().valueOf() / 1000), loaded = false;"," "," if (!credentials) {"," "," credentials = localStorage.getItem(credentialsKey);"," "," if (credentials) {"," "," credentials = JSON.parse(credentials);"," "," loaded = true;"," "," }"," "," }"," "," if (credentials && (credentials.expireTime > current)) {"," "," if (loaded) {"," "," $rootScope.$broadcast('cognito.credentials', credentials);"," "," }"," "," return true;"," "," } else {"," "," return false;"," "," }"," "," },"," logins: logins"," };"," "," }","])*/","=======",">>>>>>> removed unessecary"],"id":2}],[{"start":{"row":26,"column":0},"end":{"row":46,"column":0},"action":"insert","lines":["<<<<<<< 7190ee748be21fb81c8daa031d6736435e07289a","======="," $scope.signInWithGoogle = function ($event) {"," "," console.log('signInWithGoogle');"," "," $injector.get('GoogleSignIn').login()"," .then(function (result) {"," "," $scope.then(result);"," "," })"," .catch(function (exception) {"," "," $scope.catch(exception);"," "," });"," "," };",">>>>>>> logging",""],"id":3,"ignore":true},{"start":{"row":345,"column":0},"end":{"row":356,"column":0},"action":"insert","lines":["<<<<<<< 7190ee748be21fb81c8daa031d6736435e07289a","======="," console.log('GoogleSignIn.login');"," "," if (!deferred) {"," "," deferred = $q.defer();"," "," }"," ",">>>>>>> logging",""]},{"start":{"row":359,"column":0},"end":{"row":361,"column":0},"action":"insert","lines":[" console.log('GoogleSignIn', 'ready');"," ",""]}],[{"start":{"row":345,"column":0},"end":{"row":355,"column":15},"action":"remove","lines":["<<<<<<< 7190ee748be21fb81c8daa031d6736435e07289a","======="," console.log('GoogleSignIn.login');"," "," if (!deferred) {"," "," deferred = $q.defer();"," "," }"," ",">>>>>>> logging"],"id":4},{"start":{"row":345,"column":0},"end":{"row":352,"column":12},"action":"insert","lines":[" console.log('GoogleSignIn.login');"," "," if (!deferred) {"," "," deferred = $q.defer();"," "," }"," "]}],[{"start":{"row":26,"column":0},"end":{"row":45,"column":15},"action":"remove","lines":["<<<<<<< 7190ee748be21fb81c8daa031d6736435e07289a","======="," $scope.signInWithGoogle = function ($event) {"," "," console.log('signInWithGoogle');"," "," $injector.get('GoogleSignIn').login()"," .then(function (result) {"," "," $scope.then(result);"," "," })"," .catch(function (exception) {"," "," $scope.catch(exception);"," "," });"," "," };",">>>>>>> logging"],"id":5},{"start":{"row":26,"column":0},"end":{"row":42,"column":10},"action":"insert","lines":[" $scope.signInWithGoogle = function ($event) {"," "," console.log('signInWithGoogle');"," "," $injector.get('GoogleSignIn').login()"," .then(function (result) {"," "," $scope.then(result);"," "," })"," .catch(function (exception) {"," "," $scope.catch(exception);"," "," });"," "," };"]}],[{"start":{"row":18,"column":0},"end":{"row":18,"column":15},"action":"remove","lines":[" function () {"],"id":6,"ignore":true},{"start":{"row":18,"column":0},"end":{"row":25,"column":28},"action":"insert","lines":["<<<<<<< b61370b18c809f216e879f346ada9241553eeb35"," function () {","======="," 'Auth',"," 'GoogleSignIn',"," '$injector',"," function (Auth, GoogleSignIn, $injector) {",">>>>>>> render with deferred"]},{"start":{"row":32,"column":0},"end":{"row":33,"column":0},"action":"insert","lines":["<<<<<<< b61370b18c809f216e879f346ada9241553eeb35",""]},{"start":{"row":40,"column":0},"end":{"row":44,"column":0},"action":"insert","lines":["======="," GoogleSignIn.render('GoogleSignIn', {"," onfailure: function (exception) {",">>>>>>> render with deferred",""]},{"start":{"row":45,"column":19},"end":{"row":45,"column":30},"action":"remove","lines":["then(result"]},{"start":{"row":45,"column":19},"end":{"row":45,"column":44},"action":"insert","lines":["deferred.reject(exception"]},{"start":{"row":47,"column":11},"end":{"row":47,"column":12},"action":"remove","lines":[")"]},{"start":{"row":47,"column":11},"end":{"row":47,"column":12},"action":"insert","lines":[","]},{"start":{"row":48,"column":10},"end":{"row":48,"column":17},"action":"remove","lines":[".catch("]},{"start":{"row":48,"column":10},"end":{"row":48,"column":21},"action":"insert","lines":["onsuccess: "]},{"start":{"row":48,"column":31},"end":{"row":48,"column":40},"action":"remove","lines":["exception"]},{"start":{"row":48,"column":31},"end":{"row":48,"column":37},"action":"insert","lines":["result"]},{"start":{"row":50,"column":19},"end":{"row":50,"column":34},"action":"remove","lines":["catch(exception"]},{"start":{"row":50,"column":19},"end":{"row":50,"column":42},"action":"insert","lines":["deferred.resolve(result"]},{"start":{"row":52,"column":11},"end":{"row":53,"column":10},"action":"remove","lines":[");"," "]},{"start":{"row":53,"column":9},"end":{"row":53,"column":10},"action":"insert","lines":[")"]},{"start":{"row":58,"column":0},"end":{"row":58,"column":16},"action":"remove","lines":[" scope: {},"]},{"start":{"row":58,"column":0},"end":{"row":64,"column":28},"action":"insert","lines":["<<<<<<< b61370b18c809f216e879f346ada9241553eeb35"," scope: {},","======="," scope: {"," 'deferred': '='"," },",">>>>>>> render with deferred"]},{"start":{"row":367,"column":12},"end":{"row":368,"column":18},"action":"remove","lines":["ready.promise"," .then("]},{"start":{"row":367,"column":12},"end":{"row":370,"column":25},"action":"insert","lines":["gapi.signin2.render('GoogleSignIn', {"," height: 50,"," longtitle: true,"," onfailure: "]},{"start":{"row":370,"column":35},"end":{"row":370,"column":44},"action":"insert","lines":["exception"]},{"start":{"row":372,"column":14},"end":{"row":372,"column":16},"action":"insert","lines":[" "]},{"start":{"row":372,"column":24},"end":{"row":378,"column":58},"action":"remove","lines":["log('GoogleSignIn', 'ready');"," "," var promise;"," "," if (auth2.isSignedIn.get()) {"," "," promise = $q.when(auth2.currentUser.get())"]},{"start":{"row":372,"column":24},"end":{"row":379,"column":31},"action":"insert","lines":["error(exception);"," "," deferred.reject(exception);"," "," },"," onsuccess: function (result) {"," "," var logins = {}"]},{"start":{"row":381,"column":14},"end":{"row":381,"column":22},"action":"remove","lines":["} else {"]},{"start":{"row":381,"column":14},"end":{"row":381,"column":30},"action":"insert","lines":[" user = result;"]},{"start":{"row":383,"column":16},"end":{"row":383,"column":40},"action":"remove","lines":["promise = auth2.signIn()"]},{"start":{"row":383,"column":16},"end":{"row":383,"column":61},"action":"insert","lines":["logins[key] = user.getAuthResponse().id_token"]},{"start":{"row":385,"column":14},"end":{"row":386,"column":0},"action":"remove","lines":["}",""]},{"start":{"row":385,"column":14},"end":{"row":386,"column":2},"action":"insert","lines":[" deferred.resolve(logins);"," "]},{"start":{"row":387,"column":14},"end":{"row":387,"column":28},"action":"remove","lines":["return promise"]},{"start":{"row":387,"column":14},"end":{"row":387,"column":16},"action":"insert","lines":["},"]},{"start":{"row":388,"column":14},"end":{"row":390,"column":30},"action":"remove","lines":[".then(function (result) {"," "," user = result;"]},{"start":{"row":388,"column":14},"end":{"row":390,"column":24},"action":"insert","lines":["scope: 'profile email',"," theme: 'dark',"," width: 250"]},{"start":{"row":391,"column":12},"end":{"row":391,"column":16},"action":"remove","lines":[" "]},{"start":{"row":391,"column":12},"end":{"row":391,"column":15},"action":"insert","lines":["});"]},{"start":{"row":392,"column":12},"end":{"row":393,"column":0},"action":"insert","lines":["",""]},{"start":{"row":393,"column":4},"end":{"row":395,"column":3},"action":"remove","lines":["deferred.resolve({"," 'accounts.google.com': user.getAuthResponse().id_token"," "]},{"start":{"row":393,"column":4},"end":{"row":395,"column":0},"action":"insert","lines":[" },"," render: function (id, options) {",""]},{"start":{"row":395,"column":12},"end":{"row":395,"column":16},"action":"remove","lines":[" });"]},{"start":{"row":396,"column":12},"end":{"row":398,"column":7},"action":"remove","lines":[" "," });"," "]},{"start":{"row":396,"column":12},"end":{"row":398,"column":0},"action":"insert","lines":["gapi.signin2.render('GoogleSignIn', {"," height: options.height || 50,",""]},{"start":{"row":398,"column":7},"end":{"row":399,"column":0},"action":"remove","lines":["",""]},{"start":{"row":398,"column":14},"end":{"row":399,"column":0},"action":"remove","lines":[" })",""]},{"start":{"row":398,"column":14},"end":{"row":399,"column":2},"action":"insert","lines":["longtitle: options.longtitle || true,"," "]},{"start":{"row":399,"column":14},"end":{"row":399,"column":21},"action":"remove","lines":[".catch("]},{"start":{"row":399,"column":14},"end":{"row":399,"column":25},"action":"insert","lines":["onfailure: "]},{"start":{"row":400,"column":14},"end":{"row":401,"column":0},"action":"remove","lines":["",""]},{"start":{"row":400,"column":14},"end":{"row":401,"column":2},"action":"insert","lines":[" "," "]},{"start":{"row":402,"column":14},"end":{"row":402,"column":16},"action":"insert","lines":[" "]},{"start":{"row":403,"column":14},"end":{"row":403,"column":29},"action":"remove","lines":["deferred.reject"]},{"start":{"row":403,"column":14},"end":{"row":403,"column":33},"action":"insert","lines":[" options.onfailure"]},{"start":{"row":404,"column":14},"end":{"row":405,"column":0},"action":"remove","lines":["",""]},{"start":{"row":404,"column":16},"end":{"row":404,"column":20},"action":"remove","lines":[" "]},{"start":{"row":404,"column":16},"end":{"row":405,"column":0},"action":"insert","lines":["",""]},{"start":{"row":405,"column":6},"end":{"row":406,"column":0},"action":"remove","lines":["});",""]},{"start":{"row":405,"column":14},"end":{"row":405,"column":18},"action":"remove","lines":[" "]},{"start":{"row":405,"column":14},"end":{"row":405,"column":16},"action":"insert","lines":["},"]},{"start":{"row":406,"column":10},"end":{"row":407,"column":0},"action":"remove","lines":["},",""]},{"start":{"row":406,"column":14},"end":{"row":407,"column":0},"action":"remove","lines":[" revoke: function () {",""]},{"start":{"row":406,"column":14},"end":{"row":407,"column":4},"action":"insert","lines":["onsuccess: function (result) {"," "]},{"start":{"row":408,"column":12},"end":{"row":409,"column":2},"action":"remove","lines":[""," "]},{"start":{"row":408,"column":16},"end":{"row":408,"column":22},"action":"remove","lines":[" "]},{"start":{"row":408,"column":16},"end":{"row":408,"column":32},"action":"insert","lines":["var logins = {};"]},{"start":{"row":409,"column":8},"end":{"row":410,"column":0},"action":"remove","lines":[" }",""]},{"start":{"row":409,"column":16},"end":{"row":409,"column":18},"action":"remove","lines":["};"]},{"start":{"row":410,"column":8},"end":{"row":411,"column":0},"action":"remove","lines":["",""]},{"start":{"row":410,"column":16},"end":{"row":415,"column":31},"action":"remove","lines":["ready = $q.defer();"," "," gapi.load('auth2', function () {"," "," gapi.auth2.init({"," client_id: ClientId"]},{"start":{"row":410,"column":16},"end":{"row":416,"column":15},"action":"insert","lines":["user = result;"," "," logins[key] = user.getAuthResponse().id_token;"," "," options.onsuccess(result);"," "," }"]},{"start":{"row":417,"column":12},"end":{"row":417,"column":14},"action":"insert","lines":[" "]},{"start":{"row":417,"column":22},"end":{"row":417,"column":28},"action":"remove","lines":["email "]},{"start":{"row":417,"column":29},"end":{"row":417,"column":30},"action":"remove","lines":["'"]},{"start":{"row":417,"column":29},"end":{"row":417,"column":37},"action":"insert","lines":[" email',"]},{"start":{"row":418,"column":10},"end":{"row":419,"column":0},"action":"remove","lines":["})",""]},{"start":{"row":418,"column":14},"end":{"row":418,"column":45},"action":"remove","lines":[" .then(function (result) {"]},{"start":{"row":418,"column":14},"end":{"row":418,"column":28},"action":"insert","lines":["theme: 'dark',"]},{"start":{"row":419,"column":12},"end":{"row":420,"column":0},"action":"remove","lines":["",""]},{"start":{"row":419,"column":14},"end":{"row":419,"column":39},"action":"remove","lines":[" auth2 = result;"]},{"start":{"row":419,"column":14},"end":{"row":419,"column":24},"action":"insert","lines":["width: 250"]},{"start":{"row":420,"column":12},"end":{"row":420,"column":15},"action":"insert","lines":["});"]},{"start":{"row":421,"column":12},"end":{"row":421,"column":33},"action":"remove","lines":["ready.resolve(auth2);"]},{"start":{"row":422,"column":10},"end":{"row":422,"column":12},"action":"remove","lines":[" "]},{"start":{"row":422,"column":10},"end":{"row":422,"column":12},"action":"insert","lines":["},"]},{"start":{"row":423,"column":10},"end":{"row":423,"column":12},"action":"remove","lines":["},"]},{"start":{"row":423,"column":10},"end":{"row":423,"column":17},"action":"insert","lines":["revoke:"]},{"start":{"row":423,"column":28},"end":{"row":423,"column":37},"action":"remove","lines":["exception"]},{"start":{"row":425,"column":12},"end":{"row":425,"column":36},"action":"remove","lines":["ready.reject(exception);"]},{"start":{"row":427,"column":11},"end":{"row":428,"column":10},"action":"remove","lines":[");"," "]},{"start":{"row":428,"column":9},"end":{"row":428,"column":10},"action":"remove","lines":[")"]}],[{"start":{"row":18,"column":0},"end":{"row":25,"column":28},"action":"remove","lines":["<<<<<<< b61370b18c809f216e879f346ada9241553eeb35"," function () {","======="," 'Auth',"," 'GoogleSignIn',"," '$injector',"," function (Auth, GoogleSignIn, $injector) {",">>>>>>> render with deferred"],"id":7},{"start":{"row":18,"column":0},"end":{"row":21,"column":44},"action":"insert","lines":[" 'Auth',"," 'GoogleSignIn',"," '$injector',"," function (Auth, GoogleSignIn, $injector) {"]}],[{"start":{"row":28,"column":0},"end":{"row":39,"column":28},"action":"remove","lines":["<<<<<<< b61370b18c809f216e879f346ada9241553eeb35"," "," $scope.signInWithGoogle = function ($event) {"," "," console.log('signInWithGoogle');"," "," $injector.get('GoogleSignIn').login()"," .then(function (result) {","======="," GoogleSignIn.render('GoogleSignIn', {"," onfailure: function (exception) {",">>>>>>> render with deferred"],"id":8},{"start":{"row":28,"column":0},"end":{"row":29,"column":43},"action":"insert","lines":[" GoogleSignIn.render('GoogleSignIn', {"," onfailure: function (exception) {"]}],[{"start":{"row":44,"column":0},"end":{"row":50,"column":28},"action":"remove","lines":["<<<<<<< b61370b18c809f216e879f346ada9241553eeb35"," scope: {},","======="," scope: {"," 'deferred': '='"," },",">>>>>>> render with deferred"],"id":9},{"start":{"row":44,"column":0},"end":{"row":46,"column":8},"action":"insert","lines":[" scope: {"," 'deferred': '='"," },"]}],[{"start":{"row":23,"column":4},"end":{"row":29,"column":21},"action":"remove","lines":["return {"," controller: 'AuthenticateController',"," controllerAs: 'crtl',"," link: function ($scope, $element, $attrs, $controller) {"," "," GoogleSignIn.render('GoogleSignIn', {"," onfailure: "],"id":10,"ignore":true},{"start":{"row":23,"column":4},"end":{"row":50,"column":10},"action":"insert","lines":["var providers = ["," {"," key: GoogleSignIn.key,"," user: GoogleSignIn.user,"," render: function () {"," "," GoogleSignIn.render(Auth.deferred, Auth.logins);"," "," },"," templateUrl: 'templates/google-sign-in.html'"," }"," ];"," "," return {","<<<<<<< cc56001642e9a6ba4dd2227fdf7ab995339eaa5d"," controller: 'AuthenticateController',"," controllerAs: 'crtl',"," link: function ($scope, $element, $attrs, $controller) {","======="," link: function ($scope) {",">>>>>>> refactored"," "," Auth.deferred.promise"," .then(function (result) {"," "," $scope.success(result);"," "," },"]},{"start":{"row":51,"column":10},"end":{"row":52,"column":2},"action":"remove","lines":[" "," "]},{"start":{"row":51,"column":10},"end":{"row":52,"column":0},"action":"insert","lines":["",""]},{"start":{"row":52,"column":17},"end":{"row":52,"column":32},"action":"remove","lines":["deferred.reject"]},{"start":{"row":52,"column":17},"end":{"row":52,"column":24},"action":"insert","lines":["failure"]},{"start":{"row":53,"column":10},"end":{"row":54,"column":0},"action":"insert","lines":["",""]},{"start":{"row":54,"column":2},"end":{"row":54,"column":30},"action":"insert","lines":[" }, function (status) {"]},{"start":{"row":55,"column":10},"end":{"row":55,"column":12},"action":"remove","lines":["},"]},{"start":{"row":56,"column":10},"end":{"row":56,"column":40},"action":"remove","lines":["onsuccess: function (result) {"]},{"start":{"row":56,"column":10},"end":{"row":57,"column":10},"action":"insert","lines":["$scope.progress(status);"," "]},{"start":{"row":58,"column":8},"end":{"row":58,"column":12},"action":"remove","lines":[" "]},{"start":{"row":58,"column":8},"end":{"row":58,"column":11},"action":"insert","lines":["});"]},{"start":{"row":59,"column":8},"end":{"row":60,"column":0},"action":"insert","lines":["",""]},{"start":{"row":60,"column":4},"end":{"row":60,"column":36},"action":"remove","lines":["$scope.deferred.resolve(result);"]},{"start":{"row":60,"column":4},"end":{"row":60,"column":47},"action":"insert","lines":[" providers.forEach(function (provider) {"]},{"start":{"row":61,"column":10},"end":{"row":62,"column":4},"action":"insert","lines":[""," "]},{"start":{"row":62,"column":6},"end":{"row":62,"column":28},"action":"insert","lines":[" provider.render();"]},{"start":{"row":63,"column":10},"end":{"row":63,"column":11},"action":"remove","lines":["}"]},{"start":{"row":70,"column":8},"end":{"row":70,"column":18},"action":"remove","lines":["'deferred'"]},{"start":{"row":70,"column":8},"end":{"row":73,"column":15},"action":"insert","lines":["failure: '=',"," progress: '=',"," providers: providers,"," success"]},{"start":{"row":194,"column":0},"end":{"row":215,"column":0},"action":"remove","lines":[" function previous() {"," "," if (!deferred) {"," "," deferred = $q.defer();"," "," $rootScope.$broadcast('authenticate:' + provider, deferred);"," "," deferred.promise"," .then(function (logins) {"," "," return login(logins);"," "," });"," "," }"," "," return deferred.promise;"," "," }"," ",""]},{"start":{"row":239,"column":0},"end":{"row":243,"column":0},"action":"remove","lines":[" } else if (this.has()) {"," "," return previous();"," ",""]},{"start":{"row":265,"column":0},"end":{"row":266,"column":0},"action":"insert","lines":[" deferred: deferred,",""]},{"start":{"row":339,"column":12},"end":{"row":339,"column":26},"action":"remove","lines":["auth2, ready, "]},{"start":{"row":343,"column":10},"end":{"row":343,"column":15},"action":"remove","lines":["login"]},{"start":{"row":343,"column":10},"end":{"row":343,"column":16},"action":"insert","lines":["render"]},{"start":{"row":343,"column":36},"end":{"row":343,"column":64},"action":"insert","lines":[", logins, options, elementId"]},{"start":{"row":345,"column":12},"end":{"row":345,"column":24},"action":"remove","lines":["console.log("]},{"start":{"row":345,"column":12},"end":{"row":345,"column":37},"action":"insert","lines":["elementId = elementId || "]},{"start":{"row":345,"column":50},"end":{"row":345,"column":58},"action":"remove","lines":[".login')"]},{"start":{"row":345,"column":50},"end":{"row":345,"column":51},"action":"insert","lines":["'"]},{"start":{"row":346,"column":10},"end":{"row":346,"column":11},"action":"insert","lines":[" "]},{"start":{"row":346,"column":11},"end":{"row":346,"column":12},"action":"insert","lines":[" "]},{"start":{"row":347,"column":12},"end":{"row":354,"column":22},"action":"remove","lines":["if (!deferred) {"," "," deferred = $q.defer();"," "," }"," "," gapi.signin2.render('GoogleSignIn', {"," height: "]},{"start":{"row":347,"column":12},"end":{"row":353,"column":46},"action":"insert","lines":["options = options || {};"," "," options.height = options.height || 50;"," options.longtitle = options.longtitle || true;"," options.scope = options.scope || 50;"," options.theme = options.theme || 'dark';"," options.width = options.width || 2"]},{"start":{"row":353,"column":48},"end":{"row":353,"column":49},"action":"remove","lines":[","]},{"start":{"row":353,"column":48},"end":{"row":353,"column":49},"action":"insert","lines":[";"]},{"start":{"row":354,"column":12},"end":{"row":354,"column":30},"action":"remove","lines":[" longtitle: true,"]},{"start":{"row":355,"column":12},"end":{"row":355,"column":14},"action":"remove","lines":[" "]},{"start":{"row":355,"column":12},"end":{"row":355,"column":20},"action":"insert","lines":["options."]},{"start":{"row":355,"column":29},"end":{"row":355,"column":30},"action":"remove","lines":[":"]},{"start":{"row":355,"column":29},"end":{"row":355,"column":31},"action":"insert","lines":[" ="]},{"start":{"row":356,"column":14},"end":{"row":356,"column":16},"action":"remove","lines":[" "]},{"start":{"row":357,"column":14},"end":{"row":357,"column":16},"action":"remove","lines":[" "]},{"start":{"row":358,"column":14},"end":{"row":359,"column":12},"action":"insert","lines":[""," "]},{"start":{"row":359,"column":14},"end":{"row":359,"column":56},"action":"insert","lines":["deferred.notify('GoogleSignIn Exception');"]},{"start":{"row":360,"column":14},"end":{"row":361,"column":12},"action":"insert","lines":[""," "]},{"start":{"row":362,"column":14},"end":{"row":363,"column":4},"action":"insert","lines":[""," "]},{"start":{"row":363,"column":6},"end":{"row":364,"column":0},"action":"remove","lines":["",""]},{"start":{"row":363,"column":12},"end":{"row":364,"column":0},"action":"insert","lines":["};",""]},{"start":{"row":364,"column":8},"end":{"row":364,"column":10},"action":"remove","lines":["},"]},{"start":{"row":364,"column":8},"end":{"row":364,"column":12},"action":"insert","lines":[" "]},{"start":{"row":365,"column":12},"end":{"row":365,"column":14},"action":"remove","lines":[" "]},{"start":{"row":365,"column":12},"end":{"row":365,"column":20},"action":"insert","lines":["options."]},{"start":{"row":365,"column":29},"end":{"row":365,"column":30},"action":"remove","lines":[":"]},{"start":{"row":365,"column":29},"end":{"row":365,"column":31},"action":"insert","lines":[" ="]},{"start":{"row":366,"column":14},"end":{"row":366,"column":16},"action":"remove","lines":[" "]},{"start":{"row":367,"column":14},"end":{"row":367,"column":31},"action":"remove","lines":[" var logins = {}"]},{"start":{"row":367,"column":14},"end":{"row":367,"column":56},"action":"insert","lines":["deferred.notify('GoogleSignIn Successful')"]},{"start":{"row":368,"column":14},"end":{"row":369,"column":2},"action":"remove","lines":[" "," "]},{"start":{"row":368,"column":14},"end":{"row":369,"column":0},"action":"insert","lines":["",""]},{"start":{"row":370,"column":14},"end":{"row":371,"column":2},"action":"remove","lines":[" "," "]},{"start":{"row":370,"column":14},"end":{"row":371,"column":0},"action":"insert","lines":["",""]},{"start":{"row":372,"column":14},"end":{"row":373,"column":2},"action":"remove","lines":[" "," "]},{"start":{"row":372,"column":14},"end":{"row":373,"column":0},"action":"insert","lines":["",""]},{"start":{"row":373,"column":31},"end":{"row":373,"column":37},"action":"remove","lines":["logins"]},{"start":{"row":373,"column":31},"end":{"row":373,"column":35},"action":"insert","lines":["user"]},{"start":{"row":374,"column":14},"end":{"row":374,"column":16},"action":"remove","lines":[" "]},{"start":{"row":375,"column":12},"end":{"row":375,"column":16},"action":"remove","lines":[" },"]},{"start":{"row":375,"column":12},"end":{"row":375,"column":14},"action":"insert","lines":["};"]},{"start":{"row":376,"column":12},"end":{"row":380,"column":12},"action":"remove","lines":[" scope: 'profile email',"," theme: 'dark',"," width: 250"," });"," "]},{"start":{"row":376,"column":12},"end":{"row":377,"column":48},"action":"insert","lines":["","<<<<<<< cc56001642e9a6ba4dd2227fdf7ab995339eaa5d"]},{"start":{"row":399,"column":34},"end":{"row":399,"column":40},"action":"remove","lines":["result"]},{"start":{"row":399,"column":34},"end":{"row":399,"column":40},"action":"insert","lines":["logins"]},{"start":{"row":406,"column":0},"end":{"row":411,"column":0},"action":"insert","lines":["======="," deferred.notify('Attempting GoogleSignIn');"," "," gapi.signin2.render(elementId, options);",">>>>>>> refactored",""]},{"start":{"row":426,"column":11},"end":{"row":434,"column":34},"action":"remove","lines":[""," "," });"," "," $rootScope.$on('authenticate:' + key, function (event, deferred) {"," "," console.log('authenticate:accounts.google.com');"," "," service.login(deferred);"]}],[{"start":{"row":37,"column":0},"end":{"row":43,"column":18},"action":"remove","lines":["<<<<<<< cc56001642e9a6ba4dd2227fdf7ab995339eaa5d"," controller: 'AuthenticateController',"," controllerAs: 'crtl',"," link: function ($scope, $element, $attrs, $controller) {","======="," link: function ($scope) {",">>>>>>> refactored"],"id":11},{"start":{"row":37,"column":0},"end":{"row":37,"column":31},"action":"insert","lines":[" link: function ($scope) {"]}],[{"start":{"row":371,"column":0},"end":{"row":404,"column":18},"action":"remove","lines":["<<<<<<< cc56001642e9a6ba4dd2227fdf7ab995339eaa5d"," },"," render: function (id, options) {"," "," gapi.signin2.render('GoogleSignIn', {"," height: options.height || 50,"," longtitle: options.longtitle || true,"," onfailure: function (exception) {"," "," console.error(exception);"," "," options.onfailure(exception);"," "," },"," onsuccess: function (result) {"," "," var logins = {};"," "," user = result;"," "," logins[key] = user.getAuthResponse().id_token;"," "," options.onsuccess(logins);"," "," },"," scope: 'profile email',"," theme: 'dark',"," width: 250"," });","======="," deferred.notify('Attempting GoogleSignIn');"," "," gapi.signin2.render(elementId, options);",">>>>>>> refactored"],"id":12},{"start":{"row":371,"column":0},"end":{"row":373,"column":52},"action":"insert","lines":[" deferred.notify('Attempting GoogleSignIn');"," "," gapi.signin2.render(elementId, options);"]}],[{"start":{"row":74,"column":0},"end":{"row":111,"column":45},"action":"insert","lines":["<<<<<<< 8164b73aa91c87c7893d5f789ec59be53621c0d9","","=======",".directive('authenticateProvider', ["," function () {"," "," return {"," replace: true,"," restrict: 'E',"," scope: {"," provider: '='"," },"," templateUrl: 'auth/templates/provider.html'"," };"," "," }","])",".filter('versionedUrl', ["," 'VERSION',"," function (VERSION) {"," "," return function (input) {"," "," var output = '';"," "," if (input) {"," "," output = '/' + VERSION + input;"," "," }"," "," return output;"," "," }"," "," }","])",">>>>>>> added authenticate-provider directive"],"id":13,"ignore":true}],[{"start":{"row":74,"column":0},"end":{"row":111,"column":45},"action":"remove","lines":["<<<<<<< 8164b73aa91c87c7893d5f789ec59be53621c0d9","","=======",".directive('authenticateProvider', ["," function () {"," "," return {"," replace: true,"," restrict: 'E',"," scope: {"," provider: '='"," },"," templateUrl: 'auth/templates/provider.html'"," };"," "," }","])",".filter('versionedUrl', ["," 'VERSION',"," function (VERSION) {"," "," return function (input) {"," "," var output = '';"," "," if (input) {"," "," output = '/' + VERSION + input;"," "," }"," "," return output;"," "," }"," "," }","])",">>>>>>> added authenticate-provider directive"],"id":14},{"start":{"row":74,"column":0},"end":{"row":107,"column":2},"action":"insert","lines":[".directive('authenticateProvider', ["," function () {"," "," return {"," replace: true,"," restrict: 'E',"," scope: {"," provider: '='"," },"," templateUrl: 'auth/templates/provider.html'"," };"," "," }","])",".filter('versionedUrl', ["," 'VERSION',"," function (VERSION) {"," "," return function (input) {"," "," var output = '';"," "," if (input) {"," "," output = '/' + VERSION + input;"," "," }"," "," return output;"," "," }"," "," }","])"]}],[{"start":{"row":39,"column":8},"end":{"row":41,"column":8},"action":"insert","lines":["$scope.providers = providers;"," "," "],"id":15,"ignore":true},{"start":{"row":68,"column":0},"end":{"row":69,"column":0},"action":"remove","lines":[" providers: providers,",""]},{"start":{"row":134,"column":0},"end":{"row":135,"column":0},"action":"remove","lines":[" deferred,",""]},{"start":{"row":145,"column":15},"end":{"row":145,"column":23},"action":"insert","lines":["service."]},{"start":{"row":147,"column":12},"end":{"row":147,"column":20},"action":"insert","lines":["service."]},{"start":{"row":149,"column":57},"end":{"row":149,"column":65},"action":"insert","lines":["service."]},{"start":{"row":151,"column":12},"end":{"row":151,"column":20},"action":"insert","lines":["service."]},{"start":{"row":160,"column":17},"end":{"row":160,"column":25},"action":"insert","lines":["service."]},{"start":{"row":257,"column":0},"end":{"row":259,"column":0},"action":"remove","lines":[" getLocal();"," ",""]},{"start":{"row":290,"column":20},"end":{"row":290,"column":28},"action":"remove","lines":["deferred"]},{"start":{"row":290,"column":20},"end":{"row":290,"column":24},"action":"insert","lines":["null"]},{"start":{"row":345,"column":8},"end":{"row":350,"column":35},"action":"insert","lines":["","<<<<<<< 78f3333b85d3e9ca97fe7d4d2b926d3350b10c4f","======="," getLocal();"," ",">>>>>>> setting deferred on service"]}],[{"start":{"row":346,"column":0},"end":{"row":350,"column":35},"action":"remove","lines":["<<<<<<< 78f3333b85d3e9ca97fe7d4d2b926d3350b10c4f","======="," getLocal();"," ",">>>>>>> setting deferred on service"],"id":16},{"start":{"row":346,"column":0},"end":{"row":347,"column":8},"action":"insert","lines":[" getLocal();"," "]}],[{"start":{"row":1,"column":18},"end":{"row":1,"column":21},"action":"insert","lines":["FB "],"id":17,"ignore":true},{"start":{"row":19,"column":0},"end":{"row":20,"column":0},"action":"insert","lines":[" 'FacebookLogin',",""]},{"start":{"row":22,"column":0},"end":{"row":23,"column":0},"action":"insert","lines":[" '$timeout',",""]},{"start":{"row":23,"column":17},"end":{"row":23,"column":32},"action":"insert","lines":[" FacebookLogin,"]},{"start":{"row":23,"column":56},"end":{"row":23,"column":66},"action":"insert","lines":[", $timeout"]},{"start":{"row":27,"column":0},"end":{"row":37,"column":0},"action":"insert","lines":[" key: FacebookLogin.key,"," user: FacebookLogin.user,"," render: function () {"," "," FacebookLogin.render(Auth.deferred, Auth.logins);"," "," },"," templateUrl: 'auth/templates/facebook-login.html'"," },"," {",""]},{"start":{"row":44,"column":22},"end":{"row":44,"column":27},"action":"insert","lines":["auth/"]},{"start":{"row":68,"column":0},"end":{"row":70,"column":2},"action":"insert","lines":[" $timeout(function () {"," "," "]},{"start":{"row":71,"column":10},"end":{"row":72,"column":0},"action":"remove","lines":["",""]},{"start":{"row":71,"column":10},"end":{"row":72,"column":2},"action":"insert","lines":[" "," "]},{"start":{"row":73,"column":0},"end":{"row":75,"column":0},"action":"insert","lines":[" "," });",""]},{"start":{"row":182,"column":15},"end":{"row":182,"column":22},"action":"remove","lines":["ossible"]},{"start":{"row":182,"column":15},"end":{"row":182,"column":26},"action":"insert","lines":["Credentials"]},{"start":{"row":186,"column":14},"end":{"row":188,"column":22},"action":"remove","lines":["exp;"," "," if (possible"]},{"start":{"row":186,"column":14},"end":{"row":194,"column":26},"action":"insert","lines":["pProvider = localStorage.getItem(providerKey);"," "," var exp;"," "," var now = moment();"," "," //console.log('getLocal', pCredentials, pIdentity);"," "," if (pCredentials"]},{"start":{"row":196,"column":13},"end":{"row":196,"column":20},"action":"remove","lines":["ossible"]},{"start":{"row":196,"column":13},"end":{"row":196,"column":24},"action":"insert","lines":["Credentials"]},{"start":{"row":196,"column":39},"end":{"row":196,"column":46},"action":"remove","lines":["ossible"]},{"start":{"row":196,"column":39},"end":{"row":196,"column":50},"action":"insert","lines":["Credentials"]},{"start":{"row":198,"column":17},"end":{"row":198,"column":24},"action":"remove","lines":["ossible"]},{"start":{"row":198,"column":17},"end":{"row":198,"column":28},"action":"insert","lines":["Credentials"]},{"start":{"row":200,"column":26},"end":{"row":200,"column":40},"action":"remove","lines":[".unix(possible"]},{"start":{"row":200,"column":26},"end":{"row":200,"column":39},"action":"insert","lines":["(pCredentials"]},{"start":{"row":212,"column":27},"end":{"row":212,"column":34},"action":"remove","lines":["Before("]},{"start":{"row":212,"column":27},"end":{"row":212,"column":36},"action":"insert","lines":["After(now"]},{"start":{"row":214,"column":12},"end":{"row":214,"column":21},"action":"remove","lines":["setLocal("]},{"start":{"row":214,"column":12},"end":{"row":220,"column":39},"action":"insert","lines":["credentials = pCredentials;"," "," provider = pProvider;"," "," identity = pIdentity;"," "," $rootScope.$broadcast('aws."]},{"start":{"row":220,"column":50},"end":{"row":220,"column":51},"action":"insert","lines":["'"]},{"start":{"row":220,"column":53},"end":{"row":220,"column":63},"action":"remove","lines":["pIdentity)"]},{"start":{"row":220,"column":53},"end":{"row":226,"column":23},"action":"insert","lines":["credentials);"," "," $rootScope.$broadcast('cognito.identity', identity);"," "," $rootScope.$broadcast('authenticated', provider);"," "," return true"]},{"start":{"row":230,"column":0},"end":{"row":232,"column":0},"action":"insert","lines":[" return false;"," ",""]},{"start":{"row":239,"column":20},"end":{"row":239,"column":28},"action":"insert","lines":["service."]},{"start":{"row":244,"column":70},"end":{"row":244,"column":78},"action":"remove","lines":["logins))"]},{"start":{"row":244,"column":70},"end":{"row":246,"column":35},"action":"insert","lines":["service.logins));"," "," service.deferred = null"]},{"start":{"row":253,"column":0},"end":{"row":255,"column":0},"action":"insert","lines":[" service.deferred = null;"," ",""]},{"start":{"row":285,"column":12},"end":{"row":285,"column":14},"action":"insert","lines":["//"]},{"start":{"row":300,"column":12},"end":{"row":300,"column":28},"action":"remove","lines":["if (this.is()) {"]},{"start":{"row":300,"column":12},"end":{"row":304,"column":32},"action":"insert","lines":["console.log('authenticate');"," "," if (this.is()) {"," "," console.log('is');"]},{"start":{"row":310,"column":0},"end":{"row":312,"column":0},"action":"insert","lines":[" console.log('not');"," ",""]},{"start":{"row":381,"column":36},"end":{"row":381,"column":44},"action":"insert","lines":["moment()"]},{"start":{"row":385,"column":14},"end":{"row":386,"column":0},"action":"remove","lines":["",""]},{"start":{"row":385,"column":14},"end":{"row":386,"column":2},"action":"insert","lines":["else {"," "]},{"start":{"row":387,"column":12},"end":{"row":387,"column":14},"action":"insert","lines":[" "]},{"start":{"row":387,"column":21},"end":{"row":389,"column":2},"action":"remove","lines":["false;"," "," "]},{"start":{"row":387,"column":21},"end":{"row":428,"column":0},"action":"insert","lines":["getLocal();"," "," }"," "," },"," logins: {}"," };"," "," return service;"," "," }"," ];"," "," }","])",".provider('FacebookLogin', ["," function () {"," "," var key = 'graph.facebook.com';"," "," this.$get = ["," 'FACEBOOK_APP_ID',"," '$q',"," '$rootScope',"," '$window',"," function (appId, $q, $rootScope, $window) {"," "," var ready = $q.defer(), user;"," "," $window.fbAsyncInit = function() {"," "," FB.init({"," appId : appId,"," cookie : true,"," xfbml : true,"," version : 'v2.8'"," });"," FB.AppEvents.logPageView(); "," "," ready.resolve(true);"," ",""]},{"start":{"row":428,"column":9},"end":{"row":428,"column":10},"action":"insert","lines":[";"]},{"start":{"row":429,"column":8},"end":{"row":430,"column":0},"action":"remove","lines":["};",""]},{"start":{"row":429,"column":8},"end":{"row":441,"column":3},"action":"insert","lines":[""," function login(deferred, logins, response) {"," "," logins[key] = response.authResponse.accessToken;"," "," deferred.resolve(true);"," "," FB.api('/me', {"," fields: 'email,name,picture'"," }, function (response) {"," "," user = response;"," "]},{"start":{"row":441,"column":11},"end":{"row":441,"column":12},"action":"insert","lines":[" "]},{"start":{"row":442,"column":8},"end":{"row":442,"column":17},"action":"remove","lines":["getLocal("]},{"start":{"row":442,"column":8},"end":{"row":502,"column":9},"action":"insert","lines":[" });"," "," }"," "," var service = {"," key: key,"," render: function (deferred, logins) {"," "," deferred.notify('Attempting FacebookLogin');"," "," return ready.promise"," .then(function () {"," "," FB.getLoginStatus(function (response) {"," "," if (response.status === 'connected') {"," "," login(deferred, logins, response);"," "," }"," "," });"," "," FB.Event.subscribe('auth.authResponseChange', function (response) {"," "," console.log('auth.authResponseChange', response);"," "," if (response.status === 'connected') {"," "," // user is logged into facebook"," "," login(deferred, logins, response);"," "," } else {"," "," // user is not logged into facebook"," "," }"," "," });"," "," });"," "," },"," revoke: function () {"," "," "," "," },"," user: user"," };"," "," $rootScope.$on('send-user-data', function () {"," "," if (user) {"," "," $rootScope.$broadcast('user.facebook', user);"," "," }"," "," }"]},{"start":{"row":534,"column":45},"end":{"row":534,"column":47},"action":"remove","lines":["50"]},{"start":{"row":534,"column":45},"end":{"row":534,"column":60},"action":"insert","lines":["'email profile'"]},{"start":{"row":562,"column":0},"end":{"row":564,"column":0},"action":"insert","lines":[" console.log('options', options);"," ",""]},{"start":{"row":574,"column":24},"end":{"row":574,"column":37},"action":"remove","lines":["authenticated"]},{"start":{"row":574,"column":24},"end":{"row":574,"column":38},"action":"insert","lines":["send-user-data"]}],[{"start":{"row":3,"column":0},"end":{"row":4,"column":0},"action":"insert","lines":["<<<<<<< HEAD",""],"id":18,"ignore":true},{"start":{"row":14,"column":0},"end":{"row":89,"column":0},"action":"insert","lines":["=======","angular.module('auth', ["," 'user'","])",".directive('authenticate', ["," 'Auth',"," 'FacebookLogin',"," 'GoogleSignIn',"," '$injector',"," '$timeout',"," function (Auth, FacebookLogin, GoogleSignIn, $injector, $timeout) {"," "," var providers = ["," {"," key: FacebookLogin.key,"," user: FacebookLogin.user,"," render: function () {"," "," FacebookLogin.render(Auth.deferred, Auth.logins);"," "," },"," templateUrl: 'auth/templates/facebook-login.html'"," },"," {"," key: GoogleSignIn.key,"," user: GoogleSignIn.user,"," render: function () {"," "," GoogleSignIn.render(Auth.deferred, Auth.logins);"," "," },"," templateUrl: 'auth/templates/google-sign-in.html'"," }"," ];"," "," return {"," link: function ($scope) {"," "," $scope.providers = providers;"," "," Auth.deferred.promise"," .then(function (result) {"," "," $scope.success(result);"," "," },function (exception) {"," "," $scope.failure(exception);"," "," }, function (status) {"," "," $scope.progress(status);"," "," });"," "," $timeout(function () {"," "," providers.forEach(function (provider) {"," "," provider.render();"," "," });"," "," });"," "," },"," replace: true,"," restrict: 'E',"," scope: {"," failure: '=',"," progress: '=',"," success: '='"," },"," templateUrl: 'auth/templates/authenticate.html'",">>>>>>> 439273e2fb408009e1179f947ae3da7902ce6d12",""]},{"start":{"row":93,"column":0},"end":{"row":94,"column":0},"action":"insert","lines":["<<<<<<< HEAD",""]},{"start":{"row":205,"column":0},"end":{"row":265,"column":0},"action":"insert","lines":["=======",".directive('authenticateProvider', ["," function () {"," "," return {"," replace: true,"," restrict: 'E',"," scope: {"," provider: '='"," },"," templateUrl: 'auth/templates/provider.html'"," };