Merge pull request #2616 from deveshMantra/autoMerge5

Issue #SB-13773 fix:redirection fix for auto merge of user

src/app/client/src/app/modules/public/module/sign-in/sso/components/auth-failed/auth-failed.component.html

+<sui-modal [isClosable]="false" [size]="'fullscreen'" #modal [mustScroll]="true" [transitionDuration]="0"
+           class="fullpage" (dismissed)="modal.deny()">
+  <div class="sb-certificatePage p-16">
+    <div class="sb-certificatePage-header">
+      <img src="assets/images/DIKSHA.svg" class="sb-certificatePage-logo" alt="DIKSHA Logo"/>
+    </div>
+    <div class="sb-merged-account-content text-center">
+      <h3 class="sb-merged-account-body-header my-24 font-weight-bold">
+        {{resourceService.frmelmnts?.lbl?.mergeAccount}}</h3>
+      <p class="py-8 m-0">Could not merge accounts because the password entered is incorrect.
+        Click OK to create a new DIKSHA account</p>
+    </div>
+    <div class="d-flex mt-40">
+      <button class="sb-btn sb-btn-outline-secondary sb-btn-normal width-100 mr-8 mb-auto"
+              (click)="createNewUser()">{{resourceService.frmelmnts?.btn?.ok}}
+      </button>
+    </div>
+
+  </div>
+</sui-modal>

src/app/client/src/app/modules/public/module/sign-in/sso/components/auth-failed/auth-failed.component.spec.ts

+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {SuiModule} from 'ng2-semantic-ui';
+import {ActivatedRoute, Router} from '@angular/router';
+import {of as observableOf} from 'rxjs';
+import {ResourceService} from '@sunbird/shared';
+
+import {AuthFailedComponent} from './auth-failed.component';
+
+describe('AuthFailedComponent', () => {
+  let component: AuthFailedComponent;
+  let fixture: ComponentFixture<AuthFailedComponent>;
+
+  const fakeActivatedRoute = {
+    'queryParams': observableOf({userId: 'mock user ID', identifier: 'email', identifierValue: 'as'}),
+  };
+  const resourceBundle = {
+    languageSelected$: observableOf({})
+  };
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [SuiModule],
+      declarations: [AuthFailedComponent],
+      providers: [{provide: ActivatedRoute, useValue: fakeActivatedRoute},
+        {provide: ResourceService, useValue: resourceBundle}]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AuthFailedComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/client/src/app/modules/public/module/sign-in/sso/components/auth-failed/auth-failed.component.ts

+import {Component, OnInit} from '@angular/core';
+import {ResourceService} from '@sunbird/shared';
+import {ActivatedRoute} from '@angular/router';
+
+@Component({
+  selector: 'app-auth-failed',
+  templateUrl: './auth-failed.component.html',
+  styleUrls: ['./auth-failed.component.scss']
+})
+export class AuthFailedComponent implements OnInit {
+
+  constructor(public activatedRoute: ActivatedRoute, public resourceService: ResourceService) {
+  }
+
+  queryParam: any;
+
+  ngOnInit() {
+    this.activatedRoute.queryParams.subscribe((queryParams) => {
+      this.queryParam = {...queryParams};
+    });
+  }
+
+  createNewUser() {
+    const queryParams = '&identifier=' + this.queryParam.identifierType + '&identifierValue=' +
+      this.queryParam.identifierValue + '&freeUser=true';
+    window.location.href = 'v1/sso/create/user?userId=' + this.queryParam.userId + queryParams;
+  }
+
+}

src/app/client/src/app/modules/public/module/sign-in/sso/components/index.ts

 export * from './select-org/select-org.component';
 export * from './update-contact/update-contact.component';
+export * from './auth-failed/auth-failed.component';

src/app/client/src/app/modules/public/module/sign-in/sso/sso-routing.module.ts

 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
-import { SelectOrgComponent, UpdateContactComponent } from './components';
+import {AuthFailedComponent, SelectOrgComponent, UpdateContactComponent} from './components';
 import { UUID } from 'angular2-uuid';
 const uuid = UUID.UUID();
 const telemetryEnv = 'sso-sign-in';
@@ -22,6 +22,9 @@ const routes: Routes = [
         env: telemetryEnv, pageid: 'update-contact', uri: '/update-contact', type: 'view', mode: 'self', uuid: uuid
       }
     }
+  },
+  {
+    path: 'auth', component: AuthFailedComponent
   }
 ];
 

src/app/client/src/app/modules/public/module/sign-in/sso/sso.module.ts

 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { SsoRoutingModule } from './sso-routing.module';
