Merge pull request #106 from Azure/igo/arm-contracts

BREAKING CHANGE: switch to ARM contracts and change the management API endpoint

Author: ygrik

src/components/operations/runtime/operation-list/operation-list.html

@@ -13,8 +13,7 @@
                     data-bind="css: { active: item.shortId === $parent.selectedId() }">
                     <div class="list-group-item-heading flex-container">
                         <div class="list-group-item-label flex-item flex-grow">
-                            <a href="#" class="text-truncate"
-                                data-bind="attr: { href: $parent.getNavigationProductId(item.id) }">
+                            <a href="#" class="text-truncate" data-bind="click: $parent.selectOperation">
                                 <span data-bind="attr: { 'data-method': method }"></span>
                                 <span class="operation-name" data-bind="text: item.name"></span>
                             </a>

src/components/operations/runtime/operation-list/operation-list.ts

@@ -105,28 +105,28 @@ export class OperationList {
         }
     }
 
-    public getNavigationProductId(fullOperationId: string): string {
-        if (!fullOperationId) {
-            return "#";
+    public selectOperation(operation: Operation): void {
+        if (!operation) {
+            return;
         }
-        const parts = fullOperationId.split("/operations/");
+        const parts = operation.id.split("/operations/");
         const apiId = parts[0].split("/apis/").pop();
         const operationId = parts[1];
 
         const params = new URLSearchParams();
         params.append("apiId", apiId);
         operationId && params.append("operationId", operationId);
 
-        return `#?${params.toString()}`;
+        this.router.navigateTo("#?" + params.toString());
     }
 
     private selectFirst(): void {
         if (!this.queryParams.has("operationId")) {
             const list = this.operations();
             if (list.length > 0) {
-                const selectProductId = list[0].shortId;
-                this.selectedId(selectProductId);
-                this.queryParams.set("operationId", selectProductId);
+                const selectId = list[0].shortId;
+                this.selectedId(selectId);
+                this.queryParams.set("operationId", selectId);
                 this.router.navigateTo("#?" + this.queryParams.toString());
             }
         }

src/components/users/runtime/user-details/user-details.html

@@ -107,10 +107,10 @@
     <div class="row">
         <div class="col-md-6">Change password</div>
         <div class="col-md-3">
-            <input type="text" class="form-control" placeholder="Current" data-bind="value: password" />
+            <input type="password" class="form-control" placeholder="New password" data-bind="value: password" />
         </div>
         <div class="col-md-3">
-            <input type="text" class="form-control" placeholder="Confirm" data-bind="value: confirmPassword" />
+            <input type="password" class="form-control" placeholder="Confirm" data-bind="value: confirmPassword" />
         </div>
     </div>
     <div class="row">

src/components/users/runtime/user-subscriptions/user-subscriptions.ts

@@ -51,7 +51,7 @@ export class UserSubscriptions {
     }
 
     public async renameSubscription(subscription: SubscriptionViewModel): Promise<void> {
-        const updated = await this.productService.renameUserSubscription(subscription.model.id, subscription.model.userId, subscription.editName());
+        const updated = await this.productService.renameUserSubscription(subscription.model.id, subscription.editName());
         const updatedVM = new SubscriptionViewModel(updated);
         this.syncSubscriptionLabelState(subscription, updatedVM);
         this.subscriptions.replace(subscription, updatedVM);
@@ -60,7 +60,7 @@ export class UserSubscriptions {
 
     public async regeneratePKey(subscription: SubscriptionViewModel): Promise<void> {
         subscription.isPRegenerating(true);
-        const updated = await this.productService.regeneratePrimaryKey(subscription.model.id, subscription.model.userId);
+        const updated = await this.productService.regeneratePrimaryKey(subscription.model.id);
         const updatedVM = new SubscriptionViewModel(updated);
         this.syncSubscriptionLabelState(subscription, updatedVM);
         this.subscriptions.replace(subscription, updatedVM);
@@ -69,7 +69,7 @@ export class UserSubscriptions {
 
     public async regenerateSKey(subscription: SubscriptionViewModel): Promise<void> {
         subscription.isSRegenerating(true);
-        const updated = await this.productService.regenerateSecondaryKey(subscription.model.id, subscription.model.userId);
+        const updated = await this.productService.regenerateSecondaryKey(subscription.model.id);
         const updatedVM = new SubscriptionViewModel(updated);
         this.syncSubscriptionLabelState(subscription, updatedVM);
         this.subscriptions.replace(subscription, updatedVM);
@@ -86,7 +86,7 @@ export class UserSubscriptions {
     }
 
     public async cancelSubscription(subscription: SubscriptionViewModel): Promise<void> {
-        const updated = await this.productService.cancelUserSubscription(subscription.model.id, subscription.model.userId);
+        const updated = await this.productService.cancelUserSubscription(subscription.model.id);
         const updatedVM = new SubscriptionViewModel(updated);
         this.syncSubscriptionLabelState(subscription, updatedVM);
         this.subscriptions.replace(subscription, updatedVM);

src/contracts/api.ts

@@ -1,18 +1,27 @@
 import { OperationContract } from "./operation";
-import { VersionSetContract } from "./apiVersionSet";
 import { AuthenticationSettings } from "./authenticationSettings";
+import { ArmResource } from "./armResource";
 
 /**
  * Cotract of API
  */
-export interface ApiContract {
-    id?: string;
-    name?: string;
+export interface ApiContract extends ArmResource {
+    properties: ApiProperties;
+}
+
+export interface ApiProperties {
+    displayName?: string;
     description?: string;
     apiVersion?: string;
     apiVersionDescription?: string;
     apiVersionSetId?: string;
-    apiVersionSet?: VersionSetContract;
+    apiVersionSet?: {
+        name: string,
+        description: string,
+        versioningScheme: string,
+        versionQueryName: string,
+        versionHeaderName: string
+    };
     apiRevision?: string;
     apiRevisionDescription?: string;
     serviceUrl?: string;
@@ -26,8 +35,10 @@ export interface ApiContract {
     type?: string;
     isCurrent?: boolean;
     isOnline?: boolean;
+    subscriptionRequired?: boolean;
 }
 
+
 export interface SubscriptionKeyParameterName {
     header: string;
     query: string;

src/contracts/apiVersionSet.ts

@@ -1,16 +1,13 @@
-export interface VersionSetContract {
-    id?: string;
-    name?: string;
+import { ArmResource } from "./armResource";
+
+export interface VersionSetPropertiesContract {
+    displayName?: string;
     description?: string;
     versioningScheme?: string;
     versionQueryName?: string;
     versionHeaderName?: string;
+}
 
-    properties?: {
-        name?: string;
-        description?: string;
-        versioningScheme?: string;
-        versionQueryName?: string;
-        versionHeaderName?: string;
-    }
+export interface VersionSetContract extends ArmResource {
+    properties: VersionSetPropertiesContract;
 }

src/contracts/armResource.ts

@@ -0,0 +1,6 @@
+export interface ArmResource {
+    id: string;
+    type?: string;
+    name: string;
+    properties: any;
+}

src/contracts/authorizationServer.ts

@@ -1,11 +1,11 @@
+import { ArmResource } from "./armResource";
 
-
-export interface AuthorizationServer  {
+export interface AuthorizationServer extends ArmResource  {
     properties: AuthProperties;
 }
 
 interface AuthProperties {
-    name?: string;
+    displayName?: string;
     description: string;    
     clientRegistrationEndpoint: string;