sidharth.kothari
/
retailer-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'beta' of git.treelet.net:crane/retailer-vue into dev

This commit is contained in:
rakesh 2022-02-02 17:02:24 +05:30
parent 10046af243 0254ae8669
commit 610a4dc1fa
7 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.custom
View File

@ -21,3 +21,4 @@ VUE_APP_IMAGE_CATEGORY_PARAMS=?height=600&width=600
VUE_APP_IMAGE_LIB_URL=https://imagelib-api.crane.com VUE_APP_IMAGE_LIB_URL=https://imagelib-api.crane.com
VUE_APP_CRANE_ORDER_URL=https://order.crane.com VUE_APP_CRANE_ORDER_URL=https://order.crane.com
VUE_APP_BASE_URL=https://www.crane.com VUE_APP_BASE_URL=https://www.crane.com
VUE_APP_RP_AUTH_NAME=rp_auth_stg

3
.env.daily
View File

@ -24,4 +24,5 @@ DEPLOY_S3_BUCKET=www-daily.crane.com
DEPLOY_CLOUDFRONT_ID=E28QEVKG98ZHYU DEPLOY_CLOUDFRONT_ID=E28QEVKG98ZHYU
VUE_APP_ASSETS_NODESLS_URL=https://assets-sls.crane.com VUE_APP_ASSETS_NODESLS_URL=https://assets-sls.crane.com
VUE_APP_IMAGE_LIB_URL=https://imagelib-api.crane.com VUE_APP_IMAGE_LIB_URL=https://imagelib-api.crane.com
VUE_APP_BASE_URL=https://www.crane.com VUE_APP_BASE_URL=https://www.crane.com
VUE_APP_RP_AUTH_NAME=rp_auth_stg

3
.env.development
View File

@ -24,4 +24,5 @@ DEPLOY_S3_BUCKET=retailer-edge-staging-website-bucket
DEPLOY_CLOUDFRONT_ID=E1QLFKCOZUDC8P DEPLOY_CLOUDFRONT_ID=E1QLFKCOZUDC8P
VUE_APP_ASSETS_NODESLS_URL=https://assets-stg-sls.crane.com VUE_APP_ASSETS_NODESLS_URL=https://assets-stg-sls.crane.com
VUE_APP_IMAGE_LIB_URL=https://imagelib-stg-api.crane.com VUE_APP_IMAGE_LIB_URL=https://imagelib-stg-api.crane.com
VUE_APP_BASE_URL=https://retailer-stg.crane.com VUE_APP_BASE_URL=https://retailer-stg.crane.com
VUE_APP_RP_AUTH_NAME=rp_auth_stg

3
.env.production
View File

@ -25,4 +25,5 @@ DEPLOY_S3_BUCKET=retailer-edge-staging-website-bucket
DEPLOY_CLOUDFRONT_ID=E1QLFKCOZUDC8P DEPLOY_CLOUDFRONT_ID=E1QLFKCOZUDC8P
VUE_APP_ASSETS_NODESLS_URL=https://assets-stg-sls.crane.com VUE_APP_ASSETS_NODESLS_URL=https://assets-stg-sls.crane.com
VUE_APP_IMAGE_LIB_URL=https://imagelib-stg-api.crane.com VUE_APP_IMAGE_LIB_URL=https://imagelib-stg-api.crane.com
VUE_APP_BASE_URL=https://retailer-stg.crane.com VUE_APP_BASE_URL=https://retailer-stg.crane.com
VUE_APP_RP_AUTH_NAME=rp_auth_prod

3
.env.staging
View File

@ -25,4 +25,5 @@ DEPLOY_S3_BUCKET=retailer-edge-staging-website-bucket
DEPLOY_CLOUDFRONT_ID=E1QLFKCOZUDC8P DEPLOY_CLOUDFRONT_ID=E1QLFKCOZUDC8P
VUE_APP_ASSETS_NODESLS_URL=https://assets-stg-sls.crane.com VUE_APP_ASSETS_NODESLS_URL=https://assets-stg-sls.crane.com
VUE_APP_IMAGE_LIB_URL=https://imagelib-stg-api.crane.com VUE_APP_IMAGE_LIB_URL=https://imagelib-stg-api.crane.com
VUE_APP_BASE_URL=https://retailer-stg.crane.com VUE_APP_BASE_URL=https://retailer-stg.crane.com
VUE_APP_RP_AUTH_NAME=rp_auth_stg

2
git_info.json
View File

@ -1 +1 @@
{"branch_name":"dev","last_commit_date":"2022-02-02T08:33:21.000Z","last_commit_author":"anju j","last_commit_hash":"d1c2677c55582cb137b7c803f816d73db39449ba"} {"branch_name":"dev","last_commit_date":"2022-02-02T11:31:34.000Z","last_commit_author":"rakesh","last_commit_hash":"10046af2437c1ed10825be0c204a88514ee13c1e"}

10
src/services/auth.js
View File

@ -1,7 +1,9 @@
import { Base64 } from 'js-base64'; import { Base64 } from 'js-base64';
const rpAuthName = process.env.VUE_APP_RP_AUTH_NAME;
console.log("rpAuthName",rpAuthName)
const getAuthUser = function() { const getAuthUser = function() {
// return authorization header with jwt token // return authorization header with jwt token
const userAuthEncoded = window.$cookies.get('cr_cauth'); const userAuthEncoded = window.$cookies.get(rpAuthName);
if (userAuthEncoded === null) { if (userAuthEncoded === null) {
return null; return null;
} }
@ -19,12 +21,12 @@ const setAuthUser = function(userAuth,flag) {
if(flag) if(flag)
{ {
const userAuthEncoded = Base64.encode(JSON.stringify(userAuth)); const userAuthEncoded = Base64.encode(JSON.stringify(userAuth));
window.$cookies.set("cr_cauth", userAuthEncoded, '30d', null, getDomain(window.location.hostname)); window.$cookies.set(rpAuthName, userAuthEncoded, '30d', null, getDomain(window.location.hostname));
} }
else else
{ {
const userAuthEncoded = Base64.encode(JSON.stringify(userAuth)); const userAuthEncoded = Base64.encode(JSON.stringify(userAuth));
window.$cookies.set("cr_cauth", userAuthEncoded, '1h', null, getDomain(window.location.hostname)); window.$cookies.set(rpAuthName, userAuthEncoded, '1h', null, getDomain(window.location.hostname));
} }
} }
@ -33,7 +35,7 @@ const resetAuthUser = function() {
if (au === null) { if (au === null) {
return false; return false;
} }
window.$cookies.remove('cr_cauth', null, getDomain(window.location.hostname)); window.$cookies.remove(rpAuthName, null, getDomain(window.location.hostname));
} }
const authHeader = function() { const authHeader = function() {