msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade shopify OAuth process

Browse Source
master
ycfxx 4 years ago
parent a8bc6dfc62
commit 720f6868da
7 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/au/com/royalpay/payment/manage/shopify/auth/web/ShopifyAuthTemplateController.java
Unescape View File

@ -67,7 +67,7 @@ public class ShopifyAuthTemplateController {
* @return * @return
*/ */
@GetMapping("/auth/back") @GetMapping("/auth/back")
public RedirectView shopifyStoreAuthRedirect(@RequestParam("code") String code, public String shopifyStoreAuthRedirect(@RequestParam("code") String code,
@RequestParam("hmac") String hmac, @RequestParam("hmac") String hmac,
@RequestParam("host") String host, @RequestParam("host") String host,
@RequestParam("state") String state, @RequestParam("state") String state,
@ -98,7 +98,7 @@ public class ShopifyAuthTemplateController {
String redirectUri = PlatformEnvironment.getEnv().concatUrl("/auth.html#/shopify/login?code=" + code + "&hmac=" + hmac + "&host=" + host + "&state=" + state + "&shop=" + shop + "&timestamp=" + timestamp); String redirectUri = PlatformEnvironment.getEnv().concatUrl("/auth.html#/shopify/login?code=" + code + "&hmac=" + hmac + "&host=" + host + "&state=" + state + "&shop=" + shop + "&timestamp=" + timestamp);
response.setHeader("content-security-policy", "frame-ancestors https://" + shop + ".myshopify.com https://admin.shopify.com"); response.setHeader("content-security-policy", "frame-ancestors https://" + shop + ".myshopify.com https://admin.shopify.com");
return new RedirectView(redirectUri); return "redirect:" + redirectUri;
} }
} }

2
src/main/resources/application-dev.yml
Unescape View File

@ -73,7 +73,7 @@ spring:
app: app:
run-tasks: false run-tasks: false
host: host:
main: https://1c6d-222-95-180-118.ngrok.io/ main: https://65e5-222-95-183-204.ngrok.io/
regions: regions:
au: http://dalong-au.dev.rpaygroup.com/ au: http://dalong-au.dev.rpaygroup.com/
cn: http://dalong-au.dev.rpaygroup.com/ cn: http://dalong-au.dev.rpaygroup.com/

1
src/main/resources/templates/shopify/auth_back.html
Unescape View File

@ -2,6 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="Content-Security-Policy" content="frame-ancestors 'none'">
<title>Auth</title> <title>Auth</title>
<link rel="stylesheet" type="text/css" href="/static/lib/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="/static/lib/bootstrap/css/bootstrap.min.css">
<script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script> <script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>

1
src/main/ui/static/shopify/auth/templates/auth_root.html
Unescape View File

@ -2,6 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="Content-Security-Policy" content="frame-ancestors 'none'">
<title>Title</title> <title>Title</title>
<style> <style>

1
src/main/ui/static/shopify/auth/templates/shopify_auth.html
Unescape View File

@ -2,6 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="Content-Security-Policy" content="frame-ancestors 'none'">
<title>Title</title> <title>Title</title>
<style> <style>

1
src/main/ui/static/shopify/auth/templates/shopify_login.html
Unescape View File

@ -2,6 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="Content-Security-Policy" content="frame-ancestors 'none'">
<title>Title</title> <title>Title</title>
<style> <style>

1
src/main/ui/static/shopify/auth/templates/shopify_register.html
Unescape View File

@ -2,6 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="Content-Security-Policy" content="frame-ancestors 'none'">
<title>Title</title> <title>Title</title>
<style> <style>
.col-centered { .col-centered {

Write Preview
Loading…
Cancel
Save