uni-auth 1.1.2 → 1.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uni-auth",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "main": "src/index.js",
   "type": "module",
   "scripts": {

package/src/index.js

@@ -7,7 +7,7 @@ export async function ifUserAuth(code) {
   return await appAuth(code)
   // #endif
   // #ifdef MP-WEIXIN
-  //   return await wxAuth(code)
+  return await wxAuth(code)
   // #endif
   return true
 }

package/src/util/wx.js

@@ -1,59 +1,108 @@
-import { hintOpenAuth } from '../common/index.js'
-
+// 修正后的权限映射
 const weixin = {
   相册: 'scope.writePhotosAlbum',
-  相机: 'scope.writePhotosAlbum',
+  相机: 'scope.camera',
   麦克风: 'scope.record',
+  位置: 'scope.userLocation',
+  通讯录: 'scope.addressBook',
 }
 
-function wxAuth(auth = '相册') {
+/**
+ * 微信权限申请统一方法
+ * @param {string} auth - 权限类型：'相册'|'相机'|'麦克风'|'位置'|'通讯录'
+ * @returns {Promise<boolean>} - true: 有权限, false: 无权限
+ */
+export function wxAuth(auth = '相册') {
   const param = weixin[auth]
-  return new Promise((resolve, reject) => {
+
+  // 参数校验
+  if (!param) {
+    console.error(`未知的权限类型: ${auth}`)
+    return Promise.reject(new Error('权限类型不存在'))
+  }
+
+  return new Promise((resolve) => {
+    // 通常用 resolve 而不是 reject，避免调用方需要写 catch
     uni.getSetting({
-      success(res) {
-        if (auth === '麦克风') {
-          if (res.authSetting[param]) resolve(true)
-          if (res.authSetting[param] === undefined) resolve({ auth: false, status: 'determined' })
-          else wxRequest(param, auth).then((res) => resolve({ auth: res, status: 'determined' }))
+      success: (res) => {
+        const authSetting = res.authSetting[param]
+
+        // 情况1：已授权
+        if (authSetting === true) {
+          resolve(true)
+          return
+        }
+
+        // 情况2：未授权（包括从未请求过 和 已拒绝过）
+        // 对于麦克风等敏感权限，可以特殊处理
+        if (auth === '麦克风' && authSetting === false) {
+          // 已拒绝过麦克风，直接引导去设置
+          showPermissionGuide(auth, param, resolve)
         } else {
-          if (res.authSetting[param]) resolve(true)
-          else wxRequest(param, auth).then((res) => resolve(res))
+          // 其他情况先尝试请求授权
+          requestPermission(param, auth, resolve)
         }
       },
-      fail: () => {
-        getApp().globalData.$toast('请稍后再试...')
+      fail: (err) => {
+        console.error('获取权限状态失败', err)
+        getApp().globalData.$toast('无法获取权限状态，请稍后重试')
+        resolve(false)
       },
     })
   })
 }
 
-function wxRequest(param, auth) {
-  return new Promise((resolve, reject) => {
-    uni.authorize({
-      scope: param,
-      success: (res) => {
-        resolve(true)
-      },
-      fail: (err) => {
-        uni.showModal({
-          title: '提示',
-          content: `需要授权${auth}权限保存`,
-          success: (res) => {
-            if (res.confirm) {
-              uni.openSetting({
-                success(res) {
-                  if (res.authSetting[param]) resolve(true)
-                  else reject(false)
-                },
-                fail: (res) => {
-                  getApp().globalData.$toast('本次操作需要此授权')
-                  reject(false)
-                },
-              })
-            } else (reject(false), getApp().globalData.$toast('本次操作需要此授权'))
+/**
+ * 请求权限
+ */
+function requestPermission(param, auth, resolve) {
+  uni.authorize({
+    scope: param,
+    success: () => {
+      // 授权成功
+      resolve(true)
+    },
+    fail: (err) => {
+      console.log('授权失败', err)
+      // 授权失败，引导去设置页
+      showPermissionGuide(auth, param, resolve)
+    },
+  })
+}
+
+/**
+ * 显示权限引导弹窗
+ */
+function showPermissionGuide(auth, param, resolve) {
+  uni.showModal({
+    title: '权限申请',
+    content: `需要您授权${auth}权限才能使用此功能，是否前往设置页面开启？`,
+    confirmText: '去设置',
+    success: (modalRes) => {
+      if (modalRes.confirm) {
+        // 用户确认，打开设置页
+        uni.openSetting({
+          success: (settingRes) => {
+            if (settingRes.authSetting[param]) {
+              // 用户在设置页开启了权限
+              getApp().globalData.$toast('授权成功，请重试')
+              resolve(true)
+            } else {
+              // 用户没开启
+              getApp().globalData.$toast(`未获得${auth}权限`)
+              resolve(false)
+            }
+          },
+          fail: () => {
+            getApp().globalData.$toast('打开设置失败')
+            resolve(false)
           },
         })
-      },
-    })
+      } else {
+        // 用户取消
+        getApp().globalData.$toast(`需要${auth}权限才能继续`)
+        resolve(false)
+      }
+    },
   })
 }