Merge branch 'master' of https://github.com/sahat/satellizer

README.md

@@ -1,4 +1,4 @@
-![Project Logo](https://lh6.googleusercontent.com/-YmfKZZLZKL0/U-KVPFSbiOI/AAAAAAAAEZA/maoYT8iJCnA/w1089-h513-no/sshot-1.png)
+![Project Logo](http://i.imgur.com/yutNy7x.jpg)
 
 # [Satellizer](https://github.com/sahat/satellizer/)
 

bower.json

@@ -3,6 +3,6 @@
   "main": "dist/satellizer.js",
   "homepage": "https://github.com/sahat/satellizer",
   "dependencies": {
-    "angular": ">=1.3.x && <= 1.5.x"
+    "angular": "1.3.x - 1.5.x"
   }
 }

src/config.ts

@@ -40,7 +40,7 @@ export default class Config {
       display: 'popup',
       oauthType: '2.0',
       popupOptions: { width: 452, height: 633 },
-      state: () => { encodeURIComponent(Math.random().toString(36).substr(2)); }
+      state: () => encodeURIComponent(Math.random().toString(36).substr(2))
     },
     github: {
       name: 'github',

src/oauth2.ts

@@ -70,7 +70,6 @@ export default class OAuth2 {
       Object.assign(this.defaults, options);
 
       this.$timeout(() => {
-        const url = [this.defaults.authorizationEndpoint, this.buildQueryString()].join('?');
         const stateName = this.defaults.name + '_state';
         const { name, state, popupOptions, redirectUri, responseType } = this.defaults;
 
@@ -79,6 +78,7 @@ export default class OAuth2 {
         } else if (typeof state === 'string') {
           this.SatellizerStorage.set(stateName, state);
         }
+        const url = [this.defaults.authorizationEndpoint, this.buildQueryString()].join('?');
 
         this.SatellizerPopup.open(url, name, popupOptions);
 

src/storage.ts

@@ -9,28 +9,27 @@ export default class Storage {
   constructor(private $window: angular.IHttpService,
               private SatellizerConfig: Config) {
     this.memoryStore = {};
-    this.storageType = SatellizerConfig.storageType;
   }
 
   get(key: string): string {
     try {
-      return this.$window[this.storageType].getItem(key);
+      return this.$window[this.SatellizerConfig.storageType].getItem(key);
     } catch (e) {
       return this.memoryStore[key];
     }
   }
 
   set(key: string, value: string): void {
     try {
-      this.$window[this.storageType].setItem(key, value);
+      this.$window[this.SatellizerConfig.storageType].setItem(key, value);
     } catch (e) {
       this.memoryStore[key] = value;
     }
   }
 
   remove(key: string): void {
     try {
-      this.$window[this.storageType].removeItem(key);
+      this.$window[this.SatellizerConfig.storageType].removeItem(key);
     } catch (e) {
       delete this.memoryStore[key];
     }