Merge pull request #329 from EATSTEAK/dev

Twinsteak · Aug 11, 2023 · a9a76e0 · a9a76e0
2 parents 15b143d + 3e0724f
commit a9a76e0
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lockerweb",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "SSU IT Collage Locker system.",
   "private": true,
   "scripts": {

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "scripts": {
     "dev": "cross-env VITE_BASE_URL=http://localhost:3000 vite dev --port 5002 --host 0.0.0.0",
     "build": "vite build",

diff --git a/packages/client/src/routes/+page.svelte b/packages/client/src/routes/+page.svelte
@@ -120,7 +120,7 @@
         {#if serviceConfig && !isActivated(serviceConfig.activateFrom, serviceConfig.activateTo)}
           <Button
             disabled={callbackUrl ? undefined : true}
-            href="https://class.ssu.ac.kr/xn-sso/gw.php?login_type=sso&callback_url={encodeURIComponent(
+            href="https://lms.ssu.ac.kr/xn-sso/gw.php?login_type=sso&callback_url={encodeURIComponent(
               callbackUrl,
             )}"
             rel="external"
@@ -132,7 +132,7 @@
         {:else}
           <Button
             disabled={callbackUrl ? undefined : true}
-            href="https://class.ssu.ac.kr/xn-sso/gw.php?login_type=sso&callback_url={encodeURIComponent(
+            href="https://lms.ssu.ac.kr/xn-sso/gw.php?login_type=sso&callback_url={encodeURIComponent(
               callbackUrl,
             )}"
             rel="external"

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Backend Lambda script for lockerweb",
   "license": "MIT",
   "scripts": {

diff --git a/packages/server/template.yaml b/packages/server/template.yaml
@@ -466,10 +466,11 @@ Resources:
     Metadata:
       Comment: 'Bucket to store client files'
     Properties:
-      AccessControl: PublicRead
       WebsiteConfiguration:
         IndexDocument: index.html
         ErrorDocument: error.html
+      PublicAccessBlockConfiguration:
+        BlockPublicPolicy: false
     Type: 'AWS::S3::Bucket'
   FrontS3BucketPolicy:
     Metadata:
@@ -478,12 +479,11 @@ Resources:
       Bucket: !Ref FrontS3Bucket
       PolicyDocument:
         Statement:
-          - Action:
-              - 's3:GetObject'
-            Effect: 'Allow'
+          - Sid: PublicReadForGetBucketObjects
+            Effect: Allow
             Principal: '*'
-            Resource:
-              - !Sub 'arn:aws:s3:::${FrontS3Bucket}/*'
+            Action: 's3:GetObject'
+            Resource: !Sub arn:aws:s3:::${FrontS3Bucket}/*
     Type: 'AWS::S3::BucketPolicy'
   CfApiCachePolicy:
     Properties:

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@types/lockerweb",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "types": "index.d.ts",
   "license": "MIT",
   "scripts": {