feat(dcr): Support multiple initial access token providers

Closes gravitee-io/issues#2207
gravitee-io · May 8, 2019 · 46bd015 · 46bd015
1 parent 6459c44
commit 46bd015
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 14 deletions.
diff --git a/src/entities/clientRegistrationProvider.ts b/src/entities/clientRegistrationProvider.ts
@@ -19,9 +19,11 @@ export class ClientRegistrationProvider {
   public name: string;
   public description: string;
   public discovery_endpoint: string;
+  public initial_access_token_type: string;
   public client_id: string;
   public client_secret: string;
   public scopes: string[];
+  public initial_access_token: string;
 
   constructor() {
     'ngInject';

diff --git a/src/management/application/create-application.html b/src/management/application/create-application.html
@@ -147,7 +147,6 @@ <h2>Security</h2>
             <div ng-message="md-maxlength">The name has to be less than 300 characters long.</div>
           </div>
         </md-input-container>
-
       </div>
     </div>
     </div>

diff --git a/...agement/configuration/application/registration/client-registration-provider.controller.ts b/...agement/configuration/application/registration/client-registration-provider.controller.ts
@@ -31,6 +31,7 @@ class ClientRegistrationProviderController {
   private clientRegistrationProvider: ClientRegistrationProvider;
   private initialClientRegistrationProvider: ClientRegistrationProvider;
   private updateMode: boolean;
+  private initialAccessTokenTypes: any[];
 
   constructor(
     private $scope: IClientRegistrationProviderScope,
@@ -45,6 +46,16 @@ class ClientRegistrationProviderController {
   }
 
   $onInit() {
+    this.initialAccessTokenTypes = [];
+    this.initialAccessTokenTypes.push({
+      name: 'Client Credentials',
+      value: 'client_credentials'
+    });
+    this.initialAccessTokenTypes.push({
+      name: 'Initial Access Token',
+      value: 'initial_access_token'
+    });
+
     this.updateMode = this.clientRegistrationProvider !== undefined && this.clientRegistrationProvider.id !== undefined;
     if (! this.updateMode) {
       // Initialize the client registration provider

diff --git a/src/management/configuration/application/registration/client-registration-provider.html b/src/management/configuration/application/registration/client-registration-provider.html
@@ -57,24 +57,48 @@ <h2>Configuration</h2>
       <div class="gv-form-content" layout="column">
         <div layout="column">
           <md-input-container class="md-block" flex-gt-xs>
-            <label>OIDC Discovery  Endpoint</label>
+            <label>OpenID Connect Discovery Endpoint</label>
             <input ng-model="$ctrl.clientRegistrationProvider.discovery_endpoint" type="url" required>
           </md-input-container>
 
-          <md-input-container class="md-block" flex-gt-xs>
-            <label>Client Id</label>
-            <input ng-model="$ctrl.clientRegistrationProvider.client_id" type="text" required>
+          <md-input-container class="md-block">
+            <label>Initial Access Token Provider</label>
+            <md-select ng-model="$ctrl.clientRegistrationProvider.initial_access_token_type"
+                       required>
+              <md-option
+                ng-value="initialAccessTokenType.value"
+                ng-repeat="initialAccessTokenType in $ctrl.initialAccessTokenTypes">
+                {{::initialAccessTokenType.name}}
+              </md-option>
+            </md-select>
+            <div class="hint">
+              Define the way the initial access token must be provided.
+            </div>
           </md-input-container>
 
-          <md-input-container class="md-block" flex-gt-xs>
-            <label>Client Secret</label>
-            <input ng-model="$ctrl.clientRegistrationProvider.client_secret" type="text" required>
-          </md-input-container>
+          <div ng-if="$ctrl.clientRegistrationProvider.initial_access_token_type === 'client_credentials'">
+            <md-input-container class="md-block" flex-gt-xs>
+              <label>Client ID</label>
+              <input ng-model="$ctrl.clientRegistrationProvider.client_id" type="text" required>
+            </md-input-container>
 
-          <md-input-container class="md-block" flex-gt-xs>
-            <label>Scopes</label>
-            <md-chips ng-model="$ctrl.clientRegistrationProvider.scopes" placeholder="Enter a scope and press Enter"></md-chips>
-          </md-input-container>
+            <md-input-container class="md-block" flex-gt-xs>
+              <label>Client Secret</label>
+              <input ng-model="$ctrl.clientRegistrationProvider.client_secret" type="text" required>
+            </md-input-container>
+
+            <md-input-container class="md-block" flex-gt-xs>
+              <label>Scopes</label>
+              <md-chips ng-model="$ctrl.clientRegistrationProvider.scopes" placeholder="Enter a scope and press Enter"></md-chips>
+            </md-input-container>
+          </div>
+
+          <div ng-if="$ctrl.clientRegistrationProvider.initial_access_token_type === 'initial_access_token'">
+            <md-input-container class="md-block" flex-gt-xs>
+              <label>Initial Access Token</label>
+              <input ng-model="$ctrl.clientRegistrationProvider.initial_access_token" type="text" required>
+            </md-input-container>
+          </div>
         </div>
       </div>
     </div>

diff --git a/src/services/clientRegistrationProvider.service.ts b/src/services/clientRegistrationProvider.service.ts
@@ -48,9 +48,11 @@ class ClientRegistrationProviderService {
         name: clientRegistrationProvider.name,
         description: clientRegistrationProvider.description,
         discovery_endpoint: clientRegistrationProvider.discovery_endpoint,
+        initial_access_token_type: clientRegistrationProvider.initial_access_token_type,
         client_id: clientRegistrationProvider.client_id,
         client_secret: clientRegistrationProvider.client_secret,
-        scopes: clientRegistrationProvider.scopes
+        scopes: clientRegistrationProvider.scopes,
+        initial_access_token: clientRegistrationProvider.initial_access_token
       }).then(response => {
       let clientRegistrationProvider = response.data;
       clientRegistrationProvider.scopes = clientRegistrationProvider.scopes || [];