From e049d02ef4d1fda603309d30c3ab2d4ee20700c2 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 7 Aug 2020 18:30:08 +0300
Subject: [PATCH] feat: change the oauth configuration according to code flow

---
 .../dev-app/src/environments/environment.prod.ts  | 11 ++++++-----
 .../apps/dev-app/src/environments/environment.ts  | 11 ++++++-----
 .../angular/src/environments/environment.prod.ts  | 14 ++++++--------
 .../app/angular/src/environments/environment.ts   | 15 ++++++---------
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/npm/ng-packs/apps/dev-app/src/environments/environment.prod.ts b/npm/ng-packs/apps/dev-app/src/environments/environment.prod.ts
index 21e1302773..70af33346f 100644
--- a/npm/ng-packs/apps/dev-app/src/environments/environment.prod.ts
+++ b/npm/ng-packs/apps/dev-app/src/environments/environment.prod.ts
@@ -1,20 +1,21 @@
 import { Config } from '@abp/ng.core';
 
+const baseUrl = 'http://localhost:4200';
+
 export const environment = {
   production: true,
   hmr: false,
   application: {
-    baseUrl: 'http://localhost:4200/',
+    baseUrl,
     name: 'MyProjectName',
     logoUrl: '',
   },
   oAuthConfig: {
     issuer: 'https://localhost:44305',
+    redirectUri: baseUrl,
     clientId: 'MyProjectName_App',
-    dummyClientSecret: '1q2w3e*',
-    scope: 'MyProjectName',
-    oidc: false,
-    requireHttps: true,
+    responseType: 'code',
+    scope: 'offline_access MyProjectName',
   },
   apis: {
     default: {
diff --git a/npm/ng-packs/apps/dev-app/src/environments/environment.ts b/npm/ng-packs/apps/dev-app/src/environments/environment.ts
index 8cae243d46..2bf42cf7dc 100644
--- a/npm/ng-packs/apps/dev-app/src/environments/environment.ts
+++ b/npm/ng-packs/apps/dev-app/src/environments/environment.ts
@@ -1,20 +1,21 @@
 import { Config } from '@abp/ng.core';
 
+const baseUrl = 'http://localhost:4200';
+
 export const environment = {
   production: false,
   hmr: false,
   application: {
-    baseUrl: 'http://localhost:4200/',
+    baseUrl,
     name: 'MyProjectName',
     logoUrl: '',
   },
   oAuthConfig: {
     issuer: 'https://localhost:44305',
+    redirectUri: baseUrl,
     clientId: 'MyProjectName_App',
-    dummyClientSecret: '1q2w3e*',
-    scope: 'MyProjectName',
-    oidc: false,
-    requireHttps: true,
+    responseType: 'code',
+    scope: 'offline_access MyProjectName',
   },
   apis: {
     default: {
diff --git a/templates/app/angular/src/environments/environment.prod.ts b/templates/app/angular/src/environments/environment.prod.ts
index cfe0401dee..719dd1fe53 100644
--- a/templates/app/angular/src/environments/environment.prod.ts
+++ b/templates/app/angular/src/environments/environment.prod.ts
@@ -1,26 +1,24 @@
 import { Config } from '@abp/ng.core';
 
+const baseUrl = 'http://localhost:4200';
+
 export const environment = {
   production: true,
   application: {
-    baseUrl: 'http://localhost:4200/',
+    baseUrl,
     name: 'MyProjectName',
     logoUrl: '',
   },
   oAuthConfig: {
     issuer: 'https://localhost:44305',
+    redirectUri: baseUrl,
     clientId: 'MyProjectName_App',
-    dummyClientSecret: '1q2w3e*',
-    scope: 'MyProjectName',
-    oidc: false,
-    requireHttps: true,
+    responseType: 'code',
+    scope: 'offline_access MyProjectName',
   },
   apis: {
     default: {
       url: 'https://localhost:44305',
     },
   },
-  localization: {
-    defaultResourceName: 'MyProjectName',
-  },
 } as Config.Environment;
diff --git a/templates/app/angular/src/environments/environment.ts b/templates/app/angular/src/environments/environment.ts
index 2039e8a2dc..cb0be073c2 100644
--- a/templates/app/angular/src/environments/environment.ts
+++ b/templates/app/angular/src/environments/environment.ts
@@ -1,27 +1,24 @@
 import { Config } from '@abp/ng.core';
 
+const baseUrl = 'http://localhost:4200';
+
 export const environment = {
   production: false,
   application: {
-    baseUrl: 'http://localhost:4200/',
+    baseUrl,
     name: 'MyProjectName',
     logoUrl: '',
   },
   oAuthConfig: {
     issuer: 'https://localhost:44305',
+    redirectUri: baseUrl,
     clientId: 'MyProjectName_App',
-    dummyClientSecret: '1q2w3e*',
-    scope: 'MyProjectName',
-    showDebugInformation: true,
-    oidc: false,
-    requireHttps: true,
+    responseType: 'code',
+    scope: 'offline_access MyProjectName',
   },
   apis: {
     default: {
       url: 'https://localhost:44305',
     },
   },
-  localization: {
-    defaultResourceName: 'MyProjectName',
-  },
 } as Config.Environment;