-import { SelectOrgComponent, UpdateContactComponent } from './components';
-import { TelemetryModule } from '@sunbird/telemetry';
+import {SelectOrgComponent, UpdateContactComponent, AuthFailedComponent} from './components';
+import {TelemetryModule} from '@sunbird/telemetry';
 import { SharedFeatureModule } from '@sunbird/shared-feature';
 import { SuiModule } from 'ng2-semantic-ui/dist';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -19,6 +19,6 @@ import { SharedModule } from '@sunbird/shared';
     ReactiveFormsModule,
     SharedModule
   ],
-  declarations: [SelectOrgComponent, UpdateContactComponent]
+  declarations: [SelectOrgComponent, UpdateContactComponent, AuthFailedComponent]
 })
 export class SsoModule { }

src/app/routes/ssoRoutes.js

@@ -315,7 +315,7 @@ module.exports = (app) => {
       req.session.migrateAccountInfo.encryptedData = encrypt(JSON.stringify(dataToEncrypt));
       const payload = JSON.stringify(req.session.migrateAccountInfo.encryptedData);
       url = `${envHelper.PORTAL_AUTH_SERVER_URL}/realms/${envHelper.PORTAL_REALM}/protocol/openid-connect/auth`;
-      query = `?client_id=portal&state=3c9a2d1b-ede9-4e6d-a496-068a490172ee&identifierValue=${req.query.identifierValue}&redirect_uri=https://${req.get('host')}/migrate/account/login/callback&payload=${payload}&scope=openid&response_type=code&automerge=1&version=3&goBackUrl=https://${req.get('host')}${req.query.redirectUri}`;
+      query = `?client_id=portal&state=3c9a2d1b-ede9-4e6d-a496-068a490172ee&identifierValue=${req.query.identifierValue}&redirect_uri=https://${req.get('host')}/migrate/account/login/callback&payload=${payload}&scope=openid&response_type=code&automerge=1&version=3&goBackUrl=https://${req.get('host')}/sign-in/sso/select-org`;
       console.log('url for migration', url + query);
     } catch (error) {
       response = {error: getErrorMessage(error, errType)};
@@ -343,6 +343,7 @@ module.exports = (app) => {
       return false;
     }
     if (req.session.migrateAccountInfo.client_id === 'android') {
+      console.log('mobile login success');
       const query = '?payload=' + req.session.migrateAccountInfo.encryptedData + '&code=' + req.query.code + '&automerge=1';
       res.redirect('/account/migrate/login' + query);
     } else {
@@ -352,7 +353,7 @@ module.exports = (app) => {
         req.session.nonStateUserToken = nonStateUserToken;
       } else {
         nonStateUserToken = await generateAuthToken(req.query.code, `https://${req.get('host')}/migrate/account/login/callback`).catch(err => {
-          console.log('error in verifyAuthToken', err.error);
+          console.log('error in verifyAuthToken', err);
           console.log('error details', err.statusCode, err.message)
         });
         const userToken = parseJson(nonStateUserToken);
@@ -376,13 +377,16 @@ module.exports = (app) => {
       const decryptedData = decrypt(req.session.migrateAccountInfo.encryptedData);
       stateUserData = parseJson(decryptedData);
       errType = 'VERIFY_SIGNATURE';
-      console.log('validating state token', decryptedData);
+      console.log('validating state token', JSON.stringify(decryptedData));
       await verifySignature(stateUserData.stateToken);
+      errType = 'JWT_DECODE';
       stateJwtPayload = jwt.decode(stateUserData.stateToken);
+      errType = 'VERIFY_TOKEN';
       verifyToken(stateJwtPayload);
       const nonStateUserData = jwt.decode(req.session.nonStateUserToken);
       errType = 'ERROR_VERIFYING_IDENTITY';
       const isMigrationAllowed = verifyIdentifier(stateUserData.identifierValue, nonStateUserData[stateUserData.identifier], stateUserData.identifier);
+      console.log('ismigration allowed', isMigrationAllowed);
       if (isMigrationAllowed) {
         errType = 'MIGRATE_USER';
         req.query.userId = getUserIdFromToken(req.session.nonStateUserToken);
@@ -399,13 +403,13 @@ module.exports = (app) => {
          // await updateRoles(req, req.query.userId, stateJwtPayload).catch(handleProfileUpdateError);
         }
         req.session.userDetails = userDetails;
-        redirectUrl ='/accountMerge?status=success&redirect_uri=/resources';
+        redirectUrl ='/accountMerge?status=success&merge_type=auto&redirect_uri=/resources';
       } else {
         errType = 'UNAUTHORIZED';
         throw 'USER_DETAILS_DID_NOT_MATCH';
       }
     } catch (error) {
-      redirectUrl ='/accountMerge?status=error&redirect_uri=/resources';
+      redirectUrl ='/accountMerge?status=error&merge_type=auto&redirect_uri=/resources';
       logger.error({
         msg: 'sso session create v2 api failed',
         "error": JSON.stringify(error),