Merge pull request #25 from studyplus/feature/cancel_auth

koji-1009 · web-flow · commit 9f6c35a13ac2 · 2020-04-03T16:10:33.000+09:00
認証キャンセル処理追加
diff --git a/.github/workflows/pr_check.yml b/.github/workflows/pr_check.yml
@@ -9,24 +9,70 @@ jobs:
   danger:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - name: Checkout
+        uses: actions/checkout@v2.0.0
+
+      - name: Bundler Cache
+        uses: actions/cache@v1.1.2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
       - name: Setup Ruby for use with actions
         uses: actions/setup-ruby@v1.0.0
         with:
-          ruby-version: '2.6'
-          architecture: 'x64'
-      - name: Install danger
+          ruby-version: '2.7'
+      - name: Install Danger
         run: |
           gem install bundler
-          bundle install
+          bundle config set path 'vendor/bundle'
+          bundle config set clean 'true'
+          bundle check || bundle install --jobs 4 --retry 3
+
+      - name: Gradle dist Cache
+        uses: actions/cache@v1.1.2
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-dist-gradle-${{ hashFiles('**/gradle-wrapper.properties') }}
+      - name: Gradle dependencies Cache
+        uses: actions/cache@v1.1.2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-v1-gradle-${{ hashFiles('./build.gradle') }}-${{ hashFiles('**/build.gradle') }}
+          restore-keys: |
+            ${{ runner.os }}-v1-gradle-${{ hashFiles('./build.gradle') }}-
+            ${{ runner.os }}-v1-gradle-
+      - name: Download Dependencies
+        run: |
+          ./gradlew androidDependencies --no-daemon
+
       - name: Run danger
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: danger
+        run: bundle exec danger
+
   unit_test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - name: Checkout
+        uses: actions/checkout@v2.0.0
+
+      - name: Gradle dist Cache
+        uses: actions/cache@v1.1.2
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-dist-gradle-${{ hashFiles('**/gradle-wrapper.properties') }}
+      - name: Gradle dependencies Cache
+        uses: actions/cache@v1.1.2
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-v1-gradle-${{ hashFiles('**/build.gradle') }}
+          restore-keys: |
+            ${{ runner.os }}-v1-gradle-
+      - name: Download Dependencies
+        run: |
+          ./gradlew androidDependencies --no-daemon
+
       - name: Run unit test
         run: ./gradlew studyplus-android-sdk:test
-
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,7 @@
+# frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "danger"
-gem 'danger-android_lint'
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+gem 'danger'
+gem 'danger-android_lint'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,63 +1,66 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     ast (2.4.0)
-    claide (1.0.2)
+    claide (1.0.3)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (6.0.6)
+    danger (6.3.2)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
       faraday (~> 0.9)
-      faraday-http-cache (~> 1.0)
-      git (~> 1.5)
+      faraday-http-cache (~> 2.0)
+      git (~> 1.6)
       kramdown (~> 2.0)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
-    danger-android_lint (0.0.7)
+    danger-android_lint (0.0.8)
       danger-plugin-api (~> 1.0)
       oga
     danger-plugin-api (1.0.0)
       danger (> 2.0)
-    faraday (0.15.4)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (1.3.1)
+    faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    git (1.5.0)
+    git (1.6.0)
+      rchardet (~> 1.8)
     kramdown (2.1.0)
-    kramdown-parser-gfm (1.0.1)
+    kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     nap (1.1.0)
     no_proxy_fix (0.1.2)
-    octokit (4.14.0)
+    octokit (4.18.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oga (2.15)
+    oga (3.2)
       ast
       ruby-ll (~> 2.1)
     open4 (1.3.4)
-    public_suffix (3.0.3)
+    public_suffix (4.0.3)
+    rchardet (1.8.0)
     ruby-ll (2.1.2)
       ansi
       ast
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.5.0)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
@@ -67,4 +70,4 @@ DEPENDENCIES
   danger-android_lint
 
 BUNDLED WITH
