Skip to content

Feature/save to cookie #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amanecer2 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/save to cookie #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
734ac61
init
Feb 18, 2018
847f736
typo fix
Feb 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/auth.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Injectable } from "@angular/core";
import { Observable } from "rxjs/Observable";
import { Observer } from "rxjs/Observer";
import { saveToStorage, loadFromStorage, deleteFromStorage} from "storage.utils";

declare let gapi: any;
declare let IN: any;
Expand Down Expand Up @@ -29,12 +30,12 @@ export class AuthService {
}
if(!this.gauth.isSignedIn.get()){
this.gauth.signIn().then(() => {
localStorage.setItem('_login_provider', 'google');
saveToStorage('_login_provider', 'google');
observer.next(this._fetchGoogleUserDetails());
observer.complete();
});
}else{
localStorage.setItem('_login_provider', 'google');
saveToStorage('_login_provider', 'google');
observer.next(this._fetchGoogleUserDetails());
observer.complete();
}
Expand All @@ -55,7 +56,7 @@ export class AuthService {
image: res.picture.data.url,
token: response.authResponse.accessToken
}
localStorage.setItem('_login_provider', 'facebook');
saveToStorage('_login_provider', 'facebook');
observer.next(userDetails);
observer.complete();
}
Expand All @@ -76,7 +77,7 @@ export class AuthService {
image: res.picture.data.url,
token: response.authResponse.accessToken
}
localStorage.setItem('_login_provider', 'facebook');
saveToStorage('_login_provider', 'facebook');
observer.next(userDetails);
observer.complete();
}
Expand All @@ -90,7 +91,7 @@ export class AuthService {
IN.User.authorize(function(){
IN.API.Raw("/people/~:(id,first-name,last-name,email-address,picture-url)").result(function(res: any){
let userDetails = {name: res.firstName + " " + res.lastName, email: res.emailAddress, uid: res.id, provider: "linkedIN", image: res.pictureUrl};
localStorage.setItem('_login_provider', 'linkedin');
saveToStorage('_login_provider', 'linkedin');
observer.next(userDetails);
observer.complete();
});
Expand All @@ -102,7 +103,7 @@ export class AuthService {
}

logout(): Observable<boolean>{
let provider = localStorage.getItem("_login_provider");
let provider = loadFromStorage("_login_provider");
return Observable.create((observer: any) => {
switch(provider){
case "google":
Expand All @@ -117,21 +118,21 @@ export class AuthService {
gSignout.src = "https://accounts.google.com/Logout";
gSignout.type = "text/html";
gSignout.id = "gSignout";
localStorage.removeItem('_login_provider');
deleteFromStorage('_login_provider');
observer.next(true);
observer.complete();
ref.parentNode.insertBefore(gSignout, ref);
break;
case "facebook":
FB.logout(function(res: any){
localStorage.removeItem('_login_provider');
deleteFromStorage('_login_provider');
observer.next(true);
observer.complete();
});
break;
case "linkedin":
IN.User.logout(function(){
localStorage.removeItem('_login_provider');
deleteFromStorage('_login_provider');
observer.next(true);
observer.complete();
}, {});
Expand Down
64 changes: 64 additions & 0 deletions src/storage.utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
export function setCookie(cname: string, cvalue: any, exdays = 1): void {
const d = new Date();
d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
const expires = 'expires=' + d.toUTCString();
document.cookie = `${cname}=${cvalue};${expires};path=/`;
}

export function getCookie(cname: string): any {
const name = `${cname}=`;
const decodedCookie = decodeURIComponent(document.cookie);
const ca = decodedCookie.split(';');
for (let i = 0; i < ca.length; i++) {
let c = ca[i];
while (c.charAt(0) === ' ') {
c = c.substring(1);
}
if (c.indexOf(name) === 0) {
return c.substring(name.length, c.length);
}
}
return '';
}

export function setLocalStorage(cname: string, cvalue: any): void {
localStorage.setItem(cname, cvalue);
}

export function getLocalStorage(cname: string): any {
return localStorage.getItem(cname);
}

export function deleteLocalStorage(cname: string): void {
localStorage.removeItem(cname);
}

export function deleteCookie(cname: string): void {
setCookie(cname, '', 0);
}


export function isLocalStorageAvailable(): boolean {
const test = 'test';
try {
localStorage.setItem(test, test);
localStorage.removeItem(test);
return true;
} catch (e) {
return false;
}
}

export const getSavingMethod = () => {
return isLocalStorageAvailable() ? setLocalStorage : setCookie;
};
export const getRetrieveMethod = () => {
return isLocalStorageAvailable() ? getLocalStorage : getCookie;
}
;export const getDeleteMethod = () => {
return isLocalStorageAvailable() ? deleteLocalStorage : deleteCookie;
};

export const saveToStorage = getSavingMethod();
export const loadFromStorage = getRetrieveMethod();
export const deleteFromStorage = getDeleteMethod();