Removing logs and adding injector code back

CruGlobal · Dec 19, 2023 · 04958ef · 04958ef
1 parent 03e20a6
commit 04958ef
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 23 deletions.
diff --git a/src/common/components/signInForm/signInForm.component.js b/src/common/components/signInForm/signInForm.component.js
@@ -14,7 +14,7 @@ class SignInFormController {
     this.$log = $log
     this.$scope = $scope
     this.$document = $document
-    // this.$injector = angular.injector()
+    this.$injector = angular.injector()
     this.sessionService = sessionService
     this.gettext = gettext
     this.imgDomain = envService.read('imgDomain')
@@ -44,12 +44,12 @@ class SignInFormController {
     this.isSigningIn = true
     delete this.errorMessage
     this.sessionService.oktaSignIn(this.lastPurchaseId).subscribe(() => {
-      // const $injector = this.$injector
-      // if (!$injector.has('sessionService')) {
-      //   $injector.loadNewModules(['sessionService'])
-      // }
-      // this.$document[0].body.dispatchEvent(
-      //   new window.CustomEvent('giveSignInSuccess', { bubbles: true, detail: { $injector } }))
+      const $injector = this.$injector
+      if (!$injector.has('sessionService')) {
+        $injector.loadNewModules(['sessionService'])
+      }
+      this.$document[0].body.dispatchEvent(
+        new window.CustomEvent('giveSignInSuccess', { bubbles: true, detail: { $injector } }))
       this.onSuccess()
     }, error => {
       this.isSigningIn = false

diff --git a/src/common/components/signInForm/signInForm.component.spec.js b/src/common/components/signInForm/signInForm.component.spec.js
@@ -119,19 +119,19 @@ describe('signInForm', function () {
       expect(bindings.onSuccess).toHaveBeenCalled()
     })
 
-    // it('adds the sessionService module', () => {
-    //   deferred.resolve({})
-    //   $rootScope.$digest()
-    //   bindings.$injector.has.mockImplementation(() => false)
-    //   bindings.$injector.loadNewModules.mockImplementation(() => {})
-
-    //   expect(bindings.$document[0].body.dispatchEvent).toHaveBeenCalled();
-    //   const $injector = bindings.$injector
-
-    //   expect($injector.loadNewModules).toHaveBeenCalledWith(['sessionService'])
-    //   expect(bindings.$document[0].body.dispatchEvent).toHaveBeenCalledWith(
-    //     new window.CustomEvent('giveSignInSuccess', { bubbles: true, detail: { $injector } }))
-    // })
+    it('adds the sessionService module', () => {
+      deferred.resolve({})
+      $rootScope.$digest()
+      bindings.$injector.has.mockImplementation(() => false)
+      bindings.$injector.loadNewModules.mockImplementation(() => {})
+
+      expect(bindings.$document[0].body.dispatchEvent).toHaveBeenCalled();
+      const $injector = bindings.$injector
+
+      expect($injector.loadNewModules).toHaveBeenCalledWith(['sessionService'])
+      expect(bindings.$document[0].body.dispatchEvent).toHaveBeenCalledWith(
+        new window.CustomEvent('giveSignInSuccess', { bubbles: true, detail: { $injector } }))
+    })
 
     it('has unknown error signing in', () => {
       deferred.reject({ data: { error: 'invalid_grant' } })

diff --git a/src/common/services/session/session.service.js b/src/common/services/session/session.service.js
@@ -85,7 +85,6 @@ const session = /* @ngInject */ function ($cookies, $rootScope, $http, $timeout,
   }
 
   function handleOktaRedirect (lastPurchaseId) {
-    console.log('handleOktaRedirect')
     if (authClient.isLoginRedirect()) {
       return Observable.from(authClient.token.parseFromUrl().then((tokenResponse) => {
         authClient.tokenManager.setTokens(tokenResponse.tokens)
@@ -97,7 +96,6 @@ const session = /* @ngInject */ function ($cookies, $rootScope, $http, $timeout,
   }
 
   function oktaSignIn (lastPurchaseId) {
-    console.log('oktaSignIn')
     setOktaRedirecting()
     return Observable.from(internalSignIn(lastPurchaseId))
       .map((response) => response ? response.data : response)
@@ -108,7 +106,6 @@ const session = /* @ngInject */ function ($cookies, $rootScope, $http, $timeout,
 
   async function internalSignIn (lastPurchaseId) {
     const isAuthenticated = await authClient.isAuthenticated()
-    console.log('internalSignIn', isAuthenticated)
     if (!isAuthenticated) {
       // Save marketing search queries as they are lost on redirect
       $window.sessionStorage.setItem('locationSearchOnLogin', $window.location.search)