-   2.0.1
+   2.1.4
diff --git a/build.gradle b/build.gradle
@@ -2,24 +2,25 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.3.50'
-        kotlin_cotoutines_version = '1.3.1'
+        kotlin_version = '1.3.71'
+        kotlin_cotoutines_version = '1.3.5'
     }
     ext.versions = [
             'compileSdk'      : 29,
             'minSdk'          : 21,
             'targetSdk'       : 29,
             'annotation'      : '1.1.0',
-            'core_ktx'        : '1.1.0',
             'appcompat'       : '1.1.0',
-            'constraintLayout': '1.1.3'
+            'constraintLayout': '1.1.3',
+            'junit'           : '4.13',
+            'robolectric'     : '4.3.1'
     ]
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.6.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Sep 25 14:10:00 JST 2019
+#Thu Apr 02 08:45:00 JST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/sdk-example-java/build.gradle b/sdk-example-java/build.gradle
@@ -34,12 +34,12 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation "androidx.appcompat:appcompat:${versions.appcompat}"
-    implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
+    implementation "androidx.appcompat:appcompat:$versions.appcompat"
+    implementation "androidx.constraintlayout:constraintlayout:$versions.constraintLayout"
 
     implementation 'com.github.studyplus:Studyplus-Android-SDK:2.5.1'
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation "junit:junit:$versions.junit"
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
diff --git a/sdk-example-kt/build.gradle b/sdk-example-kt/build.gradle
@@ -33,12 +33,12 @@ repositories {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "androidx.appcompat:appcompat:${versions.appcompat}"
-    implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
+    implementation "androidx.appcompat:appcompat:$versions.appcompat"
+    implementation "androidx.constraintlayout:constraintlayout:$versions.constraintLayout"
 
     implementation 'com.github.studyplus:Studyplus-Android-SDK:2.5.1'
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation "junit:junit:$versions.junit"
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
diff --git a/sdk-example-kt/src/main/java/jp/studyplus/android/sdk_example_kt/MainActivity.kt b/sdk-example-kt/src/main/java/jp/studyplus/android/sdk_example_kt/MainActivity.kt
@@ -38,6 +38,13 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
+        findViewById<View>(R.id.cancel_auth)?.apply {
+            setOnClickListener {
+                Studyplus.instance.cancelAuth(this@MainActivity)
+                updateAuthText()
+            }
+        }
+
         findViewById<View>(R.id.post_study_record)?.apply {
             setOnClickListener {
                 val record = StudyRecord(
@@ -64,7 +71,10 @@ class MainActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
+        updateAuthText()
+    }
 
+    private fun updateAuthText() {
         val authStatusText = findViewById<TextView>(R.id.auth_status)
         authStatusText.text = when (Studyplus.instance.isAuthenticated(this)) {
             true -> getString(R.string.status_authenticated)
diff --git a/sdk-example-kt/src/main/res/layout/activity_main.xml b/sdk-example-kt/src/main/res/layout/activity_main.xml
@@ -35,6 +35,17 @@
             android:layout_width="match_parent"
             android:layout_height="24dp" />
 
+        <Button
+            android:id="@+id/cancel_auth"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:text="@string/cancel_auth_button" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="24dp" />
+
         <Button
             android:id="@+id/post_study_record"
             android:layout_width="match_parent"
diff --git a/sdk-example-kt/src/main/res/values/strings.xml b/sdk-example-kt/src/main/res/values/strings.xml
@@ -5,6 +5,7 @@
     <string name="status_authenticated">認証済</string>
 
     <string name="start_auth_button">認証画面を開く</string>
+    <string name="cancel_auth_button">認証を解除する</string>
     <string name="post_study_record_button">投稿！</string>
 
     <string name="consumer_key"></string>
diff --git a/studyplus-android-sdk/build.gradle b/studyplus-android-sdk/build.gradle
@@ -45,13 +45,12 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_cotoutines_version"
 
     implementation "androidx.annotation:annotation:$versions.annotation"
-    implementation "androidx.core:core-ktx:$versions.core_ktx"
 
-    def okhttp = "4.2.0"
+    def okhttp = "4.4.1"
     implementation "com.squareup.okhttp3:okhttp:$okhttp"
 
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.robolectric:robolectric:4.0.2'
+    testImplementation "junit:junit:$versions.junit"
+    testImplementation "org.robolectric:robolectric:$versions.robolectric"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
     testImplementation "com.squareup.okhttp3:mockwebserver:$okhttp"
 }
diff --git a/studyplus-android-sdk/lib-proguard-rules.txt b/studyplus-android-sdk/lib-proguard-rules.txt
@@ -19,28 +19,3 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
-
-# Kotlin Coroutines
-# ServiceLoader support
--keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
--keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
--keepnames class kotlinx.coroutines.android.AndroidExceptionPreHandler {}
--keepnames class kotlinx.coroutines.android.AndroidDispatcherFactory {}
-
-# Most of volatile fields are updated with AFU and should not be mangled
--keepclassmembernames class kotlinx.** {
-    volatile <fields>;
-}
-
-# OkHttp
-# JSR 305 annotations are for embedding nullability information.
--dontwarn javax.annotation.**
-
-# A resource is loaded with a relative path so the package of this class must be preserved.
--keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
-
-# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
--dontwarn org.codehaus.mojo.animal_sniffer.*
-
-# OkHttp platform used only on JVM and when Conscrypt dependency is available.
--dontwarn okhttp3.internal.platform.ConscryptPlatform
diff --git a/studyplus-android-sdk/src/main/java/jp/studyplus/android/sdk/Studyplus.kt b/studyplus-android-sdk/src/main/java/jp/studyplus/android/sdk/Studyplus.kt
@@ -59,6 +59,15 @@ class Studyplus private constructor() {
         CertificationStore.create(context.applicationContext).update(data)
     }
 
+    /**
+     * Studyplus連携認証解除
+     *
+     * @since 2.6.1
+     */
+    fun cancelAuth(context: Context) {
+        CertificationStore.remove(context)
+    }
+
     /**
      * Studyplusとの認証情報を利用して学習記録をStudyplusへ投稿
      *
diff --git a/studyplus-android-sdk/src/main/java/jp/studyplus/android/sdk/internal/api/CertificationStore.kt b/studyplus-android-sdk/src/main/java/jp/studyplus/android/sdk/internal/api/CertificationStore.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.net.Uri
+import android.os.Build
 import jp.studyplus.android.sdk.BuildConfig
 
 internal class CertificationStore
@@ -17,11 +18,22 @@ private constructor(private val preferences: SharedPreferences) {
 
         private const val RESULT_CODE_AUTHENTICATED = "AUTHENTICATED"
 
+        private val prefName = "Certification:" + Uri.parse(BuildConfig.API_ENDPOINT).host
         fun create(context: Context): CertificationStore {
-            val prefName = "Certification:" + Uri.parse(BuildConfig.API_ENDPOINT).host
             val pref = context.getSharedPreferences(prefName, Context.MODE_PRIVATE)
             return CertificationStore(pref)
         }
+
+        fun remove(context: Context) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                context.deleteSharedPreferences(prefName)
+            } else {
+               context.getSharedPreferences(prefName, Context.MODE_PRIVATE).edit().let {
+                   it.clear()
+                   it.apply()
+                }
+            }
+        }
     }
 
     fun isAuthenticated(): Boolean {
diff --git a/studyplus-android-sdk/src/main/java/jp/studyplus/android/sdk/internal/auth/AuthTransit.kt b/studyplus-android-sdk/src/main/java/jp/studyplus/android/sdk/internal/auth/AuthTransit.kt
diff --git a/studyplus-android-sdk/src/test/java/jp/studyplus/android/sdk/ApiUnitTest.kt b/studyplus-android-sdk/src/test/java/jp/studyplus/android/sdk/ApiUnitTest.kt
diff --git a/studyplus-android-sdk/src/test/java/jp/studyplus/android/sdk/StudyRecordUnitTest.kt b/studyplus-android-sdk/src/test/java/jp/studyplus/android/sdk/StudyRecordUnitTest.kt
