Better namespaces: RC.* instead of RC.*.*

ringcentral · Feb 26, 2019 · 6f7f817 · 6f7f817
1 parent f929a46
commit 6f7f817
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 19 deletions.
diff --git a/demo/src/apiKey.html b/demo/src/apiKey.html
@@ -96,7 +96,7 @@ <h1>
 
         appKeyField.value = platform._appKey;
         appSecretField.value = platform._appSecret;
-        serverField.value = platform._server || RingCentral.sdk.SDK.server.sandbox;
+        serverField.value = platform._server || RingCentral.SDK.server.sandbox;
 
     }
 

diff --git a/demo/src/core.html b/demo/src/core.html
@@ -48,7 +48,7 @@ <h1>
     (function() {
 
         var sdk = getSDK();
-        var subscriptions = new RingCentral.subscriptions.Subscriptions({sdk: sdk});
+        var subscriptions = new RingCentral.Subscriptions({sdk: sdk});
         var platform = sdk.platform();
 
         function showExtension() {

diff --git a/demo/src/facebook.html b/demo/src/facebook.html
@@ -113,7 +113,7 @@ <h1>
         function createSDK() {
             // https://developers.facebook.com/docs/facebook-login/access-tokens/refreshing/
             // https://developers.facebook.com/docs/facebook-login/manually-build-a-login-flow/#exchangecode
-            sdk = new RingCentral.sdk.SDK({
+            sdk = new RingCentral.SDK({
                 server: 'https://graph.facebook.com',
                 authorizeEndpoint: 'https://facebook.com/v3.2/dialog/oauth',
                 tokenEndpoint: '/v3.2/oauth/access_token',

diff --git a/demo/src/oauth/redirect.html b/demo/src/oauth/redirect.html
@@ -8,7 +8,7 @@
 <script src="../../node_modules/@ringcentral/sdk/dist/ringcentral.js" type="text/javascript"></script>
 <script type="text/javascript">
 
-    RingCentral.sdk.SDK.handleLoginRedirect();
+    RingCentral.SDK.handleLoginRedirect();
 
 </script>
 </body>

diff --git a/demo/src/scripts.js b/demo/src/scripts.js
@@ -12,12 +12,12 @@
             }
         }
 
-        var sdk = new RingCentral.sdk.SDK({
+        var sdk = new RingCentral.SDK({
             server: server,
             appKey: appKey,
             appSecret: appSecret,
             appName: 'Demo',
-            appVersion: RingCentral.sdk.SDK.version,
+            appVersion: RingCentral.SDK.version,
             redirectUri: decodeURIComponent(window.location.href.split('login', 1) + 'oauth/redirect.html')
         });
 

diff --git a/sdk/README.md b/sdk/README.md
@@ -85,8 +85,8 @@ Add the following to your HTML:
 <script type="text/javascript" src="path-to-scripts/ringcentral.js"></script><!-- or ringcentral.min.js -->
 <script type="text/javascript">
 
-    var rcsdk = new RingCentral.sdk.SDK({
-        server: RingCentral.sdk.SDK.server.sandbox,
+    var rcsdk = new RingCentral.SDK({
+        server: RingCentral.SDK.server.sandbox,
         appKey: 'yourAppKey',
         appSecret: 'yourAppSecret',
         redirectUri: '' // optional, but is required for Implicit Grant and Authorization Code OAuth Flows (see below)
@@ -184,7 +184,7 @@ rcsdk
 In this case your landing page (the one to which Redirect URI points) need to call the following code:
 
 ```js
-RingCentral.sdk.SDK.handleLoginRedirect();
+RingCentral.SDK.handleLoginRedirect();
 ```
 
 #### Difference between Authorization Code and Implicit Grant flows
@@ -803,10 +803,10 @@ var FormData = require('form-data'),
     formData = new FormData();
 
 // This is the mandatory part, the name and type should always be as follows
-formData.append('json', new Buffer(JSON.stringify(body)), {filename: 'request.json', contentType: 'application/json'});
+formData.append('json', Buffer(JSON.stringify(body)), {filename: 'request.json', contentType: 'application/json'});
 
 // To send a plain text
-formData.append('attachment', new Buffer('some plain text'), {filename: 'text.txt', contentType: 'text/plain'});
+formData.append('attachment', Buffer('some plain text'), {filename: 'text.txt', contentType: 'text/plain'});
 
 // To send a file from file system
 formData.append('attachment', require('fs').createReadStream('/foo/bar.jpg'));

diff --git a/sdk/src/SDK-spec.ts b/sdk/src/SDK-spec.ts
@@ -1,6 +1,6 @@
 import {expect, SDK, spy} from './test/test';
 
-describe('RingCentral.sdk.SDK', () => {
+describe('RingCentral.SDK', () => {
     const test = async (suite, server) => {
         suite.timeout(10000); // Per SLA should be 3 seconds
 

diff --git a/sdk/webpack.config.js b/sdk/webpack.config.js
@@ -5,5 +5,5 @@ module.exports = createConfig({
     filename: 'ringcentral',
     entry: './src/SDK.ts',
     outputPath: path.resolve(__dirname, 'dist'),
-    libraryName: 'sdk',
+    libraryName: 'SDK',
 });
diff --git a/subscriptions/README.md b/subscriptions/README.md
@@ -73,14 +73,14 @@ Add the following to your HTML:
 <script type="text/javascript" src="path-to-scripts/ringcentral-subscriptions.js"></script>
 <script type="text/javascript">
 
-    var sdk = new RingCentral.sdk.SDK({
-        server: RingCentral.sdk.SDK.server.sandbox,
+    var sdk = new RingCentral.SDK({
+        server: RingCentral.SDK.server.sandbox,
         appKey: 'yourAppKey',
         appSecret: 'yourAppSecret',
         redirectUri: '' // optional, but is required for Implicit Grant and Authorization Code OAuth Flows (see below)
     });
     
-    var subscriptions = new RingCentral.subscriptions.Subscriptions({
+    var subscriptions = new RingCentral.Subscriptions({
        sdk: sdk
     });
 

diff --git a/subscriptions/src/subscription/CachedSubscription-spec.ts b/subscriptions/src/subscription/CachedSubscription-spec.ts
@@ -1,7 +1,7 @@
 import {asyncTest, expect} from '@ringcentral/sdk/lib/test/test';
 import {createSubscriptions} from '../test/test';
 
-describe('RingCentral.subscription.CachedSubscription', () => {
+describe('CachedSubscription', () => {
     describe('create', () => {
         it(
             'supports legacy definition',

diff --git a/subscriptions/src/subscription/Subscription-spec.ts b/subscriptions/src/subscription/Subscription-spec.ts
@@ -12,7 +12,7 @@ const createSubscription = sdk =>
         renewHandicapMs,
     });
 
-describe('RingCentral.subscription.Subscription', () => {
+describe('Subscription', () => {
     describe('register', () => {
         it(
             'automatically renews subscription',

diff --git a/subscriptions/webpack.config.js b/subscriptions/webpack.config.js
@@ -5,7 +5,7 @@ module.exports = createConfig({
     filename: 'ringcentral-subscriptions',
     entry: './src/Subscriptions.ts',
     outputPath: path.resolve(__dirname, 'dist'),
-    libraryName: 'subscriptions',
+    libraryName: 'Subscriptions',
     externals: {
         '@ringcentral/sdk': {
             commonjs: '@ringcentral/sdk',

diff --git a/utils/webpack.js b/utils/webpack.js
@@ -19,6 +19,7 @@ function createConfig({entry, filename, outputPath, libraryName, externals}) {
             path: outputPath,
             library: ['RingCentral', libraryName],
             libraryTarget: 'umd',
+            libraryExport: 'default',
         },
         externals,
     };