Split the src files into service and service provider files

spira · Jun 30, 2015 · 2dca733 · 2dca733
1 parent 1d80213
commit 2dca733
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 63 deletions.
diff --git a/dist/ngJwtAuth.d.ts b/dist/ngJwtAuth.d.ts
@@ -21,6 +21,22 @@ declare module NgJwtAuth {
         refresh?: string;
     }
 }
+declare module NgJwtAuth {
+    class NgJwtAuthService implements INgJwtAuthService {
+        private $http;
+        static $inject: string[];
+        constructor($http: ng.IHttpService);
+        isLoginMethod(url: string, subString: string): boolean;
+        getUser(): Object;
+        getPromisedUser(): ng.IPromise<Object>;
+        processNewToken(rawToken: string): boolean;
+        clearToken(): boolean;
+        authenticate(username: string, password: string): ng.IPromise<Object>;
+        exchangeToken(token: string): ng.IPromise<Object>;
+        requireLogin(): ng.IPromise<Object>;
+        private getRemoteData(url);
+    }
+}
 declare module NgJwtAuth {
     class NgJwtAuthServiceProvider implements ng.IServiceProvider, INgJwtAuthServiceProvider {
         apiEndpoints: IEndpointDefinition;

diff --git a/dist/ngJwtAuth.js b/dist/ngJwtAuth.js
diff --git a/dist/ngJwtAuth.js.map b/dist/ngJwtAuth.js.map
diff --git a/src/ngJwtAuth.ts → src/ngJwtAuthService.ts b/src/ngJwtAuth.ts → src/ngJwtAuthService.ts
@@ -4,40 +4,7 @@
 
 module NgJwtAuth {
 
-    export class NgJwtAuthServiceProvider implements ng.IServiceProvider, INgJwtAuthServiceProvider {
-
-        public apiEndpoints : IEndpointDefinition;
-
-        constructor() {
-
-            this.apiEndpoints = {
-                base: '/api/auth',
-                login: '/login',
-                tokenExchange: '/token',
-                refresh: '/refresh'
-            };
-
-        }
-
-        /**
-         * Set the API endpoints for the auth service to call
-         * @param config
-         * @returns {NgJwtAuth.NgJwtAuthServiceProvider}
-         */
-        public setApiEndpoints(config:IEndpointDefinition) : NgJwtAuthServiceProvider {
-            this.apiEndpoints = _.defaults(config, this.apiEndpoints);
-            return this;
-        }
-
-
-        public $get(): INgJwtAuthService {
-
-            return new NgJwtAuthService(null);
-        }
-
-    }
-
-    class NgJwtAuthService implements INgJwtAuthService {
+    export class NgJwtAuthService implements INgJwtAuthService {
 
         //list injected dependencies
         private $http: ng.IHttpService;
@@ -94,8 +61,4 @@ module NgJwtAuth {
 
     }
 
-    angular.module('ngJwtAuth', [])
-        .provider('ngJwtAuthService', NgJwtAuthServiceProvider)
-    ;
-
 }
diff --git a/src/ngJwtAuthServiceProvider.ts b/src/ngJwtAuthServiceProvider.ts
@@ -0,0 +1,45 @@
+/// <reference path="../typings/lodash/lodash.d.ts" />
+/// <reference path="../typings/angularjs/angular.d.ts" />
+/// <reference path="./ngJwtAuthInterfaces.ts" />
+/// <reference path="./ngJwtAuthService.ts" />
+
+module NgJwtAuth {
+
+    export class NgJwtAuthServiceProvider implements ng.IServiceProvider, INgJwtAuthServiceProvider {
+
+        public apiEndpoints : IEndpointDefinition;
+
+        constructor() {
+
+            this.apiEndpoints = {
+                base: '/api/auth',
+                login: '/login',
+                tokenExchange: '/token',
+                refresh: '/refresh'
+            };
+
+        }
+
+        /**
+         * Set the API endpoints for the auth service to call
+         * @param config
+         * @returns {NgJwtAuth.NgJwtAuthServiceProvider}
+         */
+        public setApiEndpoints(config:IEndpointDefinition) : NgJwtAuthServiceProvider {
+            this.apiEndpoints = _.defaults(config, this.apiEndpoints);
+            return this;
+        }
+
+
+        public $get(): INgJwtAuthService {
+
+            return new NgJwtAuthService(null);
+        }
+
+    }
+
+    angular.module('ngJwtAuth', [])
+        .provider('ngJwtAuthService', NgJwtAuthServiceProvider)
+    ;
+
+}